diff --git a/src/request/traffic_safety_meeting.js b/src/request/traffic_safety_meeting.js index 421704b..0865d3e 100644 --- a/src/request/traffic_safety_meeting.js +++ b/src/request/traffic_safety_meeting.js @@ -12,3 +12,6 @@ export const addSafetyMeetingView = (params) => upload("/safetymeeting/add", params); // 添加安全通知 export const getSafetyMeetingRecipient = (params) => post("/safetymeeting/getAllRecipient", params); // 参会人员 + +export const editSafetyMeetingRecipient = (params) => + post("/safetymeeting/edit", params); // 修改参会人员 diff --git a/src/request/traffic_safety_staffing.js b/src/request/traffic_safety_staffing.js index 2790f5d..42f13ad 100644 --- a/src/request/traffic_safety_staffing.js +++ b/src/request/traffic_safety_staffing.js @@ -4,4 +4,5 @@ export const getSafetyStaffingList = (params) => export const addStaffingView = (params) => upload("/staffing/add", params); // 添加 管理人员配备 -export const editStaffingView = (params) => upload("/staffing/edit", params); // 添加 管理人员配备 +export const editStaffingView = (params) => upload("/staffing/edit", params); // 修改 管理人员配备 +export const infoStaffingView = (params) => upload("/staffing/goEdit", params); // 详情 管理人员配备 diff --git a/src/views/electronic_waybill_management/customer_management/add.vue b/src/views/electronic_waybill_management/customer_management/add.vue index 58bbf44..e74ac30 100644 --- a/src/views/electronic_waybill_management/customer_management/add.vue +++ b/src/views/electronic_waybill_management/customer_management/add.vue @@ -68,6 +68,7 @@ import { onMounted, reactive, ref } from "vue"; import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; import { addSafetyCustomerView } from "@/request/customer_management.js"; +import { useRouter } from "vue-router"; const formRef = ref(null); const rules = { @@ -93,7 +94,7 @@ const data = reactive({ unitsList: [], }, }); - +const router = useRouter(); onMounted(async () => { await fnPerson(); }); @@ -111,6 +112,7 @@ const fnSubmit = async () => { await addSafetyCustomerView(formData); ElMessage.success("添加成功"); + router.push("/electronic_waybill_management/customer_management"); Object.keys(data.form).forEach((key) => { if (Array.isArray(data.form[key])) { data.form[key] = []; diff --git a/src/views/electronic_waybill_management/location_managemen/add.vue b/src/views/electronic_waybill_management/location_managemen/add.vue index 82827e3..a4aad7b 100644 --- a/src/views/electronic_waybill_management/location_managemen/add.vue +++ b/src/views/electronic_waybill_management/location_managemen/add.vue @@ -105,6 +105,7 @@ import useFormValidate from "@/assets/js/useFormValidate.js"; import { ElMessage } from "element-plus"; import { addSafetyLocationView } from "@/request/location_management.js"; import MapDialog from "@/views/enterprise_management/information/components/map.vue"; +import { useRouter } from "vue-router"; const formRef = ref(null); const rules = { @@ -141,7 +142,7 @@ const data = reactive({ territoryCascaderRef: "", }, }); - +const router = useRouter(); onMounted(async () => { await fnPerson(); }); @@ -153,6 +154,7 @@ const fnSubmit = async () => { await useFormValidate(formRef); await addSafetyLocationView(data.form); ElMessage.success("添加成功"); + router.push("/electronic_waybill_management/location_managemen"); Object.keys(data.form).forEach((key) => { if (Array.isArray(data.form[key])) { data.form[key] = []; diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue index 63e0123..ce79f5c 100644 --- a/src/views/electronic_waybill_management/waybill_registration/add.vue +++ b/src/views/electronic_waybill_management/waybill_registration/add.vue @@ -267,6 +267,7 @@ import { getPostListAll, getUserListAll } from "@/request/data_dictionary.js"; import { getSecurityCustomerList } from "@/request/customer_management.js"; import { getSecurityLocationList } from "@/request/location_management.js"; import { getOperationVehicleList } from "@/request/operation_vehicle.js"; +import { useRouter } from "vue-router"; const formRef = ref(null); const rules = { @@ -334,6 +335,7 @@ const data = reactive({ EndOptions: [], // 目的地 OperationVehicle: [], // 运输车辆 }); +const router = useRouter(); const fnVehicle = async () => { const res = await getOperationVehicleList(); const varList = res.varList || []; @@ -392,6 +394,7 @@ const fnSubmit = async () => { await addSafetyThingsChecView(formData); ElMessage.success("添加成功"); + router.push("/electronic_waybill_management/waybill_registration"); Object.keys(data.form).forEach((key) => { if (Array.isArray(data.form[key])) { data.form[key] = []; diff --git a/src/views/management_staffing/components/add.vue b/src/views/management_staffing/components/add.vue index 730ef18..301c8df 100644 --- a/src/views/management_staffing/components/add.vue +++ b/src/views/management_staffing/components/add.vue @@ -61,7 +61,7 @@ diff --git a/src/views/management_staffing/index.vue b/src/views/management_staffing/index.vue index 53d9ff8..9f57799 100644 --- a/src/views/management_staffing/index.vue +++ b/src/views/management_staffing/index.vue @@ -8,21 +8,21 @@ > - - + + - - + + - - + + @@ -78,9 +78,9 @@ link @click=" router.push({ - path: '/safety_production_related/safety_meeting/meeting_info', + path: '/management_staffing/details', query: { - SAFETY_MEETING_ID: row.SAFETY_MEETING_ID, + STAFFING_ID: row.STAFFING_ID, }, }) " diff --git a/src/views/safety_production_related/safety_meeting/add.vue b/src/views/safety_production_related/safety_meeting/add.vue index 62f1563..dd48b05 100644 --- a/src/views/safety_production_related/safety_meeting/add.vue +++ b/src/views/safety_production_related/safety_meeting/add.vue @@ -188,7 +188,6 @@ const fnSubmit = async () => { await useFormValidate(formRef); const formData = new FormData(); - // 添加文本类型的字段 Object.keys(data.form).forEach((key) => { if (key === "MEETING_DATE") { const dateRangeString = data.form.MEETING_DATE.join(" , "); @@ -198,12 +197,10 @@ const fnSubmit = async () => { } }); - // 处理 fileList - 添加文件 data.form.fileList.forEach((file) => { if (file.raw) formData.append("FFILE", file.raw); }); - // 处理 videoList - 添加视频文件 data.form.videoList.forEach((video) => { if (video.raw) formData.append("VVIDEO", video.raw); // 注意: 用不同的字段名区分文件和视频 }); diff --git a/src/views/safety_production_related/safety_meeting/details.vue b/src/views/safety_production_related/safety_meeting/details.vue index 52e925b..24d4090 100644 --- a/src/views/safety_production_related/safety_meeting/details.vue +++ b/src/views/safety_production_related/safety_meeting/details.vue @@ -59,16 +59,28 @@ {{ serialNumber(pagination, $index) }} - + - - + + + + @@ -78,9 +90,13 @@ import { reactive, onMounted, ref } from "vue"; import { useRoute } from "vue-router"; import { layoutFnGetSIGNEDSTATUSClassification } from "@/request/safety_production_related.js"; -import { getSafetyMeetingRecipient } from "@/request/traffic_safety_meeting.js"; +import { + editSafetyMeetingRecipient, + getSafetyMeetingRecipient, +} from "@/request/traffic_safety_meeting.js"; import { serialNumber } from "@/assets/js/utils"; import useListData from "@/assets/js/useListData"; +import { ElMessage, ElMessageBox } from "element-plus"; const route = useRoute(); const SAFETY_MEETING_ID = route.query.SAFETY_MEETING_ID; @@ -118,6 +134,22 @@ function resetSearchForm() { }); fnResetPagination({ SAFETY_MEETING_ID }); } +const editItem = async ( + safetyMeetingId, + practitioner, + attendanceStatus = 0 +) => { + await ElMessageBox.confirm(`确定要移除吗?`, { + type: "warning", + }); + await editSafetyMeetingRecipient({ + SAFETY_MEETING_ID: safetyMeetingId, + PRACTITIONER: practitioner, + ATTENDANCE_STATUS: attendanceStatus, // 设置参会状态为0 + }); + ElMessage.success("移除成功"); + fnGetData(); +}; const relatedClassificationList = ref(null); 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 b336981..3a3658c 100644 --- a/src/views/safety_production_related/safety_meeting/meeting_info.vue +++ b/src/views/safety_production_related/safety_meeting/meeting_info.vue @@ -29,7 +29,7 @@ - {{ detailItems.MEETING_CONTENT }} +
@@ -43,23 +43,41 @@ - + - - + + - + + + +