BUG 优化 营运车辆和货运挂车的部门显示ID

事故人员显示ID

src/views/enterprise_management/basics_info_management/freight_trailer/add.vue

@@ -12,6 +12,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入编号"
             />
           </el-form-item>
         </el-col>
@@ -22,6 +23,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入车牌号"
             />
           </el-form-item>
         </el-col>
@@ -32,6 +34,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入车架号"
             />
           </el-form-item>
         </el-col>
@@ -42,6 +45,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入车身编号"
             />
           </el-form-item>
         </el-col>
@@ -52,6 +56,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入挂车类型"
             />
           </el-form-item>
         </el-col>
@@ -62,12 +67,16 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入营运证号"
             />
           </el-form-item>
         </el-col>
         <el-col :span="12">
           <el-form-item label="归属部门" prop="BELONGING_DEPT">
-            <layout-department v-model="form.BELONGING_DEPT" />
+            <layout-department
+              v-model="form.BELONGING_DEPT"
+              placeholder="请选择归属部门"
+            />
           </el-form-item>
         </el-col>
         <el-col :span="12">
@@ -77,6 +86,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入车主/业户"
             />
           </el-form-item>
         </el-col>
@@ -87,6 +97,7 @@
               maxlength="11"
               show-word-limit
               clearable
+              placeholder="请输入车主电话"
             />
           </el-form-item>
         </el-col>
@@ -97,6 +108,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入联系人"
             />
           </el-form-item>
         </el-col>
@@ -107,6 +119,7 @@
               maxlength="11"
               show-word-limit
               clearable
+              placeholder="请输入联系电话"
             />
           </el-form-item>
         </el-col>
@@ -118,6 +131,7 @@
               format="YYYY-MM-DD"
               type="date"
               clearable
+              placeholder="请选择初登日期"
             />
           </el-form-item>
         </el-col>
@@ -129,6 +143,7 @@
               format="YYYY-MM-DD"
               type="date"
               clearable
+              placeholder="请选择发证日期"
             />
           </el-form-item>
         </el-col>
@@ -140,6 +155,7 @@
               format="YYYY-MM-DD"
               type="date"
               clearable
+              placeholder="请选择到期日期"
             />
           </el-form-item>
         </el-col>
@@ -153,6 +169,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入挂车品牌"
             />
           </el-form-item>
         </el-col>
@@ -163,6 +180,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入挂车型号"
             />
           </el-form-item>
         </el-col>
@@ -173,6 +191,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入核定总质量"
             />
           </el-form-item>
         </el-col>
@@ -183,6 +202,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入核定载质量"
             />
           </el-form-item>
         </el-col>
@@ -193,6 +213,7 @@
               maxlength="50"
               show-word-limit
               clearable
+              placeholder="请输入容积/体积"
             />
           </el-form-item>
         </el-col>
@@ -205,6 +226,7 @@
               maxlength="250"
               show-word-limit
               clearable
+              placeholder="请输入备注"
             />
           </el-form-item>
         </el-col>

src/views/enterprise_management/basics_info_management/freight_trailer/index.vue

@@ -9,22 +9,38 @@
         <el-row>
           <el-col :span="4">
             <el-form-item label="车牌号" prop="PLATE_NUMBER">
-              <el-input v-model="searchForm.PLATE_NUMBER" clearable />
+              <el-input
+                v-model="searchForm.PLATE_NUMBER"
+                placeholder="请输入车牌号"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="车架号" prop="VIN">
-              <el-input v-model="searchForm.VIN" clearable />
+              <el-input
+                v-model="searchForm.VIN"
+                placeholder="请输入车架号"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="编号" prop="NUM">
-              <el-input v-model="searchForm.NUM" clearable />
+              <el-input
+                v-model="searchForm.NUM"
+                placeholder="请输入编号"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="5">
             <el-form-item label="归属部门" prop="DEPARTMENT_NAME">
-              <el-input v-model="searchForm.DEPARTMENT_NAME" clearable />
+              <el-input
+                v-model="searchForm.DEPARTMENT_NAME"
+                placeholder="请输入归属部门"
+                clearable
+              />
             </el-form-item>
           </el-col>
           <el-col :span="3">

src/views/enterprise_management/basics_info_management/freight_trailer/view.vue

@@ -25,7 +25,7 @@
         <!--{{ info.TRANSPORT_ENTERPRISESNAME }}-->
         <!--</el-descriptions-item>-->
         <el-descriptions-item label-class-name="width_200" label="归属部门">
-          {{ info.DEPARTMENT_NAME }}
+          {{ info.DEPARTMENTNAME }}
         </el-descriptions-item>
         <el-descriptions-item label-class-name="width_200" label="车主/业户">
           {{ info.CAR_OWNERS }}

src/views/enterprise_management/basics_info_management/operation_vehicle/view.vue

@@ -22,7 +22,7 @@
           {{ info.OPERATING_CERTIFICATE }}
         </el-descriptions-item>
         <el-descriptions-item label="归属部门">
-          {{ info.BELONGING_DEPARTMENT }}
+          {{ info.DEPARTMENTNAME }}
         </el-descriptions-item>
         <el-descriptions-item label="车辆类型">
           {{ 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(

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