diff --git a/.env b/.env index fa793de..47e37c9 100644 --- a/.env +++ b/.env @@ -1,4 +1,4 @@ -VITE_BASE_URL=http://192.168.0.42:8099/ +VITE_BASE_URL=http://192.168.0.49:8099/ VITE_PROXY=/api/ VITE_FILE_URL=https://file.zcloudchina.com/YTHFile VITE_TEMPLATE_URL=https://qaaq.qhdsafety.com/file/ diff --git a/src/assets/js/asyncRouter.js b/src/assets/js/asyncRouter.js index bf3b140..cca0f7d 100644 --- a/src/assets/js/asyncRouter.js +++ b/src/assets/js/asyncRouter.js @@ -289,6 +289,14 @@ export default [ }, component: "hazard_investigation/inventory_management/print", }, + { + path: "/hazard_investigation/inventory_management/print_custom", + meta: { + title: "打印", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/print_custom", + }, { path: "/hazard_investigation/inventory_management/part_qr_code", meta: { @@ -331,13 +339,12 @@ export default [ component: "hazard_investigation/inventory_management/add", }, { - path: "/hazard_investigation/inventory_management/check_standard_add", + path: "/hazard_investigation/inventory_management/add_custom", meta: { title: "新增", activeMenu: "/hazard_investigation/inventory_management", }, - component: - "hazard_investigation/inventory_management/check_standard_add", + component: "hazard_investigation/inventory_management/add_custom", }, { path: "/hazard_investigation/inventory_management/edit", @@ -347,6 +354,14 @@ export default [ }, component: "hazard_investigation/inventory_management/add", }, + { + path: "/hazard_investigation/inventory_management/edit_custom", + meta: { + title: "修改", + activeMenu: "/hazard_investigation/inventory_management", + }, + component: "hazard_investigation/inventory_management/add_custom", + }, { path: "/hazard_investigation/inventory_management/inheritance_list", meta: { @@ -394,13 +409,13 @@ export default [ component: "hazard_investigation/inventory_troubleshooting/inspect", }, { - path: "/hazard_investigation/inventory_troubleshooting/standard_inspect", + path: "/hazard_investigation/inventory_troubleshooting/inspect_custom", meta: { title: "开始检查", activeMenu: "/hazard_investigation/inventory_troubleshooting", }, component: - "hazard_investigation/inventory_troubleshooting/standard_inspect", + "hazard_investigation/inventory_troubleshooting/inspect_custom", }, ], }, @@ -861,7 +876,21 @@ export default [ title: "查看详情", activeMenu: "/keyprojects/inspection", }, - component: "keyprojects/inspection/record_view", + component: "children", + children: [ + { + path: "", + component: "keyprojects/inspection/record_view", + }, + { + path: "/keyprojects/inspection/hidden_view", + meta: { + title: "隐患信息", + activeMenu: "/keyprojects/inspection", + }, + component: "keyprojects/inspection/hidden_view", + }, + ], }, ], }, @@ -933,16 +962,6 @@ export default [ }, ], }, - { - path: "/keyprojects/aiwarning", - meta: { title: "AI报警", isSubMenu: false }, - component: "keyprojects/aiwarning/index", - }, - { - path: "/keyprojects/videomanager", - meta: { title: "视频监控", isSubMenu: false }, - component: "keyprojects/videomanager/index", - }, ], }, { @@ -993,6 +1012,88 @@ export default [ }, ], }, + { + path: "/safety_environmental_management/inspectors_verify_management", + meta: { title: "检查人核实管理", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/inspectors_verify_management/index", + }, + { + path: "/safety_environmental_management/inspectors_verify_management/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/inspectors_verify_management", + }, + component: + "safety_environmental_management/inspectors_verify_management/view", + }, + ], + }, + { + path: "/safety_environmental_management/inspected_person_confirm", + meta: { title: "被检查人确认", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/inspected_person_confirm/index", + }, + { + path: "/safety_environmental_management/inspected_person_confirm/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/inspected_person_confirm", + }, + component: + "safety_environmental_management/inspected_person_confirm/view", + }, + ], + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance", + meta: { title: "隐患指派与验收", isSubMenu: false }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/hazard_assignment_acceptance/index", + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance/view", + meta: { + title: "查看", + activeMenu: + "/safety_environmental_management/hazard_assignment_acceptance", + }, + component: + "safety_environmental_management/hazard_assignment_acceptance/view", + }, + { + path: "/safety_environmental_management/hazard_assignment_acceptance/assign", + meta: { + title: "指派", + activeMenu: + "/safety_environmental_management/hazard_assignment_acceptance", + }, + component: "children", + children: [ + { + path: "", + component: + "safety_environmental_management/hazard_assignment_acceptance/hidden_list", + }, + ], + }, + ], + }, ], }, { diff --git a/src/components/hidden_view/index.vue b/src/components/hidden_view/index.vue index 84fc8ea..7c7a12e 100644 --- a/src/components/hidden_view/index.vue +++ b/src/components/hidden_view/index.vue @@ -276,6 +276,7 @@ const fnGetData = async () => { data.info = resData.pd; data.hs = resData.hs; data.checkList = resData.checkList; + data.hImgs = []; for (let i = 0; i < resData.hImgs.length; i++) { if (getFileSuffix(resData.hImgs[i].FILEPATH) === "mp4") { data.videoDialog.src = resData.hImgs[i].FILEPATH; diff --git a/src/request/hazard_investigation.js b/src/request/hazard_investigation.js index 988e9d8..cbb36bf 100644 --- a/src/request/hazard_investigation.js +++ b/src/request/hazard_investigation.js @@ -95,10 +95,15 @@ export const setCheckStandardSupplementaryRecordingSubmit = (params) => post("/customCheckrecord/recording", params); // 隐患排查清单检查情况检查记录补录提交 export const setCheckStandardSubmit = (params) => post("/customCheckrecord/add", params); // 清单排查提交 - export const getDeleteCustomList = (params) => post("/customStop/list", params); // 删除清单管理列表 export const setDeleteCustomRecovery = (params) => post("/customStop/restore", params); // 删除清单管理恢复 export const setCustomBatchDelete = (params) => post("/customStop/deleteAll", params); // 清单管理批量删除 export const getCustomStopView = (params) => post("/customStop/goEdit", params); // 清单管理查看 +export const getCustomCheckRecordList = (params) => + post("/customCheckrecord/list", params); // 隐患清单排查列表 +export const getCustomCheckRecordView = (params) => + post("/customCheckrecord/goEdit", params); // 隐患清单排查查询单个 +export const setDeleteCustommCheckrecord = (params) => + post("/customCheckrecord/delete", params); // 删除隐患清单排查记录 diff --git a/src/request/keyprojects.js b/src/request/keyprojects.js index 6e22f3a..a26cbf6 100644 --- a/src/request/keyprojects.js +++ b/src/request/keyprojects.js @@ -36,6 +36,8 @@ export const setOutsourcedGoEdit = (params) => post("/outsourced/goEdit", params); // 重点工程修改获取 export const setOutsourcedDelete = (params) => post("/outsourced/delete", params); // 重点工程修改获取 +export const getOutsourcedJie = (params) => post("/outsourced/jie", params); // 结束工程 +export const getOutsourcedStart = (params) => post("/outsourced/start", params); // 结束工程 export const getKeyprojectcheckList = (params) => post("/keyprojectcheck/list", params); // 安全环保检查列表 @@ -49,3 +51,5 @@ export const getKeyprojectpunishList = (params) => post("/keyprojectpunish/list", params); // 处罚列表 export const getKeyprojectpunishGoEdit = (params) => post("/keyprojectpunish/goEdit", params); // 处罚列表详情 + +export const getCorpinfoListAll = (params) => post("/corpinfo/listAll", params); // 监理单位名称 diff --git a/src/request/safety_environmental_management.js b/src/request/safety_environmental_management.js index 2bc20c0..05c0951 100644 --- a/src/request/safety_environmental_management.js +++ b/src/request/safety_environmental_management.js @@ -1,4 +1,4 @@ -import { post } from "@/request/axios.js"; +import { post, upload } from "@/request/axios.js"; export const getSafetyEnvironmentalList = (params) => post("/safetyenvironmental/list", params); // 安全环保管理列表 @@ -10,7 +10,25 @@ export const setSafetyEnvironmentalDefense = (params) => post("/safetyenvironmental/explain", params); // 安全环保管理申辩 export const setSafetyEnvironmentalAdd = (params) => post("/safetyenvironmental/add", params); // 安全环保管理新增 -export const getSafetyEnvironmentalView = (params) => +export const setSafetyEnvironmentalEdit = (params) => + post("/safetyenvironmental/edit", params); // 安全环保管理编辑 +export const getSafetyEnvironmentalViewInfo = (params) => post("/safetyenvironmental/goShow", params); // 安全环保管理查看 +export const getSafetyEnvironmentalView = (params) => + post("/safetyenvironmental/goEdit", params); // 安全环保管理查看 export const getSafetyEnvironmentalViewFlowChart = (params) => post("/safetyenvironmental/getFlowChart", params); // 安全环保管理查看流程图 +export const getInspectorsVerifyManagementList = (params) => + post("/safetyenvironmentalinspector/list", params); // 检查人核实列表 +export const setInspectorsVerifyManagementVerify = (params) => + post("/safetyenvironmentalinspector/verify", params); // 检查人核实管理核实 +export const getInspectedPersonConfirmList = (params) => + post("/safetyenvironmentalexplain/list", params); // 被检查人确认列表 +export const getInspectedPersonConfirmHiddenCount = (params) => + post("/safetyenvironmentalexplain/hiddencount", params); // 被检查人确认获取隐患数量 +export const setInspectedPersonConfirmSubmit = (params) => + upload("/safetyenvironmentalexplain/add", params); // 被检查人确认提交 +export const getHazardAssignmentAcceptanceList = (params) => + post("/safetyenvironmental/checkList", params); // 隐患指派与验收列表 +export const getHazardAssignmentAcceptanceHiddenList = (params) => + post("/hidden/listForAhZp", params); // 隐患指派与验收隐患列表 diff --git a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue index 49bb72e..ab06845 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/components/inspection_record_view.vue @@ -3,7 +3,7 @@ 清单信息 - {{ info.LIST_NAME }} + {{ info.LIST_NAME ? info.LIST_NAME : info.CUSTOM_NAME }} {{ info.SCREENTYPENAME }} @@ -66,7 +66,8 @@ 检查内容 -
+ +
@@ -109,7 +110,7 @@
- +
@@ -153,6 +154,97 @@
序号
+ +
+ + + + + + + + + + + + +
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + +
序号检查类别检查项目检查内容检查标准参考依据检查结果状态
{{ index + 1 }}{{ item.CHECK_CATEGORY_NAME }}{{ item.CHECK_ITEM_NAME }}{{ item.CHECK_CONTENT }}{{ item.CHECK_STANDARD }}{{ item.REFERENCE_BASIS }}{{ item.CHECK_RESULT }}
其他隐患
@@ -209,6 +301,7 @@ import { useRouter } from "vue-router"; import { reactive, ref } from "vue"; import { getChecklistInspectionStatusRecordView, + getCustomCheckRecordView, getChecklistInspectionStatusRecordViewOtherHiddenDangerList, } from "@/request/hazard_investigation.js"; import { getViewImg } from "@/request/api.js"; @@ -232,6 +325,11 @@ const props = defineProps({ required: true, default: "", }, + listType: { + type: String, + required: true, + default: "", + }, }); const hiddenPath = { checklist_inspection_status: @@ -251,7 +349,9 @@ const data = reactive({ mapDialogVisible: false, }); const { list: inspectionList } = useListData( - getChecklistInspectionStatusRecordView, + props.listType === 1 + ? getChecklistInspectionStatusRecordView + : getCustomCheckRecordView, { otherParams: { CHECKRECORD_ID: props.checkRecordId }, usePagination: false, diff --git a/src/views/hazard_investigation/checklist_inspection_status/index.vue b/src/views/hazard_investigation/checklist_inspection_status/index.vue index 1da56d8..6f0d964 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/index.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/index.vue @@ -210,7 +210,8 @@ router.push({ path: '/hazard_investigation/checklist_inspection_status/inspection_record', query: { - LISTMANAGER_ID: row.LISTMANAGER_ID, + LIST_ID: row.LISTMANAGER_ID, + LIST_TYPE: row.list_type, }, }) " diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue index b337385..85bb6f7 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record.vue @@ -86,6 +86,7 @@ path: '/hazard_investigation/checklist_inspection_status/inspection_record/view', query: { CHECKRECORD_ID: row.CHECKRECORD_ID, + LIST_TYPE: LIST_TYPE, }, }) " @@ -114,7 +115,8 @@ CHECKRECORD_ID: row.CHECKRECORD_ID, DATESTART: row.DATESTART, DATEEND: row.DATEEND, - LISTMANAGER_ID, + LIST_TYPE: LIST_TYPE, + LIST_ID, }, }) " @@ -136,6 +138,8 @@ import { serialNumber } from "@/assets/js/utils"; import { getChecklistInspectionStatusRecordList, setChecklistInspectionStatusRecordDelete, + setDeleteCustommCheckrecord, + getCustomCheckRecordList, } from "@/request/hazard_investigation.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; @@ -144,15 +148,23 @@ import useListData from "@/assets/js/useListData.js"; const route = useRoute(); const router = useRouter(); -const { LISTMANAGER_ID } = route.query; +const { LIST_ID, LIST_TYPE } = route.query; const info = ref({}); const { list, pagination, searchForm, fnGetData, fnResetPagination } = - useListData(getChecklistInspectionStatusRecordList, { - otherParams: { LISTMANAGER_ID }, - callbackFn: (list, resData) => { - info.value = resData.ls; - }, - }); + useListData( + LIST_TYPE === "1" + ? getChecklistInspectionStatusRecordList + : getCustomCheckRecordList, + { + otherParams: + LIST_TYPE === "1" + ? { LISTMANAGER_ID: LIST_ID } + : { CUSTOM_ID: LIST_ID }, + callbackFn: (list, resData) => { + info.value = resData.ls; + }, + } + ); const fnGetDataTransfer = () => { fnGetData({ STARTTIME: searchForm.value.dates?.[0], @@ -170,7 +182,9 @@ const fnDelete = debounce( 1000, async (CHECKRECORD_ID) => { await ElMessageBox.confirm("确定要删除吗？", { type: "warning" }); - await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }); + LIST_TYPE === "1" + ? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }) + : await setDeleteCustommCheckrecord({ CHECKRECORD_ID }); ElMessage.success("删除成功"); fnResetPaginationTransfer(); }, diff --git a/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue index 10432b8..29b895f 100644 --- a/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue +++ b/src/views/hazard_investigation/checklist_inspection_status/inspection_record_view.vue @@ -4,6 +4,7 @@
@@ -23,7 +24,7 @@ defineProps({ }, }); const route = useRoute(); -const { CHECKRECORD_ID } = route.query; +const { CHECKRECORD_ID, LIST_TYPE } = route.query; diff --git a/src/views/hazard_investigation/inspection_record/index.vue b/src/views/hazard_investigation/inspection_record/index.vue index c9b09a0..b6f7046 100644 --- a/src/views/hazard_investigation/inspection_record/index.vue +++ b/src/views/hazard_investigation/inspection_record/index.vue @@ -103,6 +103,7 @@ path: '/hazard_investigation/inspection_record/view', query: { CHECKRECORD_ID: row.CHECKRECORD_ID, + LIST_TYPE: row.LIST_TYPE, }, }) " @@ -114,7 +115,7 @@ type="primary" text link - @click="fnDelete(row.CHECKRECORD_ID)" + @click="fnDelete(row.LIST_TYPE, row.CHECKRECORD_ID)" > 删除 @@ -132,6 +133,7 @@ DATESTART: row.DATESTART, DATEEND: row.DATEEND, LISTMANAGER_ID: row.LISTMANAGER_ID, + LIST_TYPE, }, }) " @@ -153,6 +155,7 @@ import { serialNumber } from "@/assets/js/utils"; import { getInspectionRecordList, setChecklistInspectionStatusRecordDelete, + setDeleteCustommCheckrecord, } from "@/request/hazard_investigation.js"; import { debounce } from "throttle-debounce"; import { ElMessage, ElMessageBox } from "element-plus"; @@ -186,9 +189,11 @@ const fnResetPaginationTransfer = () => { const buttonJurisdiction = await useButtonJurisdiction("checkrecord"); const fnDelete = debounce( 1000, - async (CHECKRECORD_ID) => { + async (LIST_TYPE, CHECKRECORD_ID) => { await ElMessageBox.confirm("确定要删除吗？", { type: "warning" }); - await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }); + LIST_TYPE === "1" + ? await setChecklistInspectionStatusRecordDelete({ CHECKRECORD_ID }) + : await setDeleteCustommCheckrecord({ CHECKRECORD_ID }); ElMessage.success("删除成功"); fnResetPaginationTransfer(); }, diff --git a/src/views/hazard_investigation/inventory_troubleshooting/index.vue b/src/views/hazard_investigation/inventory_troubleshooting/index.vue index 91e8fc8..626956f 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/index.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/index.vue @@ -190,7 +190,7 @@ const fnInspect = (ID, LIST_TYPE) => { path: LIST_TYPE === "1" ? "/hazard_investigation/inventory_troubleshooting/inspect" - : "/hazard_investigation/inventory_troubleshooting/standard_inspect", + : "/hazard_investigation/inventory_troubleshooting/inspect_custom", query: { ID }, }); }; diff --git a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue index 323c507..0cc216c 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect.vue @@ -244,7 +244,7 @@ v-model:form="data.unQualifiedDialog.form" :type="data.unQualifiedDialog.type" :hidden-type="data.unQualifiedDialog.hiddenType" - :list-manager-id="LISTMANAGER_ID" + :list-manager-id="LIST_ID" :info="{ ...data.unQualifiedDialog.info, ...info.value }" :longitude="data.longitude" :latitude="data.latitude" @@ -262,6 +262,7 @@ import { setHiddenDangerDelete, setInventoryTroubleshootingSubmit, setChecklistInspectionStatusRecordSupplementaryRecordingSubmit, + getCheckStandardManagementView, } from "@/request/hazard_investigation.js"; import { useRoute, useRouter } from "vue-router"; import useListData from "@/assets/js/useListData.js"; @@ -283,7 +284,7 @@ import { WarningFilled } from "@element-plus/icons-vue"; const route = useRoute(); const router = useRouter(); -const { LISTMANAGER_ID, CHECKRECORD_ID, DATEEND, DATESTART } = route.query; +const { LIST_ID, CHECKRECORD_ID, DATEEND, DATESTART, LIST_TYPE } = route.query; // entrance: supplementaryRecording是补录，空值是正常录入 const props = defineProps({ entrance: { @@ -337,24 +338,32 @@ const data = reactive({ }, }, }); -const { list: inspectionList } = useListData(getInventoryManagementView, { - otherParams: { LISTMANAGER_ID }, - usePagination: false, - callbackFn: (list, resData) => { - for (let i = 0; i < list.length; i++) { - if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; - if (list[i].ELECTRONIC_FENCE_ID) { - // 存在电子围栏禁止清单排查 - data.canDoCheck = false; +const { list: inspectionList } = useListData( + LIST_TYPE === "1" + ? getInventoryManagementView + : getCheckStandardManagementView, + { + otherParams: + LIST_TYPE === "1" ? { LISTMANAGER_ID: LIST_ID } : { ID: LIST_ID }, + usePagination: false, + callbackFn: (list, resData) => { + if (LIST_TYPE === "1") { + for (let i = 0; i < list.length; i++) { + if (list[i].HASHIDDEN <= 0) list[i].ISNORMAL = 0; + if (list[i].ELECTRONIC_FENCE_ID) { + // 存在电子围栏禁止清单排查 + data.canDoCheck = false; + } + } } - } - info.value = resData.pd; - }, -}); + info.value = resData.pd; + }, + } +); const { list: otherHiddenList, fnGetData: fnGetOtherHidden } = useListData( getInventoryTroubleshootingOtherHiddenList, { - otherParams: { LISTMANAGER_ID }, + otherParams: { LIST_ID }, usePagination: false, key: "hiddenList", } @@ -501,7 +510,7 @@ const fnSubmit = debounce( const inspectedList = cloneDeep(data.form.inspectedList); if (inspectedList.length > 0) inspectedList.splice(0, 1); const params = { - LISTMANAGER_ID, + LIST_ID, LIST_NAME: info.value.NAME, CHECK_TIME: data.form.CHECK_TIME, DESCR: data.form.DESCR, diff --git a/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue similarity index 97% rename from src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue rename to src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue index d116bcf..f4d0a67 100644 --- a/src/views/hazard_investigation/inventory_troubleshooting/standard_inspect.vue +++ b/src/views/hazard_investigation/inventory_troubleshooting/inspect_custom.vue @@ -41,14 +41,7 @@ - - - - - + - + + +
@@ -50,6 +74,7 @@ diff --git a/src/views/keyprojects/inspection/hidden_view.vue b/src/views/keyprojects/inspection/hidden_view.vue new file mode 100644 index 0000000..d386e55 --- /dev/null +++ b/src/views/keyprojects/inspection/hidden_view.vue @@ -0,0 +1,71 @@ + + + + + diff --git a/src/views/keyprojects/inspection/index.vue b/src/views/keyprojects/inspection/index.vue index 4e4754a..3204217 100644 --- a/src/views/keyprojects/inspection/index.vue +++ b/src/views/keyprojects/inspection/index.vue @@ -38,7 +38,14 @@ - + + + - + + +
- 检查信息 + 隐患信息 {{ data.info.INSPECTION_CATEGORY }} @@ -47,7 +47,19 @@ @@ -62,6 +74,7 @@ import { getKeyprojectcheckGoEdit } from "@/request/keyprojects"; import { reactive } from "vue"; import { useRoute } from "vue-router"; +import router from "@/router"; const route = useRoute(); const data = reactive({ diff --git a/src/views/keyprojects/outsourced/add.vue b/src/views/keyprojects/outsourced/add.vue index 5b2ecea..c04af9f 100644 --- a/src/views/keyprojects/outsourced/add.vue +++ b/src/views/keyprojects/outsourced/add.vue @@ -66,7 +66,7 @@ v-model="data.form.UNITS_ID" clearable placeholder="请选择相关方" - @change="fnGetUnitUser" + @change="fnGetUnitUser('', '')" > - + clearable + placeholder="请选择" + > + + @@ -126,12 +134,24 @@ - + + + - + + @@ -139,59 +159,63 @@ - + + + + - - - + + + - - - 处罚相关   - 添加 - - + +
确定
@@ -240,6 +264,7 @@ import { setOutsourcedEdit, setOutsourcedGoEdit, setPersonnelmanagementListAll, + getCorpinfoListAll, } from "@/request/keyprojects"; import { ElMessage } from "element-plus"; import { debounce } from "throttle-debounce"; @@ -247,6 +272,8 @@ import { reactive, ref } from "vue"; import { useRoute, useRouter } from "vue-router"; import LayoutDepartment from "@/components/department/index.vue"; import { getUserListAll } from "@/request/data_dictionary"; +import { verifyDuplicateSelection } from "@/assets/js/utils.js"; +import LayoutUpload from "@/components/upload/index.vue"; const router = useRouter(); const route = useRoute(); @@ -279,26 +306,26 @@ const data = reactive({ acceptanceList: [ { id: Math.random(), - DEPARTMENT_ID: "", - USER_ID: "", + INSPECTION_DEPARTMENT_ID: "", + INSPECTION_USER_ID: "", userList: [], }, ], }, - inspectorList: [ - { INSPECTION_DEPARTMENT_ID: "", INSPECTION_USER_ID: "", USER_SIDE: "" }, - ], + fileList: [], INSPECTOR_List: [], unitsList: [], + groupCorpList: [], + mangeList: [], }); -const addInspector = () => { - data.inspectorList.push({ +const fnAddInspectedList = () => { + data.form.acceptanceList.push({ + id: Math.random(), INSPECTION_DEPARTMENT_ID: "", INSPECTION_USER_ID: "", - USER_SIDE: "", + userList: [], }); - data.INSPECTOR_List.push([]); }; const fnGetData = async () => { @@ -307,21 +334,52 @@ const fnGetData = async () => { }); data.form = resData.pd; data.form.acceptanceList = resData.punishThePerson; + data.form.STARTTIME_TIMES = [resData.pd.STARTTIME, resData.pd.ENDTIME]; + data.form.DEPARTMENT_ID = data.form.DEPARTMENT_ID.split(","); + data.form.INVOLVING_CORPS_DEPART_ID = + data.form.INVOLVING_CORPS_DEPART_ID.split(","); + + fnGetUnitUser(resData.pd.UNITS_PIC, resData.pd.UNITS_PHONE); + for (let index = 0; index < data.form.acceptanceList.length; index++) { + const item = data.form.acceptanceList[index]; + fnInspectDepartmentChange(item.INSPECTION_DEPARTMENT_ID, index); + } + + for (let index = 0; index < resData.file9.length; index++) { + resData.file9[index].name = resData.file9[index].FILE_NAME; + } + data.fileList = resData.file9; }; if (route.query.type === "edit") fnGetData(); +const fnGetCorpList = async () => { + const resData2 = await getCorpinfoListAll({}); + data.mangeList = resData2.varList; + resData2.varList.forEach((item) => { + if ( + item.CORPINFO_ID === "1e6dbbe16004402f8d2c0e52afd9a676" || + item.CORPINFO_ID === "3a854eefa7894e06aaa1a2611bca80f6" || + item.CORPINFO_ID === "020578a4c1f04bc692ee25145c2efbe5" || + item.CORPINFO_ID === "90966974de3c4b83aca6f8fd6432d5c2" + ) { + data.groupCorpList.push(item); + } + }); +}; +fnGetCorpList(); + const fnGetUnitsList = async () => { const resData = await getUnitsListAll({}); data.unitsList = resData.varList; }; fnGetUnitsList(); -const fnGetUnitUser = async () => { +const fnGetUnitUser = async (UNITS_PIC, UNITS_PHONE) => { const resData = await setPersonnelmanagementListAll({ UNITS_ID: data.form.UNITS_ID, }); - data.form.UNITS_PIC = ""; - data.form.UNITS_PHONE = ""; + data.form.UNITS_PIC = UNITS_PIC; + data.form.UNITS_PHONE = UNITS_PHONE; data.unitsUserList = resData.varList; }; @@ -345,6 +403,7 @@ const fnSubmit = debounce( 1000, async () => { await useFormValidate(formRef); + const formData = new FormData(); Object.keys(data.form).forEach((key) => { formData.append(key, data.form[key]); @@ -353,6 +412,24 @@ const fnSubmit = debounce( formData.append("STARTTIME", data.form.STARTTIME_TIMES[0]); formData.append("ENDTIME", data.form.STARTTIME_TIMES[1]); } + + let PUNISH_THE_PERSON = ""; + data.form.acceptanceList.forEach((item) => { + PUNISH_THE_PERSON = item.INSPECTION_USER_ID + "," + PUNISH_THE_PERSON; + }); + if (PUNISH_THE_PERSON.length > 0) { + PUNISH_THE_PERSON = PUNISH_THE_PERSON.substr( + 0, + PUNISH_THE_PERSON.length - 1 + ); + } + formData.set("PUNISH_THE_PERSON", PUNISH_THE_PERSON); + + for (let index = 0; index < data.fileList.length; index++) { + const item = data.fileList[index]; + formData.append("file9", item.raw); + } + route.query.type === "edit" ? await setOutsourcedEdit(formData) : await setOutsourcedAdd(formData); diff --git a/src/views/keyprojects/outsourced/index.vue b/src/views/keyprojects/outsourced/index.vue index 7b24f0f..1db5ae3 100644 --- a/src/views/keyprojects/outsourced/index.vue +++ b/src/views/keyprojects/outsourced/index.vue @@ -62,7 +62,7 @@ /> - +