src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/apply.vue

@@ -1,66 +1,33 @@
 <template>
   <div v-loading="listLoading">
     <div style="padding:20px">
-      <el-form ref="form" :model="form" label-width="210px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="210px">
-        <el-form-item label="智能口门管理系统账号申请单" prop="REQUISITION_FILE" :rules="[{ required: true, message: '智能口门管理系统账号申请单', trigger: 'blur' }]">
+        <!-- 动态生成表单项 -->
-          <el-upload
+        <el-row v-for="(item, index) in uploadConfig" :key="index">
-            :action="uploadUrl"
+          <el-col :span="12">
-            :on-success="REQUISITION_FILESuccess"
+            <el-form-item v-if="dialogType !== 'savePhoto' && form[item.prop]" :label="`已上传${item.label}`">
-            :on-remove="REQUISITION_FILERemove"
+              <div>
-            :before-upload="beforeUpload"
+                <img :src="config.fileUrl + form[item.prop]" width="100" height="100">
-            :limit="1">
+              </div>
-            <el-button type="primary">点击上传</el-button>
+            </el-form-item>
-          </el-upload>
+            <el-form-item :label="item.label" :prop="item.prop">
-          <img v-if="form.REQUISITION_FILE" :src="config.fileUrl + form.REQUISITION_FILE" alt="智能口门管理系统账号申请单" style="margin-top: 10px; max-width: 20%;"/>
+              <el-upload
-        </el-form-item>
+                ref="photoUpload"
-
+                :file-list="form[item.prop]"
-        <el-form-item label="智能口门管理系统使用承诺书" prop="REQUISITION_FILE" :rules="[{ required: true, message: '智能口门管理系统使用承诺书', trigger: 'blur' }]">
+                :multiple="false"
-          <el-upload
+                :limit="1"
-            :action="uploadUrl"
+                :class="{hide: form[item.prop] && form[item.prop].length > 0}"
-            :on-success="COMMITMENT_FILESuccess"
+                :auto-upload="false"
-            :on-remove="COMMITMENT_FILERemove"
+                :on-remove="(file, fileList) => handleRemove(file, fileList, item.prop)"
-            :before-upload="beforeUpload"
+                :on-change="(file, fileList) => handleChange(file, fileList, item.prop)"
-            :limit="1">
+                action="#"
-            <el-button type="primary">点击上传</el-button>
+                accept=".jpg,.jpeg,.png"
-          </el-upload>
+                list-type="picture-card">
-          <img v-if="form.COMMITMENT_FILE" :src="config.fileUrl + form.COMMITMENT_FILE" alt="智能口门管理系统使用承诺书" style="margin-top: 10px; max-width: 20%;"/>
+                <i class="el-icon-plus"/>
-        </el-form-item>
+              </el-upload>
-
+            </el-form-item>
-        <el-form-item label="营业执照" prop="LICENSE_FILE" :rules="[{ required: true, message: '营业执照', trigger: 'blur' }]">
+          </el-col>
-          <el-upload
+        </el-row>
-            :action="uploadUrl"
-            :on-success="LICENSE_FILESuccess"
-            :on-remove="LICENSE_FILERemove"
-            :before-upload="beforeUpload"
-            :limit="1">
-            <el-button type="primary">点击上传</el-button>
-          </el-upload>
-          <img v-if="form.LICENSE_FILE" :src="config.fileUrl + form.LICENSE_FILE" alt="营业执照" style="margin-top: 10px; max-width: 20%;"/>
-        </el-form-item>
-
-        <el-form-item label="道路运输经营许可证" prop="TRANSPORT_PERMIT_FILE" :rules="[{ required: true, message: '道路运输经营许可证', trigger: 'blur' }]">
-          <el-upload
-            :action="uploadUrl"
-            :on-success="TRANSPORT_PERMIT_FILESuccess"
-            :on-remove="TRANSPORT_PERMIT_FILERemove"
-            :before-upload="beforeUpload"
-            :limit="1">
-            <el-button type="primary">点击上传</el-button>
-          </el-upload>
-          <img v-if="form.TRANSPORT_PERMIT_FILE" :src="config.fileUrl + form.TRANSPORT_PERMIT_FILE" alt="道路运输经营许可证" style="margin-top: 10px; max-width: 20%;"/>
-        </el-form-item>
-
-        <el-form-item label="危险化学品经营许可证" prop="HAZARDOUS_CHEMICALS_FILE" :rules="[{ required: true, message: '危险化学品经营许可证', trigger: 'blur' }]">
-          <el-upload
-            :action="uploadUrl"
-            :on-success="HAZARDOUS_CHEMICALS_FILESuccess"
-            :on-remove="HAZARDOUS_CHEMICALS_FILERemove"
-            :before-upload="beforeUpload"
-            :limit="1">
-            <el-button type="primary">点击上传</el-button>
-          </el-upload>
-          <img v-if="form.HAZARDOUS_CHEMICALS_FILE" :src="config.fileUrl + form.HAZARDOUS_CHEMICALS_FILE" alt="危险化学品经营许可证" style="margin-top: 10px; max-width: 20%;"/>
-        </el-form-item>
       </el-form>
     </div>
     <div class="ui-height"/>
@@ -73,19 +40,18 @@
 
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import {requestFN} from '@/utils/request'
+import { requestFN } from '@/utils/request'
 import SelectTree from '@/components/SelectTree'
-import {upload} from "../../../../../utils/upload";
+import { upload } from '../../../../../utils/upload'
 
 export default {
-  components: {Pagination, SelectTree},
+  components: { Pagination, SelectTree },
   data() {
     return {
       listQuery: {
         page: 1,
         limit: 10
       },
-      uploadUrl: config.httpurl + '/mkmj/management/fileUpload',
       config: config,
       areaList: [], // 省市县列表
       placeList: [],
@@ -104,7 +70,7 @@ export default {
         VEHICLE_TYPE: '',
         CONTACT: '',
         PHONE: '',
-        EMISSION_STANDARDS: '',
+        EMISSION_STANDARDS: ''
       },
       form: {
         CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
@@ -115,18 +81,24 @@ export default {
         TRANSPORT_PERMIT_FILE: '',
         HAZARDOUS_CHEMICALS_FILE: ''
       },
+      rules: {
+        REQUISITION_FILE: [{ required: true, message: '请上传智能口门管理系统账号申请单', trigger: 'blur' }],
+        COMMITMENT_FILE: [{ required: true, message: '请上传智能口门管理系统使用承诺书', trigger: 'blur' }],
+        LICENSE_FILE: [{ required: true, message: '请上传营业执照', trigger: 'blur' }]
+      },
       uploadConfig: [
-        {label: '智能口门管理系统账号申请单', prop: 'REQUISITION_FILE', hideUpload: false},
+        { label: '智能口门管理系统账号申请单', prop: 'REQUISITION_FILE', hideUpload: false },
-        {label: '智能口门管理系统使用承诺书', prop: 'COMMITMENT_FILE', hideUpload: false},
+        { label: '智能口门管理系统使用承诺书', prop: 'COMMITMENT_FILE', hideUpload: false },
-        {label: '营业执照', prop: 'LICENSE_FILE', hideUpload: false},
+        { label: '营业执照', prop: 'LICENSE_FILE', hideUpload: false },
-        {label: '道路运输经营许可证', prop: 'TRANSPORT_PERMIT_FILE', hideUpload: false},
+        { label: '道路运输经营许可证', prop: 'TRANSPORT_PERMIT_FILE', hideUpload: false },
-        {label: '危险化学品经营许可证', prop: 'HAZARDOUS_CHEMICALS_FILE', hideUpload: false}
+        { label: '危险化学品经营许可证', prop: 'HAZARDOUS_CHEMICALS_FILE', hideUpload: false }
       ],
-      urlfromdsfe:{}
+      urlfromdsfe: {}
     }
   },
   async created() {
     this.getList()
+    this.getUploadedFiles()
   },
   methods: {
     // 搜索
@@ -148,102 +120,111 @@ export default {
       }
       this.getList()
     },
-    beforeUpload(file) {
-      //文件格式限制
-      const isJPG = file.type === 'image/jpeg';
-      const isPNG = file.type === 'image/png';
-
-      if (!isJPG && !isPNG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
-        return false;
-      }
-      // 文件上传前的校验逻辑
-      const isLt2M = file.size / 1024 / 1024 < 2;
-      if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!');
-      }
-      return isLt2M;
-    },
-    REQUISITION_FILESuccess(response, file) {
-      this.form.REQUISITION_FILE = response.uploadPath;
-    },
-    REQUISITION_FILERemove(){
-      this.form.REQUISITION_FILE = ''
-    },
-    COMMITMENT_FILESuccess(response, file) {
-      this.form.COMMITMENT_FILE = response.uploadPath;
-    },
-    COMMITMENT_FILERemove(){
-      this.form.COMMITMENT_FILE = ''
-    },
-    LICENSE_FILESuccess(response, file) {
-      this.form.LICENSE_FILE = response.uploadPath;
-    },
-    LICENSE_FILERemove(){
-      this.form.LICENSE_FILE = ''
-    },
-    TRANSPORT_PERMIT_FILESuccess(response, file) {
-      this.form.TRANSPORT_PERMIT_FILE = response.uploadPath;
-    },
-    TRANSPORT_PERMIT_FILERemove(){
-      this.form.TRANSPORT_PERMIT_FILE = ''
-    },
-    HAZARDOUS_CHEMICALS_FILESuccess(response, file) {
-      this.form.HAZARDOUS_CHEMICALS_FILE = response.uploadPath;
-    },
-    HAZARDOUS_CHEMICALS_FILERemove() {
-      this.form.HAZARDOUS_CHEMICALS_FILE = ''
-    },
     // 获取列表
     getList() {
       this.listLoading = true
       requestFN(
-          '/mkmj/management/carInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
+        '/mkmj/management/carInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page, this.form
       ).then((data) => {
         console.log(data)
         this.listLoading = false
         this.varList = data.carInfoList
         this.total = data.page.totalResult
-        this.pd = data.pd
-        this.form.REQUISITION_FILE = data.motorcadeList[0].REQUISITION_FILE
-        this.form.COMMITMENT_FILE = data.motorcadeList[0].COMMITMENT_FILE
-        this.form.LICENSE_FILE = data.motorcadeList[0].LICENSE_FILE
-        this.form.TRANSPORT_PERMIT_FILE = data.motorcadeList[0].TRANSPORT_PERMIT_FILE
-        this.form.HAZARDOUS_CHEMICALS_FILE = data.motorcadeList[0].HAZARDOUS_CHEMICALS_FILE
-        console.log('------------------------')
-        console.log(this.form.REQUISITION_FILE)
         this.hasButton()
+        this.pd = data.pd
       }).catch((e) => {
         this.listLoading = false
       })
     },
     // 通用文件移除处理
     handleRemove(file, fileList, prop) {
-      this.form[prop] = fileList;
+      this.form[prop] = fileList
-      const configItem = this.uploadConfig.find(item => item.prop === prop);
+      const configItem = this.uploadConfig.find(item => item.prop === prop)
       if (configItem) {
-        configItem.hideUpload = fileList.length >= 1;
+        configItem.hideUpload = fileList.length >= 1
+      }
+    },
+    // 通用文件上传处理
+    handleChange(file, fileList, prop) {
+      const types = ['image/jpeg', 'image/jpg', 'image/png']
+      const isImage = types.includes(file.raw.type)
+      if (!isImage) {
+        this.$message.error('上传图片只能是 JPG、JPEG、PNG 格式!')
+        fileList.pop()
+        this.form[prop] = []
+        return
+      }
+      this.form[prop] = []
+      this.form[prop].push(file)
+      const configItem = this.uploadConfig.find(item => item.prop === prop)
+      if (configItem) {
+        configItem.hideUpload = fileList.length >= 1
+      }
+    },
+    getUploadedFiles() {
+      try {
+        this.listLoading = true
+        requestFN(
+          '/mkmj/management/getUploadedFiles', {
+            MOTORCADE_ID: this.form.MOTORCADE_ID
+          }
+        ).then((data) => {
+          console.log(data)
+          console.info(data)
+          this.urlfromdsfe = data.corpFilingApplicationEntity
+          console.info(this.urlfromdsfe)
+          if (this.urlfromdsfe) {
+            this.uploadConfig.forEach(item => {
+              if (this.urlfromdsfe[item.prop]) {
+                this.form[item.prop] = [{
+                  url: this.config.fileUrl + this.urlfromdsfe[item.prop],
+                  name: this.urlfromdsfe[item.prop].split('/').pop()
+                }]
+              }
+            })
+          }
+
+          this.listLoading = false
+        }).catch((e) => {
+          this.listLoading = false
+        })
+      } catch (error) {
+        console.error('获取已上传文件失败', error)
       }
     },
     confirm() {
-      this.$refs.form.validate(valid => {
+      this.$refs.form.validate((valid) => {
-        if (valid) {
+        if (!valid) {
-          requestFN(
+          return false
-            '/mkmj/management/fleetFilingApply',
-            this.form
-          ).then((data) => {
-            console.log(data)
-            this.goBack()
-            this.listLoading = false
-          }).catch((e) => {
-            this.listLoading = false
-          })
         }
+        this.listLoading = true
+        console.log(this.form)
+        const formData = new FormData()
+        formData.append('CORPINFO_ID', this.form.CORPINFO_ID)
+        formData.append('MOTORCADE_ID', this.form.MOTORCADE_ID)
+        formData.append('REQUISITION_FILE', this.form.REQUISITION_FILE[0].raw)
+        formData.append('COMMITMENT_FILE', this.form.COMMITMENT_FILE[0].raw)
+        formData.append('LICENSE_FILE', this.form.LICENSE_FILE[0].raw)
+        formData.append('TRANSPORT_PERMIT_FILE', this.form.TRANSPORT_PERMIT_FILE[0].raw)
+        formData.append('HAZARDOUS_CHEMICALS_FILE', this.form.HAZARDOUS_CHEMICALS_FILE[0].raw)
+
+        console.log(formData) // 打印 FormData 对象
+
+        upload(
+          '/mkmj/management/fleetFilingApply',
+          formData
+        ).then(response => {
+          console.log('上传成功', response)
+          this.listLoading = false
+          this.goBack()
+        }).catch(error => {
+          console.error('上传失败', error)
+          this.listLoading = false
+        })
       })
     },
     goBack() {
       this.$parent.activeName = 'List'
-      window.location.reload();
     }
   }
 }

src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue

@@ -36,7 +36,6 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="MOTORCADE_NAME" label="车队名称"/>
-      <el-table-column prop="CREATE_DATE" label="车队创建时间"/>
       <el-table-column label="审核状态" align="center">
         <template slot-scope="{row}">
           {{ getAuditType(row.IS_AUDIT) }}
@@ -45,7 +44,7 @@
       <el-table-column label="操作" align="left" width="300">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-view" size="mini" @click="handleEdit(row)">编辑</el-button>
-          <el-button v-if="row.IS_AUDIT !== '2'" type="primary" icon="el-icon-view" size="mini" @click="getAuditInfo(row)">备案申请</el-button>
+          <el-button type="primary" icon="el-icon-view" size="mini" @click="getAuditInfo(row)">备案申请</el-button>
           <el-button type="danger" icon="el-icon-delete" size="mini" @click="handleDelete(row)">删除</el-button>
         </template>
       </el-table-column>
@@ -70,9 +69,9 @@
       </div>
     </el-dialog>
     <!--编辑-->
-    <el-dialog :visible.sync="editLoading"  width="600px">
+    <el-dialog :visible.sync="editLoading" width="600px">
-      <el-form ref="form" :model="form"  :rules="rules" label-width="110px" style="width: 500px;">
+      <el-form ref="form" :model="form" label-width="110px" style="width: 500px;">
-        <el-form-item label="车队名称:" prop="ADD_MOTORCADE_NAME">
+        <el-form-item label="车队名称:">
           <el-input v-model="form.ADD_MOTORCADE_NAME" placeholder="请输入车队名称" class="filter-item" style="width: 200px;"/>
         </el-form-item>
       </el-form>
@@ -129,15 +128,11 @@ export default{
     this.getList()
   },
   methods: {
-    getAuditType(IS_AUDIT){
+    getAuditType(IS_AUDIT) {
-      if (IS_AUDIT === '1'){
+      if (IS_AUDIT === '1') {
-        return '待审核'
-      }else if (IS_AUDIT === '2'){
         return '审核通过'
-      }else if (IS_AUDIT === '0'){
+      } else {
-        return '审核驳回'
+        return '未审核'
-      }else {
-        return '待申请'
       }
     },
     // 搜索
@@ -166,11 +161,11 @@ export default{
         this.listLoading = false
       })
     },
-    handleAdd(){
+    handleAdd() {
       this.form.ADD_MOTORCADE_NAME = ''
       this.addLoading = true
     },
-    saveMotorcade(){
+    saveMotorcade() {
       this.$refs.form.validate((valid) => {
         if (valid) {
           requestFN(
@@ -187,33 +182,29 @@ export default{
             this.addLoading = false
           })
         } else {
-          this.$message.error('请填写完整信息');
+          this.$message.error('请填写完整信息')
         }
       })
     },
-    handleEdit(row){
+    handleEdit(row) {
       this.form.MOTORCADE_ID = row.MOTORCADE_ID
       this.form.ADD_MOTORCADE_NAME = row.MOTORCADE_NAME
       this.editLoading = true
     },
-    editMotorcade(){
+    editMotorcade() {
-      this.$refs.form.validate((valid) => {
+      requestFN(
-        if (valid) {
+        '/mkmj/management/motorcadeInfoManagement',
-          requestFN(
+        {
-            '/mkmj/management/motorcadeInfoManagement',
+          MOTORCADE_ID: this.form.MOTORCADE_ID,
-            {
+          MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
-              MOTORCADE_ID : this.form.MOTORCADE_ID,
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-              MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
-              CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
-            }
-          ).then((data) => {
-            this.editLoading = false
-            this.form.MOTORCADE_NAME = ''
-            this.getQuery()
-          }).catch((e) => {
-            this.editLoading = false
-          })
         }
+      ).then((data) => {
+        this.editLoading = false
+        this.form.MOTORCADE_NAME = ''
+        this.getQuery()
+      }).catch((e) => {
+        this.editLoading = false
       })
     },
     handleDelete(row) {
@@ -225,27 +216,15 @@ export default{
         requestFN(
           '/mkmj/management/deleteMotorCade',
           {
-            MOTORCADE_ID : row.MOTORCADE_ID
+            MOTORCADE_ID: row.MOTORCADE_ID
           }
         ).then((data) => {
-            this.listLoading = false
+          this.listLoading = false
-            this.getList()
+          this.getList()
-          this.$message({
-            type: 'success',
-            message: '删除成功!'
-          })
         }).catch((e) => {
           this.listLoading = false
-          this.$message({
-            type: 'error',
-            message: '删除失败!'
-          })
         })
       }).catch(() => {
-        this.$message({
-          type: 'info',
-          message: '已取消删除'
-        })
       })
     },
     getAuditInfo(row) {

src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue

@@ -63,11 +63,19 @@
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList"/>
     </div>
     <el-dialog :visible.sync="addDialogVisible" title="添加车辆信息" width="600px">
-      <el-form v-if="addDialogVisible" ref="addForm" :model="addForm" label-width="170px"
+      <el-form
-               style="padding:0 20px; width: 500px;">
+        v-if="addDialogVisible"
+        ref="addForm"
+        :model="addForm"
+        label-width="170px"
+        style="padding:0 20px; width: 500px;">
         <el-form-item :rules="[{required: true ,message: '车牌号不能为空',trigger: 'blur'}]" label="车牌号" prop="LICENCE_NO">
-          <el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..."
+          <el-input
-                    @blur="goCheckLicenceNoAdd()"/>
+            v-model="addForm.LICENCE_NO"
+            type="text"
+            maxlength="300"
+            placeholder="这里输入车牌号..."
+            @blur="goCheckLicenceNoAdd()"/>
         </el-form-item>
         <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
         <el-form-item :rules="[{required: true,message: '车牌类型不能为空',trigger: 'blur'}]" label="车牌类型" prop="LICENCE_TYPE">
@@ -102,78 +110,68 @@
             placeholder="请选择是否危化车辆"
             style="width: 300px"/>
         </el-form-item>
-        <el-form-item label="负责人" prop="CONTACT" :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]" label="负责人" prop="CONTACT">
           <el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/>
         </el-form-item>
-        <el-form-item label="负责人手机号" prop="PHONE" :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]" label="负责人手机号" prop="PHONE">
           <el-input v-model="addForm.PHONE" type="text" maxlength="11" placeholder="这里输入负责人手机号..."/>
         </el-form-item>
-        <el-form-item label="排放标准" prop="EMISSION_STANDARDS" :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]" label="排放标准" prop="EMISSION_STANDARDS">
           <el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/>
         </el-form-item>
         <!-- 驾驶证 -->
-        <el-form-item label="驾驶证" prop="DRIVING_LICENSE" :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]" label="驾驶证" prop="DRIVING_LICENSE">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleDrivingLicenseSuccess"
-            :on-remove="handleDrivingLicenseRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.DRIVING_LICENSE" :src="config.fileUrl + addForm.DRIVING_LICENSE" alt="驾驶证" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 绿本 -->
-        <el-form-item label="绿本" prop="GREEN_BOOK" :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]" label="绿本" prop="GREEN_BOOK">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleGreenBookSuccess"
-            :on-remove="handleGreenBookRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.GREEN_BOOK" :src="config.fileUrl + addForm.GREEN_BOOK" alt="绿本" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 环保随车清单 -->
-        <el-form-item label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST" :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]" label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleEcoFriendlyChecklistSuccess"
-            :on-remove="handleEcoFriendlyChecklistRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.ECO_FRIENDLY_CHECKLIST" :src="config.fileUrl + addForm.ECO_FRIENDLY_CHECKLIST" alt="环保随车清单" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 出厂合格证 -->
-        <el-form-item label="出厂合格证" prop="FACTORY_CERTIFICATE" :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]" label="出厂合格证" prop="FACTORY_CERTIFICATE">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleFactoryCertificateSuccess"
-            :on-remove="handleFactoryCertificateRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.FACTORY_CERTIFICATE" :src="config.fileUrl + addForm.FACTORY_CERTIFICATE" alt="出厂合格证" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 环保信息截图 -->
-        <el-form-item label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS" :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]" label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleEnvironmentalScreenshotsSuccess"
-            :on-remove="handleEnvironmentalScreenshotsRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.ENVIRONMENTAL_SCREENSHOTS" :src="config.fileUrl + addForm.ENVIRONMENTAL_SCREENSHOTS" alt="环保信息截图" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -183,12 +181,21 @@
     </el-dialog>
     <!--编辑-->
     <el-dialog :visible.sync="editDialogVisible" title="编辑车辆信息" width="600px">
-      <el-form v-if="editDialogVisible" ref="editForm" :model="addForm" label-width="170px"
+      <el-form
-               style="padding:0 20px; width: 500px;">
+        v-if="editDialogVisible"
+        ref="editForm"
+        :model="addForm"
+        label-width="170px"
+        style="padding:0 20px; width: 500px;">
         <el-form-item :rules="[{required: true ,message: '车牌号不能为空',trigger: 'blur'}]" label="车牌号" prop="LICENCE_NO">
-          <el-input v-model="addForm.LICENCE_NO" type="text" maxlength="300" placeholder="这里输入车牌号..."
+          <el-input
-                    @blur="goCheckLicenceNoAdd()"/>
+            v-model="addForm.LICENCE_NO"
+            type="text"
+            maxlength="300"
+            placeholder="这里输入车牌号..."
+            @blur="goCheckLicenceNoAdd()"/>
         </el-form-item>
+        <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
         <el-form-item :rules="[{required: true,message: '车牌类型不能为空',trigger: 'blur'}]" label="车牌类型" prop="LICENCE_TYPE">
           <SelectTree
             ref="selectTree_add2"
@@ -221,78 +228,68 @@
             placeholder="请选择是否危化车辆"
             style="width: 300px"/>
         </el-form-item>
-        <el-form-item label="负责人" prop="CONTACT" :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写负责人姓名', trigger: 'blur' }]" label="负责人" prop="CONTACT">
           <el-input v-model="addForm.CONTACT" type="text" maxlength="300" placeholder="这里输入负责人名称..."/>
         </el-form-item>
-        <el-form-item label="负责人手机号" prop="PHONE" :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写负责人手机号', trigger: 'blur' },{ pattern: /^1[3-9]\d{9}$/, message: '手机号格式不正确', trigger: 'blur' }]" label="负责人手机号" prop="PHONE">
           <el-input v-model="addForm.PHONE" type="text" maxlength="11" placeholder="这里输入负责人手机号..."/>
         </el-form-item>
-        <el-form-item label="排放标准" prop="EMISSION_STANDARDS" :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请填写排放标准', trigger: 'blur' }]" label="排放标准" prop="EMISSION_STANDARDS">
           <el-input v-model="addForm.EMISSION_STANDARDS" type="text" maxlength="300" placeholder="这里输入排放标准..."/>
         </el-form-item>
         <!-- 驾驶证 -->
-        <el-form-item label="驾驶证" prop="DRIVING_LICENSE" :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传驾驶证', trigger: 'blur' }]" label="驾驶证" prop="DRIVING_LICENSE">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleDrivingLicenseSuccess"
-            :on-remove="handleDrivingLicenseRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.DRIVING_LICENSE" :src="config.fileUrl + addForm.DRIVING_LICENSE" alt="驾驶证" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 绿本 -->
-        <el-form-item label="绿本" prop="GREEN_BOOK" :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传绿本', trigger: 'blur' }]" label="绿本" prop="GREEN_BOOK">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleGreenBookSuccess"
-            :on-remove="handleGreenBookRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.GREEN_BOOK" :src="config.fileUrl + addForm.GREEN_BOOK" alt="绿本" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 环保随车清单 -->
-        <el-form-item label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST" :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传环保随车清单', trigger: 'blur' }]" label="环保随车清单" prop="ECO_FRIENDLY_CHECKLIST">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleEcoFriendlyChecklistSuccess"
-            :on-remove="handleEcoFriendlyChecklistRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.ECO_FRIENDLY_CHECKLIST" :src="config.fileUrl + addForm.ECO_FRIENDLY_CHECKLIST" alt="环保随车清单" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 出厂合格证 -->
-        <el-form-item label="出厂合格证" prop="FACTORY_CERTIFICATE" :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传出厂合格证', trigger: 'blur' }]" label="出厂合格证" prop="FACTORY_CERTIFICATE">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleFactoryCertificateSuccess"
-            :on-remove="handleFactoryCertificateRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.FACTORY_CERTIFICATE" :src="config.fileUrl + addForm.FACTORY_CERTIFICATE" alt="出厂合格证" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
 
         <!-- 环保信息截图 -->
-        <el-form-item label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS" :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]">
+        <el-form-item :rules="[{ required: true, message: '请上传环保信息截图', trigger: 'blur' }]" label="环保信息截图" prop="ENVIRONMENTAL_SCREENSHOTS">
           <el-upload
-            :action="uploadUrl"
             :on-success="handleEnvironmentalScreenshotsSuccess"
-            :on-remove="handleEnvironmentalScreenshotsRemove"
             :before-upload="beforeUpload"
-            :limit="1">
+            :limit="1"
+            action="http://127.0.0.1:8199/mkmj/management/fileUpload">
             <el-button type="primary">点击上传</el-button>
           </el-upload>
-          <img v-if="addForm.ENVIRONMENTAL_SCREENSHOTS" :src="config.fileUrl + addForm.ENVIRONMENTAL_SCREENSHOTS" alt="环保信息截图" style="margin-top: 10px; max-width: 100%;"/>
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -300,7 +297,7 @@
         <el-button type="primary" @click="editDialogConfirmBtn">确 定</el-button>
       </div>
     </el-dialog>
-    <div style="margin-left: 20px;"></div>
+    <div style="margin-left: 20px;"/>
     <div class="bottom-btn-group" style="margin-top: 20px;">
       <el-button size="mini" @click="goBack">返回</el-button>
     </div>
@@ -309,15 +306,13 @@
 
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import {requestFN} from '@/utils/request'
+import { requestFN } from '@/utils/request'
 import SelectTree from '@/components/SelectTree'
 
 export default {
-  components: {Pagination, SelectTree},
+  components: { Pagination, SelectTree },
   data() {
     return {
-      config: config,
-      uploadUrl: config.httpurl + '/mkmj/management/fileUpload',
       listQuery: {
         page: 1,
         limit: 10
@@ -365,27 +360,28 @@ export default {
       },
       // 车牌类型列表
       licenceTypeList: [
-        {ID: '0', NAME: '白牌'},
+        { ID: '0', NAME: '白牌' },
-        {ID: '1', NAME: '蓝牌'},
+        { ID: '1', NAME: '蓝牌' },
-        {ID: '2', NAME: '黄牌'},
+        { ID: '2', NAME: '黄牌' },
-        {ID: '3', NAME: '绿牌'},
+        { ID: '3', NAME: '绿牌' },
-        {ID: '4', NAME: '黑牌'}
+        { ID: '4', NAME: '黑牌' }
       ],
       // 车辆类型列表
       vehicleTypeList: [
         // { ID: '', NAME: '请选择' },
-        {ID: '0', NAME: '货车'},
+        { ID: '0', NAME: '货车' },
-        {ID: '1', NAME: '轿车'},
+        { ID: '1', NAME: '轿车' },
-        {ID: '2', NAME: '大巴客车'}
+        { ID: '2', NAME: '大巴客车' }
       ],
       DANGEROUS_CAR_LIST: [
-        {ID: '0', NAME: '否'},
+        { ID: '0', NAME: '否' },
-        {ID: '1', NAME: '是'},
+        { ID: '1', NAME: '是' }
       ],
       // 车辆下拉树默认属性
       vehicleDefaultProps: {
         value: 'ID',
-        label: 'NAME'
+        label: 'NAME',
+        children: 'nodes'
       }
     }
   },
@@ -432,17 +428,17 @@ export default {
     goCheckLicenceNoAdd() {
       // 检查是否输入了车牌号
       if (!this.addForm.LICENCE_NO) {
-        this.$message.error('车牌号不能为空'); // 提示车牌号不能为空
+        this.$message.error('车牌号不能为空') // 提示车牌号不能为空
-        this.ISCHECK = false; // 设置校验状态为 false
+        this.ISCHECK = false // 设置校验状态为 false
-        return; // 直接返回，不执行后续逻辑
+        return // 直接返回，不执行后续逻辑
       }
 
       // 车牌号格式校验
-      const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/;
+      const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/
-      const result = regex.test(this.addForm.LICENCE_NO);
+      const result = regex.test(this.addForm.LICENCE_NO)
 
       if (result) {
-        console.log('格式校验通过');
+        console.log('格式校验通过')
         requestFN(
           '/mkmj/management/goCheckLicenceNo',
           {
@@ -450,20 +446,20 @@ export default {
           }
         ).then((data) => {
           if (data.result === 'success') {
-            this.$message.success('验证通过');
+            this.$message.success('验证通过')
-            this.ISCHECK = true;
+            this.ISCHECK = true
           } else {
-            this.$message.error('车牌号已存在,请重新输入');
+            this.$message.error('车牌号已存在,请重新输入')
-            this.ISCHECK = false;
+            this.ISCHECK = false
           }
         }).catch((e) => {
-          console.info(e);
+          console.info(e)
-          this.listLoading = false;
+          this.listLoading = false
-          this.ISCHECK = false;
+          this.ISCHECK = false
-        });
+        })
       } else {
-        this.$message.error('车牌号不规范'); // 提示车牌号格式不正确
+        this.$message.error('车牌号不规范') // 提示车牌号格式不正确
-        this.ISCHECK = false;
+        this.ISCHECK = false
       }
     },
     // 打开新增弹窗的新增按钮
@@ -474,67 +470,48 @@ export default {
     },
     reSetAddDialog() {
       this.addForm.VEHICLE_ID = '',
-        this.addForm.LICENCE_NO = '',
+      this.addForm.LICENCE_NO = '',
-        this.addForm.LICENCE_TYPE = '',
+      this.addForm.LICENCE_TYPE = '',
-        this.addForm.VEHICLE_TYPE = '',
+      this.addForm.VEHICLE_TYPE = '',
-        this.addForm.CONTACT = '',
+      this.addForm.CONTACT = '',
-        this.addForm.PHONE = '',
+      this.addForm.PHONE = '',
-        this.addForm.EMISSION_STANDARDS = '',
+      this.addForm.EMISSION_STANDARDS = '',
-        this.addForm.IS_DANGEROUS_CAR = '',
+      this.addForm.IS_DANGEROUS_CAR = '',
-        this.addForm.DRIVING_LICENSE = '',
+      this.addForm.DRIVING_LICENSE = '',
-        this.addForm.GREEN_BOOK = '',
+      this.addForm.GREEN_BOOK = '',
-        this.addForm.ECO_FRIENDLY_CHECKLIST = '',
+      this.addForm.ECO_FRIENDLY_CHECKLIST = '',
-        this.addForm.FACTORY_CERTIFICATE = '',
+      this.addForm.FACTORY_CERTIFICATE = '',
-        this.addForm.ENVIRONMENTAL_SCREENSHOTS = ''
-    },
-    handleDrivingLicenseSuccess(response, file) {
-      this.addForm.DRIVING_LICENSE = response.uploadPath;
-    },
-    handleDrivingLicenseRemove(){
-      this.addForm.DRIVING_LICENSE = ''
-    },
-    handleGreenBookSuccess(response, file) {
-      this.addForm.GREEN_BOOK = response.uploadPath;
-    },
-    handleGreenBookRemove(){
-      this.addForm.GREEN_BOOK = ''
-    },
-    handleEcoFriendlyChecklistSuccess(response, file) {
-      this.addForm.ECO_FRIENDLY_CHECKLIST = response.uploadPath;
-    },
-    handleEcoFriendlyChecklistRemove(){
-      this.addForm.ECO_FRIENDLY_CHECKLIST = ''
-    },
-    handleFactoryCertificateSuccess(response, file) {
-      this.addForm.FACTORY_CERTIFICATE = response.uploadPath;
-    },
-    handleFactoryCertificateRemove(){
-      this.addForm.FACTORY_CERTIFICATE = ''
-    },
-    handleEnvironmentalScreenshotsSuccess(response, file) {
-      this.addForm.ENVIRONMENTAL_SCREENSHOTS = response.uploadPath;
-    },
-    handleEnvironmentalScreenshotsRemove() {
       this.addForm.ENVIRONMENTAL_SCREENSHOTS = ''
     },
+    handleDrivingLicenseSuccess(response, file) {
+      this.addForm.DRIVING_LICENSE = response.uploadPath
+    },
+    handleGreenBookSuccess(response, file) {
+      this.addForm.GREEN_BOOK = response.uploadPath
+    },
+    handleEcoFriendlyChecklistSuccess(response, file) {
+      this.addForm.ECO_FRIENDLY_CHECKLIST = response.uploadPath
+    },
+    handleFactoryCertificateSuccess(response, file) {
+      this.addForm.FACTORY_CERTIFICATE = response.uploadPath
+    },
+    handleEnvironmentalScreenshotsSuccess(response, file) {
+      this.addForm.ENVIRONMENTAL_SCREENSHOTS = response.uploadPath
+    },
     beforeUpload(file) {
-      //文件格式限制
+      const isJPG = file.type === 'image/jpeg' || file.type === 'image/jpg' || file.type === 'image/png'
-      const isJPG = file.type === 'image/jpeg';
+      if (!isJPG) {
-      const isPNG = file.type === 'image/png';
+        this.$message.error('上传图片只能是 jpg/jpeg/png 格式!')
-
-      if (!isJPG && !isPNG) {
-        this.$message.error('上传图片只能是 JPG 或 PNG 格式!');
-        return false;
       }
       // 文件上传前的校验逻辑
-      const isLt2M = file.size / 1024 / 1024 < 2;
+      const isLt2M = file.size / 1024 / 1024 < 2
       if (!isLt2M) {
-        this.$message.error('上传文件大小不能超过 2MB!');
+        this.$message.error('上传文件大小不能超过 2MB!')
       }
-      return isLt2M;
+      return isJPG && isLt2M
     },
     addDialogCancelBtn() {
-      this.addDialogVisible = false;
+      this.addDialogVisible = false
     },
     addDialogConfirmBtn() {
       this.$refs.addForm.validate(valid => {
@@ -576,7 +553,7 @@ export default {
     },
     goEdit(row) {
       this.editDialogVisible = true
-      this.addForm = {...row};
+      this.addForm = { ...row }
     },
     editDialogCancelBtn() {
       this.editDialogVisible = false

src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue

@@ -50,11 +50,11 @@
       </el-table-column>
       <el-table-column prop="AUDIT_STATE" label="审核状态" >
         <template slot-scope="{row}">
-           <el-tag v-if="row.QY_AUDITOR == null && row.GA_AUDITOR == null" type="success">待申请</el-tag>
+          <el-tag v-if="row.QY_AUDITOR == null && row.GA_AUDITOR == null" type="success">待申请</el-tag>
-           <el-tag v-if="(row.IS_AUDIT === '0' || row.IS_AUDIT === null) && row.GA_AUDITOR != null" type="success">待公安审批</el-tag>
+          <el-tag v-if="(row.IS_AUDIT === '0' || row.IS_AUDIT === null) && row.GA_AUDITOR != null" type="success">待公安审批</el-tag>
-           <el-tag v-if="row.IS_AUDIT === '1' && row.QY_AUDITOR != null" type="success">待企业审批</el-tag>
+          <el-tag v-if="row.IS_AUDIT === '1' && row.QY_AUDITOR != null" type="success">待企业审批</el-tag>
-           <el-tag v-if="row.IS_AUDIT === '2'" type="success">企业审批通过</el-tag>
+          <el-tag v-if="row.IS_AUDIT === '2'" type="success">企业审批通过</el-tag>
-           <el-tag v-if="row.IS_AUDIT === '3'" type="error">审批驳回</el-tag>
+          <el-tag v-if="row.IS_AUDIT === '3'" type="error">审批驳回</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" width="300">
@@ -72,50 +72,46 @@
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
     <el-dialog
-      title="申请信息"
       :visible.sync="dialogVisible"
-      width="30%"
+      :before-close="handleClose"
-      :before-close="handleClose">
+      title="申请信息"
+      width="30%">
       <el-form ref="auditForm" :model="auditForm" :rules="rules" label-width="120px">
         <el-form-item label="访问起始时间" prop="VISIT_START_TIME">
           <el-date-picker
             v-model="auditForm.VISIT_START_TIME"
             type="datetime"
-            placeholder="选择日期时间">
+            placeholder="选择日期时间"/>
-          </el-date-picker>
         </el-form-item>
         <el-form-item label="访问结束时间" prop="VISIT_END_TIME">
           <el-date-picker
             v-model="auditForm.VISIT_END_TIME"
             type="datetime"
-            placeholder="选择日期时间">
+            placeholder="选择日期时间"/>
-          </el-date-picker>
         </el-form-item>
-        <el-form-item label="审核人公司" prop="CORPINFO_ID" v-if="showCorpSelect">
+        <el-form-item v-if="showCorpSelect" label="审核人公司" prop="CORPINFO_ID">
           <el-select
-            filterable
             v-model="auditForm.CORPINFO_ID"
             placeholder="请选择公司"
+            filterable
             @change="handleCorpChange">
             <el-option
               v-for="corp in corpList"
               :key="corp.CORPINFO_ID"
               :label="corp.CORP_NAME"
-              :value="corp.CORPINFO_ID">
+              :value="corp.CORPINFO_ID"/>
-            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="审核人" prop="AUDITOR_ID">
           <el-select
-            filterable
             v-model="auditForm.AUDITOR_ID"
+            filterable
             placeholder="请选择审核人">
             <el-option
               v-for="auditor in personList"
               :key="auditor.USER_ID"
               :label="auditor.USERNAME"
-              :value="auditor.USER_ID">
+              :value="auditor.USER_ID"/>
-            </el-option>
           </el-select>
         </el-form-item>
         <el-form-item label="访问地" prop="VISIT_PLACE">
@@ -127,35 +123,33 @@
               v-for="place in doorList"
               :key="place.DOOR_ID"
               :label="place.DOOR_NAME"
-              :value="place.DOOR_ID">
+              :value="place.DOOR_ID"/>
-            </el-option>
           </el-select>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">取 消</el-button>
+        <el-button @click="dialogVisible = false">取 消</el-button>
-    <el-button type="primary" @click="submitAudit">确 定</el-button>
+        <el-button type="primary" @click="submitAudit">确 定</el-button>
-  </span>
+      </span>
     </el-dialog>
 
     <el-dialog
-      title="驳回原因"
       :visible.sync="remarkDialogVisible"
-      width="30%"
+      :before-close="handleRemarkClose"
-      :before-close="handleRemarkClose">
+      title="驳回原因"
+      width="30%">
       <el-form>
         <el-form-item label="驳回原因">
           <el-input
             v-model="remarkText"
-            type="textarea"
             :rows="4"
-            readonly>
+            type="textarea"
-          </el-input>
+            readonly/>
         </el-form-item>
       </el-form>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="remarkDialogVisible = false">关闭</el-button>
+        <el-button @click="remarkDialogVisible = false">关闭</el-button>
-  </span>
+      </span>
     </el-dialog>
   </div>
 </template>
@@ -165,37 +159,9 @@ import Pagination from '@/components/Pagination' // 通过 el-pagination二次
 import { requestFN } from '@/utils/request'
 import SelectTree from '@/components/SelectTree'
 export default{
-  components: { Pagination, SelectTree},
+  components: { Pagination, SelectTree },
   data() {
-    const validateTime = (rule, value, callback) => {
-      if (!this.auditForm.VISIT_START_TIME || !this.auditForm.VISIT_END_TIME) {
-        callback();
-      } else if (this.auditForm.VISIT_START_TIME > this.auditForm.VISIT_END_TIME) {
-        callback(new Error('访问起始时间不能大于访问结束时间'));
-      } else {
-        callback();
-      }
-    }
     return {
-      rules: {
-        VISIT_START_TIME: [
-          { required: true, message: '请选择访问起始时间', trigger: 'blur' },
-          { validator: validateTime, trigger: 'blur' }
-        ],
-        VISIT_END_TIME: [
-          { required: true, message: '请选择访问结束时间', trigger: 'blur' },
-          { validator: validateTime, trigger: 'blur' }
-        ],
-        CORPINFO_ID: [
-          { required: true, message: '请选择审核人公司', trigger: 'change' }
-        ],
-        AUDITOR_ID: [
-          { required: true, message: '请选择审核人', trigger: 'change' }
-        ],
-        VISIT_PLACE: [
-          { required: true, message: '请选择访问地', trigger: 'change' }
-        ]
-      },
       listQuery: {
         page: 1,
         limit: 10
@@ -264,6 +230,32 @@ export default{
         value: 'ID',
         label: 'NAME',
         children: 'nodes'
+      },
+      rules: {
+        VISIT_START_TIME: [
+          { required: true, message: '访问起始时间不能为空', trigger: 'blur' },
+          { validator: (rule, value, callback) => {
+            if (value !== '') {
+              if (this.auditForm.VISIT_START_TIME !== '') {
+                this.$refs.auditForm.validateField('VISIT_END_TIME')
+              }
+              callback()
+            }
+          }, trigger: 'change' }
+        ],
+        VISIT_END_TIME: [
+          { required: true, message: '访问结束时间不能为空', trigger: 'blur' },
+          { validator: (rule, value, callback) => {
+            if (value !== '' && this.auditForm.VISIT_START_TIME &&
+              this.auditForm.VISIT_START_TIME >= this.auditForm.VISIT_END_TIME) {
+              callback(new Error('起始时间不能大于结束时间'))
+            }
+            callback()
+          }, trigger: 'change' }
+        ],
+        CORPINFO_ID: [{ required: true, message: '审核公司不能为空', trigger: 'blur' }],
+        AUDITOR_ID: [{ required: true, message: '审核人不能为空', trigger: 'blur' }],
+        VISIT_PLACE: [{ required: true, message: '访问地不能为空', trigger: 'blur' }]
       }
     }
   },
@@ -271,12 +263,12 @@ export default{
     this.getList()
   },
   methods: {
-    getButton(row){
+    getButton(row) {
-      if (row.IS_DANGEROUS_CAR === '0' && row.IS_AUDIT === '1' && row.QY_AUDITOR == null){
+      if (row.IS_DANGEROUS_CAR === '0' && row.IS_AUDIT === '1' && row.QY_AUDITOR == null) {
         return true
-      }else if (row.IS_DANGEROUS_CAR === '1' && row.IS_AUDIT === '0' && row.GA_AUDITOR == null){
+      } else if (row.IS_DANGEROUS_CAR === '1' && row.IS_AUDIT === '0' && row.GA_AUDITOR == null) {
         return true
-      }else {
+      } else {
         return false
       }
     },
@@ -286,11 +278,11 @@ export default{
       this.getList()
     },
     remark(row) {
-      this.remarkText = row.QY_REMARK || row.GA_REMARK; // 假设驳回原因存储在 row.REJECT_REASON 中
+      this.remarkText = row.QY_REMARK || row.GA_REMARK // 假设驳回原因存储在 row.REJECT_REASON 中
-      this.remarkDialogVisible = true; // 显示弹窗
+      this.remarkDialogVisible = true // 显示弹窗
     },
     handleRemarkClose() {
-      this.remarkDialogVisible = false; // 关闭弹窗
+      this.remarkDialogVisible = false // 关闭弹窗
     },
     translateLicenceType(id) {
       for (var i = 0; i < this.licenceTypeList.length; i++) {
@@ -324,80 +316,81 @@ export default{
       })
     },
     apply(row) {
-      this.dialogVisible = true;
+      this.dialogVisible = true
       this.auditForm = {
         VISIT_START_TIME: '',
         VISIT_END_TIME: '',
         CORPINFO_ID: '',
         AUDITOR_ID: '',
         VISIT_PLACE: ''
-      };
+      }
       this.VEHICLE_ID = row.VEHICLE_ID
       this.IS_DANGEROUS_CAR = row.IS_DANGEROUS_CAR
-      this.showCorpSelect = row.IS_DANGEROUS_CAR !== '1';
+      this.showCorpSelect = row.IS_DANGEROUS_CAR !== '1'
       // 这里可以调用接口获取公司列表、审核人列表和访问地列表
-      this.getCorpList();
+      this.getCorpList()
-      this.getPlaceList();
+      this.getPlaceList()
-      if (!this.showCorpSelect){
+      if (!this.showCorpSelect) {
-        this.getAuditorList();
+        this.getAuditorList()
       }
     },
     handleCorpChange(corpId) {
       // 根据选择的公司ID获取审核人列表
-      this.getAuditorList(corpId);
+      this.getAuditorList(corpId)
     },
     getCorpList() {
       // 调用接口获取公司列表
       requestFN('/mkmj/management/getCorpList').then(response => {
-        this.corpList = response.corpList;
+        this.corpList = response.corpList
-      });
+      })
     },
     getAuditorList(corpId) {
       // 调用接口获取审核人列表
       requestFN('/mkmj/management/getPersonList',
         { CORPINFO_ID: corpId }
       ).then(response => {
-        this.personList = response.personList;
+        this.personList = response.personList
-      });
+      })
     },
     getPlaceList() {
       // 调用接口获取访问地列表
       requestFN('/mkmj/management/getPlaceList').then(response => {
-        this.doorList = response.doorList;
+        this.doorList = response.doorList
-      });
-    },
-    submitAudit() {
-      // 提交审核信息
-      this.$refs.auditForm.validate(valid => {
-        if (valid) {
-          requestFN('/mkmj/management/intoPortApplication',
-            {
-              VEHICLE_ID: this.VEHICLE_ID,
-              IS_DANGEROUS_CAR: this.IS_DANGEROUS_CAR,
-              VISIT_START_TIME: this.auditForm.VISIT_START_TIME,
-              VISIT_END_TIME: this.auditForm.VISIT_END_TIME,
-              AUDITOR: this.auditForm.AUDITOR_ID,
-              DOOR_ID: this.auditForm.VISIT_PLACE
-            }
-          ).then(response => {
-            this.$message.success('申请提交成功');
-            this.dialogVisible = false;
-            this.getList()
-          })
-        }
       })
     },
-    handleClose(){
+    submitAudit() {
-      this.dialogVisible = false;
+      this.$refs.auditForm.validate(valid => {
+        if (!valid) {
+          return false
+        }
+        // 提交审核信息
+        requestFN('/mkmj/management/intoPortApplication',
+          {
+            VEHICLE_ID: this.VEHICLE_ID,
+            IS_DANGEROUS_CAR: this.IS_DANGEROUS_CAR,
+            VISIT_START_TIME: this.auditForm.VISIT_START_TIME,
+            VISIT_END_TIME: this.auditForm.VISIT_END_TIME,
+            AUDITOR: this.auditForm.AUDITOR_ID,
+            DOOR_ID: this.auditForm.VISIT_PLACE
+          }
+        ).then(response => {
+          this.$message.success('申请提交成功')
+          this.dialogVisible = false
+          this.getList()
+        })
+      })
+    },
+    handleClose() {
+      this.dialogVisible = false
       this.auditForm = {
         VISIT_START_TIME: '',
         VISIT_END_TIME: '',
         CORPINFO_ID: '',
         AUDITOR_ID: '',
         VISIT_PLACE: ''
-      };
+      }
     },
-    returnBtn(){
+    returnBtn() {
       this.$parent.activeName = 'List'
     }
 

src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue

@@ -231,14 +231,14 @@
             :clearable="false"
             :options="departmentTreeData"
             :props="defaultProps"
-            v-model="reapplyForm.DEPT_NAME"
+            v-model="reapplyForm.DEPARTMENT_ID"
             placeholder="请选择车辆所属部门"
             style="width: 300px"
             @change="handleCorpChange"/>
         </el-form-item>
         <el-form-item label="负责人" prop="U_NAME">
           <el-select
-            v-model="reapplyForm.U_NAME"
+            v-model="reapplyForm.USER_ID"
             placeholder="请选择负责人">
             <el-option
               v-for="user in personList"
@@ -283,18 +283,7 @@ export default {
     return {
       rules: {
         LICENCE_NO: [
-          { required: true, message: '车牌号不能为空', trigger: 'blur' },
+          { required: true, message: '车牌号不能为空', trigger: 'blur' }
-          {
-            validator: (rule, value, callback) => {
-              const reg = /^[京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼][A-HJ-NP-Z][A-HJ-NP-Z0-9]{4,5}[A-HJ-NP-Z0-9挂学警港澳]$/;
-              if (!reg.test(value)) {
-                callback(new Error('车牌号格式不正确'));
-              } else {
-                callback();
-              }
-            },
-            trigger: 'blur'
-          }
         ],
         LICENCE_TYPE: [
           { required: true, message: '车牌类型不能为空', trigger: 'change' }
@@ -433,7 +422,6 @@ export default {
       },
       reapplyDialogVisible: false, // 控制重新申请对话框的显示
       reapplyForm: { // 重新申请表单数据
-        VEHICLE_DEPARTMENT_ID: '',
         LICENCE_NO: '',
         LICENCE_TYPE: '',
         VEHICLE_TYPE: '',
@@ -623,7 +611,7 @@ export default {
             this.ISCHECK = false
           })
         } else {
-          this.$message.error('车牌号不规范')
+          this.$message.success('车牌号不规范')
           this.ISCHECK = false
         }
       }
@@ -639,10 +627,8 @@ export default {
     },
 
     apply(row) {
-      console.log(row)
       this.reapplyForm = { ...row }; // 将当前行的数据复制到 reapplyForm
       this.reapplyForm.DEPT_NAME = row.DEPT_NAME
-      this.reapplyForm.DEPARTMENT_ID = row.VEHICLE_DEPARTMENT_ID
       this.reapplyForm.U_NAME = row.U_NAME
       this.reapplyDialogVisible = true; // 打开对话框
       console.log(this.reapplyForm)
@@ -651,7 +637,6 @@ export default {
       this.reapplyDialogVisible = false; // 关闭对话框
     },
     reapplyDialogConfirmBtn() {
-      console.log()
       // 在这里处理重新申请的逻辑
       this.$refs.reapplyForm.validate(valid => {
         if (valid) {

src/views/firstLevelDoor/personPortInfo/PersonInfo/components/recordsList.vue

@@ -30,7 +30,7 @@
       <el-table-column prop="personType" label="人员身份"/>
       <el-table-column prop="personType" label="人员身份"/>
       <el-table-column prop="regionName" label="区域名称"/>
-      <el-table-column prop="syncTime" label="上报时间"/>
+      <el-table-column prop="reportTime" label="上报时间"/>
     </el-table>
     <div class="page-btn-group">
       <div/><div/>