From edc013140f0daff181eac7f2e8b5f79124b5fd1d Mon Sep 17 00:00:00 2001 From: xiepeng Date: Sun, 7 Apr 2024 18:51:27 +0800 Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/traffic_safety_commitment.js | 3 +++ src/request/traffic_safety_responsibility.js | 4 ++++ src/views/labor_contract/components/add.vue | 3 +++ src/views/management_staffing/components/add.vue | 1 + src/views/mechanical_files/assigned_manage/view.vue | 1 - src/views/mechanical_files/operations/index.vue | 1 + src/views/occupational_hazards/components/add.vue | 3 +++ src/views/safety_assessment/components/add.vue | 1 + src/views/safety_production/components/add.vue | 1 + src/views/safety_responsibility/components/add.vue | 5 ++++- src/views/safety_responsibility/details.vue | 4 ++-- src/views/security_commitment/components/add.vue | 3 +++ src/views/security_commitment/details.vue | 6 ++---- 13 files changed, 28 insertions(+), 8 deletions(-) diff --git a/src/request/traffic_safety_commitment.js b/src/request/traffic_safety_commitment.js index 1d28e25..43c6af2 100644 --- a/src/request/traffic_safety_commitment.js +++ b/src/request/traffic_safety_commitment.js @@ -15,3 +15,6 @@ export const infoCommitmentView = (params) => export const deleteCommitmentView = (params) => post("/commitment/delete", params); // 删除 承诺书 + +export const getSafetyCommitmentEdit = (params) => + post("/commitment/safetyCommitment", params); // 承诺书列表 diff --git a/src/request/traffic_safety_responsibility.js b/src/request/traffic_safety_responsibility.js index 145086a..f63ba91 100644 --- a/src/request/traffic_safety_responsibility.js +++ b/src/request/traffic_safety_responsibility.js @@ -14,3 +14,7 @@ export const infoResponsibilityView = (params) => export const deleteResponsibilityView = (params) => post("/responsibility/delete", params); // 删除 岗位安全责任书 + + +export const getSafetyResponsibilityEdit = (params) => + upload("/responsibility/getSafetyResponsibilityEdit", params); // 详情 岗位安全责任书 diff --git a/src/views/labor_contract/components/add.vue b/src/views/labor_contract/components/add.vue index f50901e..81b19f1 100644 --- a/src/views/labor_contract/components/add.vue +++ b/src/views/labor_contract/components/add.vue @@ -98,6 +98,9 @@ const rules = { CONTRACTNAME: [ { required: true, message: "请输入合同名称", trigger: "blur" }, ], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const formRef = ref(null); diff --git a/src/views/management_staffing/components/add.vue b/src/views/management_staffing/components/add.vue index b181262..7996bf1 100644 --- a/src/views/management_staffing/components/add.vue +++ b/src/views/management_staffing/components/add.vue @@ -101,6 +101,7 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], + EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], }; const operatingCompany = ref(""); diff --git a/src/views/mechanical_files/assigned_manage/view.vue b/src/views/mechanical_files/assigned_manage/view.vue index 0200314..250d409 100644 --- a/src/views/mechanical_files/assigned_manage/view.vue +++ b/src/views/mechanical_files/assigned_manage/view.vue @@ -124,7 +124,6 @@ const info = ref({}); const getData = async () => { const resData = await findByIdAssignedManageInfo({ ASSIGNED_ID }); info.value = resData.pd; - console.log("-=-=",info.value); info.value.NOW_VEHICLE_OPERATION_CERTIFICATE = addingPrefixToFile( resData.nowVehicleOperationCertificateImgs ); diff --git a/src/views/mechanical_files/operations/index.vue b/src/views/mechanical_files/operations/index.vue index 0c74ef6..18ec762 100644 --- a/src/views/mechanical_files/operations/index.vue +++ b/src/views/mechanical_files/operations/index.vue @@ -238,6 +238,7 @@ const data = reactive({ }); const { list, pagination, searchForm, fnGetData, fnResetPagination, tableRef } = useListData(getOperationsList); + const fnGetDataTransfer = () => { fnGetData({ PLATE_NUMBER: searchForm.value.PLATE_NUMBER, diff --git a/src/views/occupational_hazards/components/add.vue b/src/views/occupational_hazards/components/add.vue index da0a617..cbf5fee 100644 --- a/src/views/occupational_hazards/components/add.vue +++ b/src/views/occupational_hazards/components/add.vue @@ -104,6 +104,9 @@ const rules = { OCCUPATIONALNAME: [ { required: true, message: "请输入职业危害告知书名称", trigger: "blur" }, ], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const formRef = ref(null); diff --git a/src/views/safety_assessment/components/add.vue b/src/views/safety_assessment/components/add.vue index b54fc10..7ddfc68 100644 --- a/src/views/safety_assessment/components/add.vue +++ b/src/views/safety_assessment/components/add.vue @@ -89,6 +89,7 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], + EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], }; const operatingCompany = ref(""); diff --git a/src/views/safety_production/components/add.vue b/src/views/safety_production/components/add.vue index 1916ea8..7c3e539 100644 --- a/src/views/safety_production/components/add.vue +++ b/src/views/safety_production/components/add.vue @@ -88,6 +88,7 @@ const { visible, form } = useVModels(props, emits); const rules = { file: [{ required: true, message: "请上传附件", trigger: "change" }], SYSTEMNAME: [{ required: true, message: "请输入名称", trigger: "blur" }], + EXPIRYDATE: [{ required: true, message: "请选择到期时间", trigger: "change" }], }; const formRef = ref(null); diff --git a/src/views/safety_responsibility/components/add.vue b/src/views/safety_responsibility/components/add.vue index f8f8979..d42cee2 100644 --- a/src/views/safety_responsibility/components/add.vue +++ b/src/views/safety_responsibility/components/add.vue @@ -103,9 +103,12 @@ const rules = { file: [ { required: true, message: "请上传岗位安全责任书", trigger: "change" }, ], - CONTRACTNAME: [ + RESPONSIBILITYNAME: [ { required: true, message: "请输入岗位安全责任书名称", trigger: "blur" }, ], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ], }; const formRef = ref(null); diff --git a/src/views/safety_responsibility/details.vue b/src/views/safety_responsibility/details.vue index 78a8a80..456e1eb 100644 --- a/src/views/safety_responsibility/details.vue +++ b/src/views/safety_responsibility/details.vue @@ -111,8 +111,8 @@ import Add from "@/views/safety_responsibility/components/add.vue"; import LayoutPdf from "@/components/pdf/index.vue"; import { deleteResponsibilityView, - getSafetyResponsibilityList, getSafetyResponsibilityUserList, + getSafetyResponsibilityEdit, } from "@/request/traffic_safety_responsibility.js"; const route = useRoute(); @@ -155,7 +155,7 @@ const fnAddOrEdit = async ( data.addOrEditDialog.type = type; data.addOrEditDialog.form = {}; if (type === "edit" && SAFETYRESPONSIBILITY_ID) { - const resData = await getSafetyResponsibilityList({ + const resData = await getSafetyResponsibilityEdit({ SAFETYRESPONSIBILITY_ID, }); if (resData && resData.varList && resData.varList.length > 0) { diff --git a/src/views/security_commitment/components/add.vue b/src/views/security_commitment/components/add.vue index 8a85fcc..a49e1c6 100644 --- a/src/views/security_commitment/components/add.vue +++ b/src/views/security_commitment/components/add.vue @@ -106,6 +106,9 @@ const rules = { COMMITMENTNAME: [ { required: true, message: "请输入承诺书名称", trigger: "blur" }, ], + EXPIRYDATE: [ + { required: true, message: "请选择到期时间", trigger: "change" }, + ] }; const formRef = ref(null); const fnClose = () => { diff --git a/src/views/security_commitment/details.vue b/src/views/security_commitment/details.vue index 7ec7237..ee490fa 100644 --- a/src/views/security_commitment/details.vue +++ b/src/views/security_commitment/details.vue @@ -105,7 +105,7 @@ import { useRoute } from "vue-router"; import { deleteCommitmentView, - getSafetyCommitmentList, + getSafetyCommitmentEdit, getSafetyCommitmentUserList, } from "@/request/traffic_safety_commitment.js"; import useListData from "@/assets/js/useListData.js"; @@ -114,9 +114,7 @@ import { ElMessage, ElMessageBox } from "element-plus"; import { nextTick, reactive, ref } from "vue"; import Add from "@/views/security_commitment/components/add.vue"; import LayoutPdf from "@/components/pdf/index.vue"; - const route = useRoute(); - const { list, pagination, fnGetData, fnResetPagination } = useListData( getSafetyCommitmentUserList, { @@ -152,7 +150,7 @@ const fnAddOrEdit = async (SECURITYCOMMITMENT_ID = "",USER_ID = "",type = "add") data.addOrEditDialog.visible = true; data.addOrEditDialog.type = type; if (type === "edit" && SECURITYCOMMITMENT_ID && USER_ID) { - const resData = await getSafetyCommitmentList({ + const resData = await getSafetyCommitmentEdit({ SECURITYCOMMITMENT_ID, USER_ID, });