From ad2ff8e3f79a3505bc66781230b9f5822fcdccaf Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Sat, 8 Feb 2025 10:18:49 +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-=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../vehiclemessage/components/list.vue        | 33 ++++++++++++++++---
 .../dangertruckcheck/components/sendUtil.vue  |  3 ++
 2 files changed, 32 insertions(+), 4 deletions(-)

diff --git a/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue b/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue
index 90d0f97..e0ee290 100644
--- a/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue
+++ b/src/views/longtermvehicleinputportmessage/vehiclemessage/components/list.vue
@@ -145,7 +145,7 @@
             style="width: 300px"
             @change="addUserList"/>
         </el-form-item>
-        <el-form-item v-show="roleName === '普通用户角色'" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
+        <el-form-item v-show="roleName === '普通用户角色'" label="车辆所属部门">
           <el-input v-model="loginDepartmentName" disabled/>
         </el-form-item>
         <!-- 车辆责任人下拉框 -->
@@ -165,19 +165,38 @@
     </el-dialog>
     <el-dialog :visible.sync="editDialogVisible" title="修改" width="600px">
       <el-form ref="editForm" :model="editForm" label-width="170px" style="width: 500px;">
-        <el-form-item :rules="[{required: true}]" label="车牌号">
-          <el-input v-model="editForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoUpdate()"/>
+        <!-- 车牌号输入框 -->
+        <el-form-item
+          :rules="[
+            { required: true, message: '车牌号不能为空' },
+            { pattern: /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/, message: '车牌号格式不正确' }
+          ]"
+          label="车牌号"
+          prop="LICENCE_NO"
+        >
+          <el-input
+            v-model="editForm.LICENCE_NO"
+            :autosize="{ minRows: 1}"
+            type="text"
+            maxlength="300"
+            placeholder="这里输入车牌号..."
+            @blur="goCheckLicenceNoUpdate()"
+          />
         </el-form-item>
+
+        <!-- 车牌类型下拉框 -->
         <el-form-item label="车牌类型" prop="LICENCE_TYPE">
           <el-select v-model="editForm.LICENCE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
             <el-option v-for="item in licenceTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
           </el-select>
         </el-form-item>
+        <!-- 车辆类型下拉框 -->
         <el-form-item label="车辆类型" prop="VEHICLE_TYPE">
           <el-select v-model="editForm.VEHICLE_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
             <el-option v-for="item in vehicleTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
           </el-select>
         </el-form-item>
+        <!-- 车辆所属类型下拉框 -->
         <el-form-item label="车辆所属类型" prop="VEHICLE_BELONG_TYPE">
           <el-select v-model="editForm.VEHICLE_BELONG_TYPE" clearable placeholder="请选择" @visible-change="$forceUpdate()">
             <el-option v-for="item in vehicleBelongTypeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
@@ -505,6 +524,12 @@ export default {
     },
     // 添加弹窗的确定按钮
     addDialogConfirmBtn() {
+      if (this.loginUserName) {
+        this.addForm.USER_ID = this.loginUserId
+        this.addForm.VEHICLE_DEPARTMENT_ID = this.loginDepartmentId
+        this.addForm.USER_NAME = this.loginUserName
+        this.addForm.VEHICLE_DEPARTMENT_NAME = this.loginDepartmentName
+      }
       this.$refs.addForm.validate(valid => {
         if (valid) {
           requestFN(
@@ -867,7 +892,7 @@ export default {
               this.ISCHECK = false
             })
           } else {
-            this.$message.success('车牌号不规范')
+            this.$message.error('车牌号不规范')
             this.ISCHECK = false
           }
         }
diff --git a/src/views/truckinputportmanage/dangertruckcheck/components/sendUtil.vue b/src/views/truckinputportmanage/dangertruckcheck/components/sendUtil.vue
index 3945493..e914d2b 100644
--- a/src/views/truckinputportmanage/dangertruckcheck/components/sendUtil.vue
+++ b/src/views/truckinputportmanage/dangertruckcheck/components/sendUtil.vue
@@ -74,6 +74,9 @@ export default {
       rules: {
         STATUS: [
           { required: true, message: '请选择是否通过', trigger: 'change' }
+        ],
+        OPINION: [
+          { required: true, message: '请填写打回原因', trigger: 'change' }
         ]
       },
       heirloom: {},