diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js
index db31fd3..eded5e4 100644
--- a/src/assets/js/constant.js
+++ b/src/assets/js/constant.js
@@ -139,6 +139,7 @@ export const REMIND_DAYS = [
{ ID: "2", NAME: "90天", NUM: "90" },
];
+
// export const MAINTENANCE_LEVEL_LIST = [
// //维保等级
// {ID:'1',NAME:'一级维保'},
diff --git a/src/request/data_dictionary.js b/src/request/data_dictionary.js
index 1d54e86..74a4d15 100644
--- a/src/request/data_dictionary.js
+++ b/src/request/data_dictionary.js
@@ -29,7 +29,7 @@ export const getLevelsCorp = (params) =>
});
// 获取数据字典
export const getLevelsByParentId = (params) =>
- post("/dictionaries/listDictToParId", {
+ post("/dictionaries/getLevels", {
loading: false,
...params,
});
diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js
index 3c81300..d8af733 100644
--- a/src/request/safety_production_related.js
+++ b/src/request/safety_production_related.js
@@ -29,7 +29,7 @@ export const issueSecurityNotice = (params) =>
// 通知等级
export const layoutFnGetNotificationsClassification = async () => {
const resData = await getLevelsByParentId({
- parentId: "aaecb47d95524b84904809671e48a777",
+ DICTIONARIES_ID: "aaaecb47d95524b84904809671e48a656",
});
return ref(resData);
};
diff --git a/src/request/scrap_manage.js b/src/request/scrap_manage.js
index 4b16304..35effb3 100644
--- a/src/request/scrap_manage.js
+++ b/src/request/scrap_manage.js
@@ -4,7 +4,7 @@ import { post, upload } from "@/request/axios.js";
export const layoutFnGetScrapType = async () => {
const resData = await getLevelsByParentId({
- parentId: "78452f4ec77e4d98ae8cdd9c3386ae0c",
+ DICTIONARIES_ID: "78452f4ec77e4d98ae8cdd9c3386ae0c",
});
return ref(resData);
};
diff --git a/src/views/mechanical_files/beidou/index.vue b/src/views/mechanical_files/beidou/index.vue
index 6f09cf0..38c8704 100644
--- a/src/views/mechanical_files/beidou/index.vue
+++ b/src/views/mechanical_files/beidou/index.vue
@@ -87,19 +87,19 @@
-
-
-
+
+
+
-
-
-
+
+
+
-
+
开启
-
+
未到期
-
+
报废
-
-
-
+
-
+
diff --git a/src/views/mechanical_files/insure/index.vue b/src/views/mechanical_files/insure/index.vue
index 65cc2c8..41063b9 100644
--- a/src/views/mechanical_files/insure/index.vue
+++ b/src/views/mechanical_files/insure/index.vue
@@ -119,34 +119,34 @@
{{ serialNumber(pagination, $index) }}
-
-
+
+
{{
translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
}}
-
-
-
+
+
+
-
-
-
-
+
+
+
+
-
+
开启
-
+
未到期
-
-
+
-
-
-
-
+
+
+
+
{{
translationStatus(row.MAINTENANCE_LEVEL, MAINTENANCE_LEVEL_LIST)
}}
-
-
+
+
{{ row.MAINTENANCE_CYCLE + "天" }}
-
+
-
+
开启
-
+
未到期
-
+
报废
-
-
-
+
{{
translationStatus(row.VEHICLE_MODEL, OPERATING_VEHICLE_TYPE_LIST)
}}
-
+
-
-
+
+
-
+
开启
@@ -134,7 +134,7 @@
-
+
未到期
@@ -147,7 +147,7 @@
-
+
报废
-
-
+
+
@@ -186,7 +186,7 @@
diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue
index 927e748..37e4854 100644
--- a/src/views/safety_production_related/security_notice/add.vue
+++ b/src/views/safety_production_related/security_notice/add.vue
@@ -26,9 +26,9 @@
>
@@ -98,7 +98,7 @@
@@ -133,12 +133,9 @@ const rules = {
},
],
};
-const relatedClassificationTempList =
- await layoutFnGetNotificationsClassification();
-const relatedClassificationList = [];
-JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
- relatedClassificationList.push({ name: e.id, BIANMA: e.name });
-});
+const relatedClassificationTempList = await layoutFnGetNotificationsClassification();
+
+
const router = useRouter();
const data = reactive({
form: {
@@ -152,6 +149,7 @@ const data = reactive({
allStatus: 0, // 是否全选
REPLYSTATUS: "",
},
+ SelectPersonDialogVisible: false,
});
const fnSubmit = async () => {
@@ -204,6 +202,7 @@ const fnSelectAllRiskSubmit = (allData) => {
data.form.allStatus = 1;
data.form.PERSON = "已全部选择";
};
+const relatedClassificationList = relatedClassificationTempList.value.list;
diff --git a/src/views/safety_production_related/security_notice/components/select_person.vue b/src/views/safety_production_related/security_notice/components/select_person.vue
index 89a8a48..7eb7237 100644
--- a/src/views/safety_production_related/security_notice/components/select_person.vue
+++ b/src/views/safety_production_related/security_notice/components/select_person.vue
@@ -78,7 +78,7 @@ const props = defineProps({
required: true,
default: false,
},
- listData: {
+ selectionData: {
type: Array,
required: true,
default: () => [],
@@ -105,6 +105,9 @@ const stop = watch(
() => props.visible,
(value) => {
if (value) {
+ props.selectionData.forEach((row) => {
+ tableRef.value.toggleRowSelection(row, undefined);
+ });
fnResetPagination();
stop && stop();
}
diff --git a/src/views/safety_production_related/security_notice/details.vue b/src/views/safety_production_related/security_notice/details.vue
index 979085f..4156dab 100644
--- a/src/views/safety_production_related/security_notice/details.vue
+++ b/src/views/safety_production_related/security_notice/details.vue
@@ -28,7 +28,7 @@
v-for="item in relatedClassificationList"
:key="item.BIANMA"
:label="item.NAME"
- :value="item.BIANMA"
+ :value="item.NAME"
/>
@@ -45,7 +45,7 @@
选择
@@ -97,8 +97,8 @@
确定
@@ -141,23 +141,23 @@ const rules = {
};
const relatedClassificationTempList =
await layoutFnGetNotificationsClassification();
-const relatedClassificationList = [];
-JSON.parse(relatedClassificationTempList.value.zTreeNodes).forEach((e) => {
- relatedClassificationList.push({ name: e.id, BIANMA: e.name });
-});
const router = useRouter();
const data = reactive({
form: {
TITLE: "",
CORPINFO_ID: "",
LEVEL: "",
- PERSON: "",
+ PERSON: [],
fileList: [],
videoList: [],
NOTIFICATIONCONTENT: "",
allStatus: 0, // 是否全选
REPLYSTATUS: "",
},
+ dialog: {
+ SelectPersonDialogVisible: false,
+ selectionData: [],
+ },
});
const fnSubmit = async () => {
@@ -211,7 +211,7 @@ const fnGetData = async () => {
if (!NOTIFICATION_ID) return;
const resData = await getSecurityNoticeInfo({ NOTIFICATION_ID });
data.form = resData.pd;
- data.form.PERSON = resData.names[0].NAME;
+ data.dialog.selectionData = resData.pd.PERSON_ID?.split(",");
data.form.fileList = addingPrefixToFile([
{
FILEPATH: data.form.ATTACHMENT_ROUTE,
@@ -222,8 +222,11 @@ const fnGetData = async () => {
FILEPATH: data.form.VIDEO_ROUTE,
},
]);
+ const names = resData.pd.names;
+ data.form.PERSON = names.map((item) => item.NAME).join(",");
};
fnGetData();
+const relatedClassificationList = relatedClassificationTempList.value.list;
diff --git a/src/views/safety_production_related/security_notice/index.vue b/src/views/safety_production_related/security_notice/index.vue
index 4fa1358..ff00fcd 100644
--- a/src/views/safety_production_related/security_notice/index.vue
+++ b/src/views/safety_production_related/security_notice/index.vue
@@ -28,8 +28,8 @@
@@ -61,34 +61,30 @@
- {{ row.LEVEL }}
+ {{
+ row.LEVEL
+ }}
+ {{ row.LEVEL }}
+ {{
+ row.LEVEL
+ }}
- 待发布
+ 待发布
已发布
- {{
- row.REPLYSTATUSNUM
- ? row.REPLYSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
- : "0/" + row.TOTALREADDETAIL + "人"
- }}
+ {{ row.COUNT_REPLY + "/" + row.TOTALREADDETAIL + "人" }}
- {{
- row.SIGNEDSTATUSNUM
- ? row.SIGNEDSTATUSNUM + "/" + row.TOTALREADDETAIL + "人"
- : "0/" + row.TOTALREADDETAIL + "人"
- }}
+ {{ row.COUNT_SIGNING + "/" + row.TOTALREADDETAIL + "人" }}
@@ -169,7 +165,7 @@
diff --git a/src/views/safety_production_related/security_notice/notice_info.vue b/src/views/safety_production_related/security_notice/notice_info.vue
index f50da16..5f64f0c 100644
--- a/src/views/safety_production_related/security_notice/notice_info.vue
+++ b/src/views/safety_production_related/security_notice/notice_info.vue
@@ -83,7 +83,7 @@ const detailItems = ref({
const fnGetData = async () => {
const response = await getSecurityNoticeInfo({ NOTIFICATION_ID });
detailItems.value = response.pd;
- console.log("detail",detailItems);
+ console.log("detail",response);
};
fnGetData();