[问题修复](pet_门口门禁):

- 门口门禁bug修复
2025-02-08 16:20:10 +08:00 · 2025-02-08 16:20:10 +08:00 · 24329ea878
parent b1f28ac155
commit 24329ea878
6 changed files with 145 additions and 111 deletions
--- a/src/views/freightVehicles/filingAudit/components/list.vue
+++ b/src/views/freightVehicles/filingAudit/components/list.vue
@ -38,6 +38,12 @@
      <el-table-column type="index" label="序号" width="50" align="center"/>
      <el-table-column prop="MOTORCADE_NAME" label="车队名称"/>
      <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称"/>
+      <el-table-column
+        prop="CREATE_TIME"
+        label="申请时间"
+        align="center"
+        :formatter="(row) => formatCreateTime(row.CREATE_TIME)"
+      />
      <el-table-column label="审核状态" align="center" width="120">
        <template slot-scope="{row}">
          {{ getType(row.IS_AUDIT) }}
@ -46,7 +52,9 @@
      <el-table-column label="操作" align="left" width="300">
        <template slot-scope="{row}">
          <el-button type="primary" icon="el-icon-view" size="mini" @click="detail(row)">查看详情</el-button>
-          <el-button v-if="checkButton(row)" type="success" icon="el-icon-check" size="mini" @click="approve(row)">审核</el-button>
+          <el-button v-if="checkButton(row)" type="success" icon="el-icon-check" size="mini" @click="approve(row)">
+            审核
+          </el-button>
        </template>
      </el-table-column>
    </el-table>
@ -144,6 +152,8 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import {requestFN} from '@/utils/request'
 import SendUtil from './sendUtil.vue'
+import dayjs from 'dayjs'; // 或者使用 moment
+
 export default {
  components: {SendUtil, Pagination},
  data() {
@ -185,6 +195,10 @@ export default {
    this.getList()
  },
  methods: {
+    formatCreateTime(time) {
+      if (!time) return '--'; // 如果时间为空，返回默认值
+      return dayjs(time).format('YYYY-MM-DD HH:mm:ss'); // 格式化时间
+    },
    checkButton(row) {
      console.log('---------------------')
      console.log('row.IS_AUDIT:', row.IS_AUDIT) // 添加日志输出
--- a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
+++ b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
@ -189,6 +189,7 @@
            <!-- 车辆所属部门下拉框 -->
            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
              <SelectTree
+                :key="editForm.VEHICLE_DEPARTMENT_ID"
                ref="selectTree_edit"
                :clearable="true"
                :options="treeData"
@ -625,19 +626,11 @@ export default {
        if (data.result === 'success') {
          this.editForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
          this.editForm.OLD_LICENCE_NO = data.pd.LICENCE_NO // 车牌号
-          this.editForm.USER_ID = data.pd.USER_ID // 车辆责任人
+          this.editForm.USER_ID = data.pd.QC_USER_NAME // 车辆责任人
+          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.QC_DEPT_NAME
          this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
          this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
          this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
-          if ('VEHICLE_DEPARTMENT_ID' in data.pd) { // 存在车辆归属部门id
-            const node = {}
-            node.id = data.pd.VEHICLE_DEPARTMENT_ID
-            // this.$refs.selectTree_edit.clearHandle() // 这句代码会报错，注释掉了
-            this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
-            this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
-              this.$refs.selectTree_edit.handleNodeClick(node)
-            })
-          }
        } else {
          this.$message({
            message: '数据回显失败',
@ -787,11 +780,9 @@ export default {
      })
    },
    resetSearch() {
-      this.searchForm = {
-        LICENCE_NO: '' // 车牌号（输入框）
-      }
+      this.searchForm.LICENCE_NO = ''
      this.$refs.selectTree_Search1.clearHandle() // 清空
-      this.$refs.selectTree_Search2.clearHandle()
+      this.searchForm.USER_NAME = ''
    },
    addUserList(DEPARTMENT_ID) {
      // this.getUserList(DEPARTMENT_ID)
--- a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
@ -201,13 +201,14 @@
            <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
              <SelectTree
                ref="selectTree_edit"
-                :clearable="true"
+                :clearable="false"
                :options="treeData"
                :props="defaultProps"
                v-model="editForm.VEHICLE_DEPARTMENT_ID"
                placeholder="请选择车辆所属部门"
                style="width: 300px"
-                @change="updateUserList"/>
+                @change="updateUserList"
+              />
            </el-form-item>
            <!-- 车辆责任人下拉框 -->
            <el-form-item label="车辆责任人" prop="USER_ID">
@ -599,18 +600,12 @@ export default {
          this.editForm.LICENCE_NO = data.pd.LICENCE_NO // 车牌号
          this.editForm.OLD_LICENCE_NO = data.pd.LICENCE_NO // 车牌号
          this.editForm.USER_ID = data.pd.USER_ID // 车辆责任人
+          this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
          this.editForm.LICENCE_TYPE = String(data.pd.LICENCE_TYPE) // 车牌类型
          this.editForm.VEHICLE_TYPE = String(data.pd.VEHICLE_TYPE) // 车辆类型
          this.editForm.VEHICLE_BELONG_TYPE = data.pd.VEHICLE_BELONG_TYPE === undefined ? '' : data.pd.VEHICLE_BELONG_TYPE // 车辆所属类型
-          if ('VEHICLE_DEPARTMENT_ID' in data.pd) { // 存在车辆归属部门id
-            const node = {}
-            node.id = data.pd.VEHICLE_DEPARTMENT_ID
-            // this.$refs.selectTree_edit.clearHandle() // 这句代码会报错，注释掉了
-            this.editForm.VEHICLE_DEPARTMENT_ID = data.pd.VEHICLE_DEPARTMENT_ID
-            this.$nextTick(() => { // 此处使用这个可以等节点渲染后再获取节点
-              this.$refs.selectTree_edit.handleNodeClick(node)
-            })
-          }
+          console.log('------------------')
+          console.log(this.editForm)
        } else {
          this.$message({
            message: '数据回显失败',
@ -622,6 +617,7 @@ export default {
    },
    editDialogCancelBtn() {
      this.editDialogVisible = false
+      this.$refs["editForm"].resetFields()
    },
    // 查看按钮(展示详情)
    showDetail(VEHICLE_ID) {
@ -738,11 +734,9 @@ export default {
    },

    resetSearch() {
-      this.searchForm = {
-        LICENCE_NO: '' // 车牌号（输入框）
-      }
+      this.searchForm.LICENCE_NO = ''
      this.$refs.selectTree_Search1.clearHandle() // 清空
-      this.$refs.selectTree_Search2.clearHandle()
+      this.searchForm.USER_NAME = ''
    },
    addUserList(DEPARTMENT_ID) {
      // this.getUserList(DEPARTMENT_ID)
@ -764,7 +758,7 @@ export default {
        }
      ).then((data) => {
        console.info(data)
-        this.userList = data.userList
+        this.userList = data.xgfUserList
      }).catch((e) => {
        // this.listLoading = false
      })
--- a/src/views/longtermvehicle/zgCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/zgCarMessage/components/car_view.vue
@ -738,11 +738,9 @@ export default {
    },

    resetSearch() {
-      this.searchForm = {
-        LICENCE_NO: '' // 车牌号（输入框）
-      }
+      this.searchForm.LICENCE_NO = ''
      this.$refs.selectTree_Search1.clearHandle() // 清空
-      this.$refs.selectTree_Search2.clearHandle()
+      this.searchForm.USER_NAME = ''
    },
    addUserList(DEPARTMENT_ID) {
      // this.getUserList(DEPARTMENT_ID)
--- a/src/views/vehiclebreakrules/records/components/info.vue
+++ b/src/views/vehiclebreakrules/records/components/info.vue
@ -76,6 +76,7 @@ import waves from '@/directive/waves' // waves directive
 import WriteSign from '@/components/WriteSign'
 import SelectTree from '@/components/SelectTree'
 import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart'
+import 'element-ui/lib/theme-chalk/index.css';
 export default {
  components: { Pagination, WriteSign, safetyFlowChart, SelectTree },
  directives: { waves },
@ -175,6 +176,12 @@ export default {
    },
    // 清除违规记录
    deleteSingleDataDeleteBtn(VIOLATION_ID) {
+      console.log('1111111111111111111111111111111111111111111')
+      this.$confirm('确定要删除这条违规记录吗？', '提示', {
+        confirmButtonText: '确定',
+        cancelButtonText: '取消',
+        type: 'warning'
+      }).then(() => {
        requestFN(
          '/breakRulesRecord/deleteRecord',
          {
@ -192,6 +199,12 @@ export default {
            this.getList() // 重新加载列表
          }
        })
+      }).catch(() => {
+        this.$message({
+          type: 'info',
+          message: '已取消删除'
+        })
+      })
    }
  }
 }
--- a/src/views/vehiclebreakrules/records/components/list.vue
+++ b/src/views/vehiclebreakrules/records/components/list.vue
@ -62,7 +62,12 @@
        width="55"
        align="center"/>
      <el-table-column type="index" label="序号" width="50" align="center"/>
-      <el-table-column prop="CORPINFO_NAME" label="分公司名称" align="center" />
+      <el-table-column
+        prop="CORPINFO_NAME"
+        label="分公司名称"
+        align="center"
+        :formatter="(row) => formatCorpInfoName(row)"
+      />
      <el-table-column prop="LICENCE_NO" label="车牌号" align="center"/>
      <el-table-column label="车牌类型" align="center" width="120">
        <template slot-scope="{row}">
@ -74,8 +79,19 @@
          {{ translateVehicleType(row.VEHICLE_TYPE) }}
        </template>
      </el-table-column>
-      <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="VEHICLE_DEPARTMENT_NAME"
+        label="车辆所属部门"
+        align="center"
+        :formatter="(row) => formatDepartmentName(row)"
+      />
+      <el-table-column
+        prop="USER_NAME"
+        label="车辆责任人"
+        align="center"
+        width="120"
+        :formatter="(row) => formatUserName(row)"
+      />
      <el-table-column prop="VIOLATION_COUNT" label="违规次数" align="center"/>
      <!--      <el-table-column prop="ISEXIST" label="是否存在" align="center" />-->

@ -93,9 +109,11 @@
    </div>
    <!--  添加车辆违规信息  -->
    <el-dialog :visible.sync="addDialogVisible" title="添加车辆违规信息" width="600px">
-      <el-form v-if="addDialogVisible" ref="addForm" :rules="addFormRules" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;">
+      <el-form v-if="addDialogVisible" ref="addForm" :rules="addFormRules" :model="addForm" label-width="170px"
+               style="padding:0 20px; width: 500px;">
        <el-form-item label="车牌号" label-width="110px" prop="LICENCE_NO">
-          <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNo()"/>
+          <el-input v-model="addForm.LICENCE_NO" :autosize="{ minRows: 1}" type="text" maxlength="300"
+                    placeholder="这里输入车牌号..." @blur="goCheckLicenceNo()"/>
        </el-form-item>
        <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
        <el-form-item label="车牌类型" label-width="110px" prop="LICENCE_TYPE">
@ -110,7 +128,9 @@
          </el-select>
        </el-form-item>
        <el-form-item label="违规时间" label-width="110px" prop="VIOLATIONTIME">
-          <el-date-picker id="VIOLATIONTIME" ref="VIOLATIONTIME" v-model="addForm.VIOLATIONTIME" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" style="width: 100%" type="datetime" placeholder="请选择" />
+          <el-date-picker id="VIOLATIONTIME" ref="VIOLATIONTIME" v-model="addForm.VIOLATIONTIME"
+                          value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss" style="width: 100%"
+                          type="datetime" placeholder="请选择"/>
        </el-form-item>
        <!-- 违规类型：（0-未按规定车道行驶，1-违规停车） 下拉框-->
        <el-form-item label="违规类型" label-width="110px" prop="VIOLATION_TYPE">
@ -124,7 +144,8 @@
            style="width: 300px"/>
        </el-form-item>
        <el-form-item label="违规区域" label-width="110px" prop="LOCATION">
-          <el-input :rows="3" v-model="addForm.LOCATION" type="textarea" placeholder="违规区域需明确车辆在港口内的具体违规位置如某一口门附近、某一码头区域、某一仓库通道等..."/>
+          <el-input :rows="3" v-model="addForm.LOCATION" type="textarea"
+                    placeholder="违规区域需明确车辆在港口内的具体违规位置如某一口门附近、某一码头区域、某一仓库通道等..."/>
        </el-form-item>
        <el-form-item label="违规图片" label-width="110px" prop="FFILE">
          <el-upload
@ -166,6 +187,7 @@ import WriteSign from '@/components/WriteSign'
 import SelectTree from '@/components/SelectTree'
 import safetyFlowChart from '../../../hiddenUtil/safetyFlowChart'
 import {upload} from '@/utils/upload'
+
 export default {
  components: {Pagination, WriteSign, safetyFlowChart, SelectTree},
  directives: {waves},
@ -225,16 +247,22 @@ export default {
      addFormRules: {
        LICENCE_NO: [
          {required: true, message: '车牌号不能为空', trigger: 'blur'},
-          { pattern: /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/, message: '请填写正确的车牌号', trigger: 'blur' }
+          {
+            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, validator: (rule, value, callback) => {
+        FFILE: [{
+          required: true, validator: (rule, value, callback) => {
            if (value.length === 0) {
              callback(new Error('违规图片不能为空'));
            } else {
              callback();
            }
-          }, trigger: 'blur' }],
+          }, trigger: 'blur'
+        }],
        LOCATION: [{required: true, message: '违规区域不能为空', trigger: 'blur'}],
        VIOLATIONTIME: [{required: true, message: '违规时间不能为空', trigger: 'blur'}],
        LICENCE_TYPE: [{required: true, message: '请选择车牌类型', trigger: 'blur'}],
@ -282,23 +310,19 @@ export default {
    this.getPageList() // 获取分页列表要展示的数据
  },
  methods: {
+    formatCorpInfoName(row) {
+      return row.CORPINFO_NAME || row.RELEVANT_UNIT_NAME || '--';
+    },
+    formatDepartmentName(row) {
+      return row.VEHICLE_DEPARTMENT_NAME || row.DEPT_NAME || '--';
+    },
+    formatUserName(row) {
+      return row.USER_NAME || row.U_NAME || '--';
+    },
    // 获取并设置列表行的主键ID
    getRowKey(row) {
      return row.VEHICLE_ID
    },
-    // 获取数据字典数据
-    // getDict: function() {
-    //   requestFN(
-    //     '/dictionaries/listSelectTree',
-    //     {
-    //       DICTIONARIES_ID: '60e6481d96e44a5390ff5c347c4d1ffe' // 检查类型
-    //     }
-    //   ).then((data) => {
-    //     this.inspectionTypeList = JSON.parse(data.zTreeNodes)
-    //   }).catch((e) => {
-    //
-    //   })
-    // },
    // 获得部门树
    getDepartmentTreeData() {
      requestFN(