diff --git a/src/assets/js/constant.js b/src/assets/js/constant.js
index 927399c..702617f 100644
--- a/src/assets/js/constant.js
+++ b/src/assets/js/constant.js
@@ -40,6 +40,10 @@ export const CUSTOMERTYPEMENU = [
{ id: "委托方", name: "1" },
{ id: "确认方", name: "2" },
];
+export const MEETINGTYPEMENU = [
+ { id: "安全生产例会", name: "1" },
+ { id: "安全生产委员会会议", name: "2" },
+];
export const LOCATIONTYPEMENU = [
{ id: "起运地", name: "1" },
{ id: "目的地", name: "2" },
diff --git a/src/request/safety_production_related.js b/src/request/safety_production_related.js
index bcffc2d..1cb0c68 100644
--- a/src/request/safety_production_related.js
+++ b/src/request/safety_production_related.js
@@ -29,9 +29,3 @@ export const layoutFnGetSIGNEDSTATUSClassification = async () => {
});
return ref(resData);
};
-export const layoutFnGetMEETINGTYPEClassification = async () => {
- const resData = await getLevelsByParentId({
- parentId: "eeeec1cbabe7406083994447d00d0d4a",
- });
- return ref(resData);
-};
diff --git a/src/views/electronic_waybill_management/location_managemen/add.vue b/src/views/electronic_waybill_management/location_managemen/add.vue
index b6a49c1..82827e3 100644
--- a/src/views/electronic_waybill_management/location_managemen/add.vue
+++ b/src/views/electronic_waybill_management/location_managemen/add.vue
@@ -97,7 +97,6 @@
diff --git a/src/views/safety_production_related/safety_meeting/meeting_info.vue b/src/views/safety_production_related/safety_meeting/meeting_info.vue
index 89afb86..b336981 100644
--- a/src/views/safety_production_related/safety_meeting/meeting_info.vue
+++ b/src/views/safety_production_related/safety_meeting/meeting_info.vue
@@ -6,7 +6,7 @@
{{ detailItems.MEETING_TITLE }}
- {{ detailItems.TRANSPORTATIONCOMPANY }}
+ {{ detailItems.CORP_NAME }}
{{ detailItems.HOST_PERSON }}
@@ -21,14 +21,19 @@
{{ detailItems.MEETING_DATE_END }}
- {{ detailItems.MEETING_TYPE }}
+
+ 安全生产例会
+
+
+ 安全生产委员会会议
+
{{ detailItems.MEETING_CONTENT }}
-
- {{ detailItems.NOTES }}
-
+
+
+
应参会{{ detailItems.totalPersonNum }}/人,实参人数{{
detailItems.realPersonNum
diff --git a/src/views/safety_production_related/security_notice/add.vue b/src/views/safety_production_related/security_notice/add.vue
index 9125fae..a81be2b 100644
--- a/src/views/safety_production_related/security_notice/add.vue
+++ b/src/views/safety_production_related/security_notice/add.vue
@@ -13,21 +13,6 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
@@ -52,7 +37,7 @@
选择
@@ -105,10 +90,10 @@
确定
-
@@ -123,7 +108,7 @@ import {
import { onMounted, reactive, ref } from "vue";
import LayoutUpload from "@/components/upload/index.vue";
import LayoutEditor from "@/components/editor/index.vue";
-import SelectRisk from "./components/select_person.vue";
+import SelectPerson from "./components/select_person.vue";
import useFormValidate from "@/assets/js/useFormValidate.js";
import { ElMessage } from "element-plus";
import { getSecurityPerson } from "@/request/waybill_registration.js";
@@ -181,6 +166,7 @@ const fnSubmit = async () => {
}
});
formData.append("PERSON_ID", data.form.PERSON_ID);
+
data.form.fileList.forEach((file) => {
if (file.raw) {
formData.append("fileList", file.raw);
@@ -214,7 +200,7 @@ const fnSubmit = async () => {
}
};
-const fnSelectRiskSubmit = (selectionData) => {
+const fnSelectPersonSubmit = (selectionData) => {
const userIds = selectionData.map((item) => item.USER_ID).join(", ");
const names = selectionData.map((item) => item.NAME).join(", ");
data.form.PERSON_ID = userIds;
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 ab314f2..b7549ed 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
@@ -2,11 +2,11 @@
-
+
+
+
+
+
+
+
+
搜索
@@ -40,6 +55,7 @@
+
取消
@@ -57,6 +73,7 @@ import { watch } from "vue";
import { serialNumber } from "@/assets/js/utils.js";
import { differenceWith } from "lodash-es";
import { getUserListAll } from "@/request/safety_production_related.js";
+import { PERSONTYPEMENU } from "@/assets/js/constant.js";
const props = defineProps({
visible: {