From 0b7595c308c7a4a884f1bcdab60ecf39c6006cf4 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Thu, 6 Feb 2025 15:04:18 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](pet=5F?=
 =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81):=20=20-=20=E9=97=A8?=
 =?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ordinaryCar/components/corpList.vue         |  4 ++--
 .../vehiclemessage/components/index_view.vue    |  2 +-
 .../xgfCarMessage/components/car_view.vue       | 12 ++++++------
 .../blacklist/components/list.vue               |  2 +-
 .../records/components/list.vue                 | 17 +++++++++++------
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/src/views/freightVehicles/ordinaryCar/components/corpList.vue b/src/views/freightVehicles/ordinaryCar/components/corpList.vue
index d7d3aaf..68e646b 100644
--- a/src/views/freightVehicles/ordinaryCar/components/corpList.vue
+++ b/src/views/freightVehicles/ordinaryCar/components/corpList.vue
@@ -1,8 +1,8 @@
 <template>
   <div class="app-container">
-    <el-form label-width="90px">
+    <el-form label-width="130px">
       <el-row>
-        <el-col :span="4">
+        <el-col :span="5">
           <el-form-item label="相关方单位名称">
             <el-input v-model="searchForm.CORP_NAME" placeholder="相关方单位名称"/>
           </el-form-item>
diff --git a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
index dfbbc1c..52110b1 100644
--- a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
+++ b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
@@ -671,7 +671,7 @@ export default {
       ).then((data) => {
         if (data.result === 'success') {
           this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // 车辆所属部门
+          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_NAME // 车辆所属部门
           this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // 车牌类型
           this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // 车辆类型
           this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
diff --git a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
index bffe6b7..3b27ecf 100644
--- a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
@@ -97,8 +97,8 @@
               {{ translateVehicleType(row.VEHICLE_TYPE) }}
             </template>
           </el-table-column>
-          <el-table-column prop="XGF_DEPT_NAME" label="车辆所属部门" align="center" />
-          <el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
+          <el-table-column prop="DEPT_NAME" label="车辆所属部门" align="center" />
+          <el-table-column prop="U_NAME" label="车辆责任人" align="center"/>
           <el-table-column label="操作" align="center" width="480">
             <template slot-scope="{row}">
               <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
@@ -459,7 +459,7 @@ export default {
       console.log('22222222222222222222222222222')
       this.listLoading = true
       requestFN(
-        'vehiclemessage/getPageList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
+        'mkmjManagement/zgCarInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           ...this.searchForm,
           'CORPINFO_ID': this.CORPINFO_ID,
@@ -467,7 +467,7 @@ export default {
         }
       ).then((data) => {
         this.listLoading = false
-        this.varList = data.varList
+        this.varList = data.carInfoList
         this.total = data.page.totalResult
         // this.hasButton()
         this.pd = data.pd
@@ -644,11 +644,11 @@ export default {
       ).then((data) => {
         if (data.result === 'success') {
           this.detailForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPARTMENT_NAME // 车辆所属部门
+          this.detailForm.VEHICLE_DEPARTMENT_ID = data.pd.DEPT_NAME // 车辆所属部门
           this.detailForm.LICENCE_TYPE = this.translateLicenceType(data.pd.LICENCE_TYPE) // 车牌类型
           this.detailForm.VEHICLE_TYPE = this.translateVehicleType(data.pd.VEHICLE_TYPE) // 车辆类型
           this.detailForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : this.translateVehicleBelongType(data.pd.VEHICLE_BELONG_TYPE)
-          this.detailForm.USER_ID = data.pd.USER_NAME // 车辆责任人
+          this.detailForm.USER_ID = data.pd.U_NAME // 车辆责任人
         } else {
           this.$message({
             message: '数据回显失败',
diff --git a/src/views/vehiclebreakrules/blacklist/components/list.vue b/src/views/vehiclebreakrules/blacklist/components/list.vue
index ed66e1c..69b5aff 100644
--- a/src/views/vehiclebreakrules/blacklist/components/list.vue
+++ b/src/views/vehiclebreakrules/blacklist/components/list.vue
@@ -70,7 +70,7 @@
       </el-table-column>
       <el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center"/>
       <el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
-      <el-table-column prop="ISEXIST" label="是否存在" align="center" />
+<!--      <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->
       <el-table-column label="操作" align="center" width="480">
         <template slot-scope="{row}">
           <el-button icon="el-icon-view" size="mini" @click="showDetail(row.BLACK_LIST_ID)">详情</el-button>
diff --git a/src/views/vehiclebreakrules/records/components/list.vue b/src/views/vehiclebreakrules/records/components/list.vue
index 033d51c..bb543e6 100644
--- a/src/views/vehiclebreakrules/records/components/list.vue
+++ b/src/views/vehiclebreakrules/records/components/list.vue
@@ -77,7 +77,7 @@
       <el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center" />
       <el-table-column prop="USER_NAME" label="车辆责任人" align="center" width="120" />
       <el-table-column prop="VIOLATION_COUNT" label="违规次数" align="center" />
-      <el-table-column prop="ISEXIST" label="是否存在" align="center" />
+<!--      <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->
 
       <el-table-column label="操作" align="center" width="480">
         <template slot-scope="{row}">
@@ -228,7 +228,13 @@ export default {
           { pattern: /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/, message: '请填写正确的车牌号', trigger: 'blur' }
         ],
         VIOLATION_TYPE: [{ required: true, message: '请选择违规类型', trigger: 'blur' }],
-        FFILE: [{ required: true, message: '违规图片不能为空', trigger: 'blur' }],
+        FFILE: [{ required: true, validator: (rule, value, callback) => {
+            if (value.length === 0) {
+              callback(new Error('违规图片不能为空'));
+            } else {
+              callback();
+            }
+          }, trigger: 'blur' }],
         LOCATION: [{ required: true, message: '违规区域不能为空', trigger: 'blur' }],
         VIOLATIONTIME: [{ required: true, message: '违规时间不能为空', trigger: 'blur' }],
         LICENCE_TYPE: [{ required: true, message: '请选择车牌类型', trigger: 'blur' }],
@@ -376,6 +382,7 @@ export default {
     // 图片上传相关的函数
     handleRemove(file, fileList) {
       this.violationUpload = fileList.length >= 4
+      this.addForm.FFILE = fileList
     },
     handleChangeIMG(file, fileList) {
       const types = ['image/jpeg', 'image/jpg', 'image/png']
@@ -385,6 +392,7 @@ export default {
         fileList.pop()
       }
       this.violationUpload = fileList.length >= 4
+      this.addForm.FFILE = fileList
     },
     // 点击放大图片
     handlePictureCardPreview(file) {
@@ -404,14 +412,11 @@ export default {
     },
     // 添加弹窗的确定按钮
     addDialogConfirmBtn(formName) {
-      this.addForm.FFILE = this.violation_files
       this.$refs[formName].validate((valid) => {
         if (!valid) {
           return false
         }
-        this.$refs.addForm.validate(valid => {
-          this.addRequest(valid) // 同时保存多张图片
-        })
+        this.addRequest(); // 调用保存方法
       })
     },
     addRequest(valid) {