From def2819255a267ed3de49014c9986b795f6fe6f7 Mon Sep 17 00:00:00 2001 From: xiepeng Date: Wed, 29 May 2024 14:06:05 +0800 Subject: [PATCH] =?UTF-8?q?BUG=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/request/enterprise_management.js | 3 + .../waybill_registration/add.vue | 4 + .../user_practitioner/details.vue | 102 +++++++++++++++++- .../user_practitioner/index.vue | 1 + src/views/labor_contract/index.vue | 4 +- src/views/management_staffing/index.vue | 4 +- .../mechanical_files/assigned_manage/add.vue | 4 + .../production_accident/add.vue | 17 ++- .../production_accident/edit.vue | 18 +++- .../tank_truck_inspection_record/add.vue | 5 +- .../violation_registration/add.vue | 21 +++- .../violation_registration/index.vue | 11 +- src/views/safety_assessment/index.vue | 4 +- src/views/safety_production/index.vue | 4 +- 14 files changed, 166 insertions(+), 36 deletions(-) diff --git a/src/request/enterprise_management.js b/src/request/enterprise_management.js index 9212c65..906778e 100644 --- a/src/request/enterprise_management.js +++ b/src/request/enterprise_management.js @@ -77,6 +77,9 @@ export const findTrailerByPlateNumber = (params) => export const getChoiceTrailerList = (params) => post("/taxationmanage/choicetrailerlist", params); // 车船税添加选择挂车 +export const getAllVehicleList = (params) => + post("/freightTrailer/getAllVehicleList", params); // 获取营运车辆和货运挂车所有车辆 + const getCorpList = (params) => post("/freightTrailer/corpList", params); export const getFreightTrailerCorpList = async () => { const resData = await getCorpList(); diff --git a/src/views/electronic_waybill_management/waybill_registration/add.vue b/src/views/electronic_waybill_management/waybill_registration/add.vue index 6cbda28..c059fcd 100644 --- a/src/views/electronic_waybill_management/waybill_registration/add.vue +++ b/src/views/electronic_waybill_management/waybill_registration/add.vue @@ -410,6 +410,9 @@ const rules = { PRACTITIONER: [ { required: true, message: "请选择从业人员", trigger: "change" }, ], + DEPARTMENT_ID: [ + { required: true, message: "请选择部门", trigger: "change"} + ] }; const data = reactive({ @@ -501,6 +504,7 @@ const changeCONFIRMINGPERSON = (contactPersonId) => { const fnGetUnitsList = async () => { const resData = await getUserPersonTypeListAll({}); data.userTypeList = resData.userList; + data.userTypeList = data.userTypeList.filter(( item ) => item.APPLY_STATUS === '1') }; fnGetUnitsList(); diff --git a/src/views/enterprise_management/user_practitioner/details.vue b/src/views/enterprise_management/user_practitioner/details.vue index 1447a32..846f36f 100644 --- a/src/views/enterprise_management/user_practitioner/details.vue +++ b/src/views/enterprise_management/user_practitioner/details.vue @@ -86,7 +86,92 @@ {{ data.info.EMAIL }} -
+ 身份证 + + + + + + + + + {{ data.idCard.ID_ADDRESS }} + + + {{ data.idCard.ID_NO }} + + + {{ data.idCard.ID_ORGAN }} + + + {{ data.idCard.ID_VALIDITY_START + "至" + data.idCard.ID_VALIDITY_END }} + + + 驾驶证 + + + + + + {{ data.drivingLicence.ID_NO }} + + + {{ data.drivingLicence.ALLOW_QUALIFICATION }} + + + {{ data.drivingLicence.ID_ORGAN }} + + + {{ data.drivingLicence.ID_VALIDITY_START + "至" + data.drivingLicence.ID_VALIDITY_END }} + + + 道路运输从业资格证 + + + + + + {{ data.qualificationCertificate.ID_NO }} + + + {{ data.qualificationCertificate.ALLOW_QUALIFICATION }} + + + {{ data.qualificationCertificate.ID_ORGAN }} + + + {{ data.qualificationCertificate.ID_VALIDITY_START + "至" + data.qualificationCertificate.ID_VALIDITY_END }} + + +
返回
@@ -204,6 +289,9 @@ const data = reactive({ certificateList: [], statusInfo: {}, dispose: "", + idCard: [], + drivingLicence: [], + qualificationCertificate: [] }); const fnGetData = async () => { if (!USER_ID) return; @@ -233,6 +321,16 @@ const fnGetData = async () => { item.ALLOW_QUALIFICATION = null; } }); + data.certificateList.forEach(( item ) => { + if(item.CERTIFICATE_CATEGORY === '1') { + data.idCard = item; + }else if(item.CERTIFICATE_CATEGORY === '2') { + data.drivingLicence = item + }else if(item.CERTIFICATE_CATEGORY === '3') { + data.qualificationCertificate = item + } + }) + console.log("1111",data.certificateList); if ( data.statusInfo.APPLY_TYPE === "1" || data.statusInfo.APPLY_TYPE === "3" diff --git a/src/views/enterprise_management/user_practitioner/index.vue b/src/views/enterprise_management/user_practitioner/index.vue index 67cf8a7..e9f9904 100644 --- a/src/views/enterprise_management/user_practitioner/index.vue +++ b/src/views/enterprise_management/user_practitioner/index.vue @@ -202,6 +202,7 @@ const { list, pagination, searchForm, fnGetData, fnResetPagination } = // APPLY_TYPE: "1-3", }, }); +console.log(await getPractitionerList()); const data = reactive({ personnelTypeList: [], reviewDialog: { diff --git a/src/views/labor_contract/index.vue b/src/views/labor_contract/index.vue index a006f19..cf8bdeb 100644 --- a/src/views/labor_contract/index.vue +++ b/src/views/labor_contract/index.vue @@ -16,14 +16,14 @@ /> - + diff --git a/src/views/management_staffing/index.vue b/src/views/management_staffing/index.vue index a01b935..4b2debd 100644 --- a/src/views/management_staffing/index.vue +++ b/src/views/management_staffing/index.vue @@ -16,14 +16,14 @@ /> - + diff --git a/src/views/mechanical_files/assigned_manage/add.vue b/src/views/mechanical_files/assigned_manage/add.vue index c8454e4..42205e6 100644 --- a/src/views/mechanical_files/assigned_manage/add.vue +++ b/src/views/mechanical_files/assigned_manage/add.vue @@ -411,6 +411,8 @@ const form = ref({ }); const info = ref({}); const fnEditVehicleModel = async () => { + form.value.NOW_OWNERS = ''; + form.value.NOW_OWNERS_NUMBER = ''; form.value.VEHICLE_PLATE_NUMBER = null; form.value.VEHICLE = {}; if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { @@ -422,6 +424,8 @@ const fnEditVehicleModel = async () => { } }; const fnGetVehicleInfo = async () => { + form.value.NOW_OWNERS = ''; + form.value.NOW_OWNERS_NUMBER = ''; if (form.value.ASSIGNED_VEHICLE_MODEL === "运输车辆") { for (let i = 0; i < form.value.OPERATIONVEHICLELIST.length; i++) { if ( diff --git a/src/views/mechanical_files/production_accident/add.vue b/src/views/mechanical_files/production_accident/add.vue index a5cc59a..fe47065 100644 --- a/src/views/mechanical_files/production_accident/add.vue +++ b/src/views/mechanical_files/production_accident/add.vue @@ -42,10 +42,10 @@ placeholder="请选择文化水平" > @@ -402,7 +402,7 @@