From b1f3b11945c9527dc57bc7e1d27fe8b2246514bc Mon Sep 17 00:00:00 2001 From: xiepeng Date: Mon, 6 May 2024 17:42:14 +0800 Subject: [PATCH] =?UTF-8?q?BUG=20=E4=BC=98=E5=8C=96=20=E8=90=A5=E8=BF=90?= =?UTF-8?q?=E8=BD=A6=E8=BE=86=E5=92=8C=E8=B4=A7=E8=BF=90=E6=8C=82=E8=BD=A6?= =?UTF-8?q?=E7=9A=84=E9=83=A8=E9=97=A8=E6=98=BE=E7=A4=BAID=20=E4=BA=8B?= =?UTF-8?q?=E6=95=85=E4=BA=BA=E5=91=98=E6=98=BE=E7=A4=BAID?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../freight_trailer/add.vue | 24 ++++++++++++++++++- .../freight_trailer/index.vue | 24 +++++++++++++++---- .../freight_trailer/view.vue | 2 +- .../operation_vehicle/view.vue | 3 ++- .../production_accident/add.vue | 8 +++---- 5 files changed, 50 insertions(+), 11 deletions(-) diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue index d56b07e..ab97d1a 100644 --- a/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue +++ b/src/views/enterprise_management/basics_info_management/freight_trailer/add.vue @@ -12,6 +12,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入编号" /> @@ -22,6 +23,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入车牌号" /> @@ -32,6 +34,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入车架号" /> @@ -42,6 +45,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入车身编号" /> @@ -52,6 +56,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入挂车类型" /> @@ -62,12 +67,16 @@ maxlength="50" show-word-limit clearable + placeholder="请输入营运证号" /> - + @@ -77,6 +86,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入车主/业户" /> @@ -87,6 +97,7 @@ maxlength="11" show-word-limit clearable + placeholder="请输入车主电话" /> @@ -97,6 +108,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入联系人" /> @@ -107,6 +119,7 @@ maxlength="11" show-word-limit clearable + placeholder="请输入联系电话" /> @@ -118,6 +131,7 @@ format="YYYY-MM-DD" type="date" clearable + placeholder="请选择初登日期" /> @@ -129,6 +143,7 @@ format="YYYY-MM-DD" type="date" clearable + placeholder="请选择发证日期" /> @@ -140,6 +155,7 @@ format="YYYY-MM-DD" type="date" clearable + placeholder="请选择到期日期" /> @@ -153,6 +169,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入挂车品牌" /> @@ -163,6 +180,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入挂车型号" /> @@ -173,6 +191,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入核定总质量" /> @@ -183,6 +202,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入核定载质量" /> @@ -193,6 +213,7 @@ maxlength="50" show-word-limit clearable + placeholder="请输入容积/体积" /> @@ -205,6 +226,7 @@ maxlength="250" show-word-limit clearable + placeholder="请输入备注" /> diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue index eda45ab..1131fd1 100644 --- a/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue +++ b/src/views/enterprise_management/basics_info_management/freight_trailer/index.vue @@ -9,22 +9,38 @@ - + - + - + - + diff --git a/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue b/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue index dd32320..61664a7 100644 --- a/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue +++ b/src/views/enterprise_management/basics_info_management/freight_trailer/view.vue @@ -25,7 +25,7 @@ - {{ info.DEPARTMENT_NAME }} + {{ info.DEPARTMENTNAME }} {{ info.CAR_OWNERS }} diff --git a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue index d2f60cc..31cf236 100644 --- a/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue +++ b/src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue @@ -22,7 +22,7 @@ {{ info.OPERATING_CERTIFICATE }} - {{ info.BELONGING_DEPARTMENT }} + {{ info.DEPARTMENTNAME }} {{ info.VEHICLE_TYPE }} @@ -158,6 +158,7 @@ const info = ref({}); const fnGetData = async () => { if (!OPERATING_ID) return; const resData = await findByIdOperatingVehicleInfo({ OPERATING_ID }); + console.log(resData); info.value = resData.pd; info.value.HEADSTOCK_PHOTO = addingPrefixToFile(resData.headstockphoto); info.value.DRIVINGLICENSE_PHOTO = addingPrefixToFile( diff --git a/src/views/mechanical_files/production_accident/add.vue b/src/views/mechanical_files/production_accident/add.vue index f5d56f3..f2a5fc9 100644 --- a/src/views/mechanical_files/production_accident/add.vue +++ b/src/views/mechanical_files/production_accident/add.vue @@ -420,17 +420,16 @@ const route = useRoute(); // 通过路由查询参数来判断模式 const isEditMode = ref(false); const ACCIDENTINVESTIGATION_ID = ref(""); - const formRef = ref(null); const rules = reactive({ - USER_ID: [{ required: true, message: "请选择事故人员", trigger: "change" }], + GENDER: [{ required: true, message: "请选择人员性别", trigger: "change" }], - AGE: [{ required: true, message: "请输入人员年龄", trigger: "blur" }], + AGE: [{ required: true, message: "请输入人员年龄", trigger: "change" }], EDUCATIONALLEVEL: [ { required: true, message: "请选择文化水平", trigger: "change" }, ], DEPARTMENT: [{ required: true, message: "请输入工作部门", trigger: "blur" }], - JOBTYPE: [{ required: true, message: "请输入员工工种", trigger: "blur" }], + JOBTYPE: [{ required: true, message: "请输入员工工种", trigger: "change" }], ENTRYDATE: [{ required: true, message: "请选择入职日期", trigger: "change" }], ACCIDENTDATE: [ { required: true, message: "请选择事故日期", trigger: "change" }, @@ -573,6 +572,7 @@ const fnGetData = async () => { if (!ACCIDENTINVESTIGATION_ID) return; const resData = await infoAccidentInvestigation({ ACCIDENTINVESTIGATION_ID }); data.form = resData.pd; + data.form.USER_ID = resData.pd.CASUALTYNAME data.form.fileList = addingPrefixFile(resData.pd.ACCIDENTANALYSISRECORD); data.form.ACCIDENTANALYSISRECORD = addingPrefixFile( resData.pd.ACCIDENTREPORTRECORD