Merge remote-tracking branch 'origin/pet_门口门禁' into pet_门口门禁

1. 图片无法放大
2. 日期格式修改
3. 表单校验

src/views/freightVehicles/filingAudit/components/list.vue

@@ -58,65 +58,94 @@
     <send-util ref="sendUtil" append-to-body @refresh="getList"/>
 
     <el-dialog
-      title="车队详情"
       :visible.sync="dialogVisible"
-      width="50%"
+      title="车队详情"
-      :before-close="handleClose">
+      width="50%">
       <el-tabs v-model="activeTab">
         <el-tab-pane label="智能口门管理系统账号申请单" name="application">
-          <div v-if="fileList && fileList[0] && fileList[0].REQUISITION_FILE">
+          <template #default>
-            <img :src="config.fileUrl + fileList[0].REQUISITION_FILE" style="max-width: 100%;">
+            <el-image
-          </div>
+              v-if="fileList && fileList[0] && fileList[0].REQUISITION_FILE"
-          <div v-else>
+              :src="config.fileUrl + fileList[0].REQUISITION_FILE"
-            暂无数据
+              :key="config.fileUrl + fileList[0].REQUISITION_FILE"
-          </div>
+              :preview-src-list="[config.fileUrl + fileList[0].REQUISITION_FILE]"
+              style="max-width: 100%;"
+              @click="dialogVisible = false"/>
+            <div v-else>
+              暂无数据
+            </div>
+          </template>
         </el-tab-pane>
         <el-tab-pane label="智能口门管理系统使用承诺书" name="commitment">
-          <div v-if="fileList && fileList[0] && fileList[0].COMMITMENT_FILE">
+          <template #default>
-            <img :src="config.fileUrl + fileList[0].COMMITMENT_FILE" style="max-width: 100%;">
+            <el-image
-          </div>
+              v-if="fileList && fileList[0] && fileList[0].COMMITMENT_FILE"
-          <div v-else>
+              :src="config.fileUrl + fileList[0].COMMITMENT_FILE"
-            暂无数据
+              :key="config.fileUrl + fileList[0].COMMITMENT_FILE"
-          </div>
+              :preview-src-list="[config.fileUrl + fileList[0].COMMITMENT_FILE]"
+              style="max-width: 100%;"
+              @click="dialogVisible = false"/>
+            <div v-else>
+              暂无数据
+            </div>
+          </template>
         </el-tab-pane>
         <el-tab-pane label="营业执照" name="businessLicense">
-          <div v-if="fileList && fileList[0] && fileList[0].LICENSE_FILE">
+          <template #default>
-            <img :src="config.fileUrl + fileList[0].LICENSE_FILE" style="max-width: 100%;">
+            <el-image
-          </div>
+              v-if="fileList && fileList[0] && fileList[0].LICENSE_FILE"
-          <div v-else>
+              :src="config.fileUrl + fileList[0].LICENSE_FILE"
-            暂无数据
+              :key="config.fileUrl + fileList[0].LICENSE_FILE"
-          </div>
+              :preview-src-list="[config.fileUrl + fileList[0].LICENSE_FILE]"
+              style="max-width: 100%;"
+              @click="dialogVisible = false"/>
+            <div v-else>
+              暂无数据
+            </div>
+          </template>
         </el-tab-pane>
         <el-tab-pane label="道路运输经营许可证" name="transportLicense">
-          <div v-if="fileList && fileList[0] && fileList[0].TRANSPORT_PERMIT_FILE">
+          <template #default>
-            <img :src="config.fileUrl + fileList[0].TRANSPORT_PERMIT_FILE" style="max-width: 100%;">
+            <el-image
-          </div>
+              v-if="fileList && fileList[0] && fileList[0].TRANSPORT_PERMIT_FILE"
-          <div v-else>
+              :src="config.fileUrl + fileList[0].TRANSPORT_PERMIT_FILE"
-            暂无数据
+              :key="config.fileUrl + fileList[0].TRANSPORT_PERMIT_FILE"
-          </div>
+              :preview-src-list="[config.fileUrl + fileList[0].TRANSPORT_PERMIT_FILE]"
+              style="max-width: 100%;"
+              @click="dialogVisible = false"/>
+            <div v-else>
+              暂无数据
+            </div>
+          </template>
         </el-tab-pane>
         <el-tab-pane label="危险化学品经营许可证" name="chemicalLicense">
-          <div v-if="fileList && fileList[0] && fileList[0].HAZARDOUS_CHEMICALS_FILE">
+          <template #default>
-            <img :src="config.fileUrl + fileList[0].HAZARDOUS_CHEMICALS_FILE" style="max-width: 100%;">
+            <el-image
-          </div>
+              v-if="fileList && fileList[0] && fileList[0].HAZARDOUS_CHEMICALS_FILE"
-          <div v-else>
+              :src="config.fileUrl + fileList[0].HAZARDOUS_CHEMICALS_FILE"
-            暂无数据
+              :key="config.fileUrl + fileList[0].HAZARDOUS_CHEMICALS_FILE"
-          </div>
+              :preview-src-list="[config.fileUrl + fileList[0].HAZARDOUS_CHEMICALS_FILE]"
+              style="max-width: 100%;"
+              @click="dialogVisible = false"/>
+            <div v-else>
+              暂无数据
+            </div>
+          </template>
         </el-tab-pane>
       </el-tabs>
       <span slot="footer" class="dialog-footer">
-    <el-button @click="dialogVisible = false">关闭</el-button>
+        <el-button @click="dialogVisible = false">关闭</el-button>
-  </span>
+      </span>
     </el-dialog>
   </div>
 </template>
 
 <script>
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
-import {requestFN} from '@/utils/request'
+import { requestFN } from '@/utils/request'
 import SendUtil from './sendUtil.vue'
 export default {
-  components: {SendUtil, Pagination},
+  components: { SendUtil, Pagination },
   data() {
     return {
       listQuery: {
@@ -156,20 +185,20 @@ export default {
     this.getList()
   },
   methods: {
-    checkButton(row){
+    checkButton(row) {
       console.log('---------------------')
-      console.log('row.IS_AUDIT:', row.IS_AUDIT); // 添加日志输出
+      console.log('row.IS_AUDIT:', row.IS_AUDIT) // 添加日志输出
-      console.log('this.IS_POLICE:', this.IS_POLICE); // 添加日志输出
+      console.log('this.IS_POLICE:', this.IS_POLICE) // 添加日志输出
-      if (row.IS_AUDIT == null && this.IS_POLICE === '1'){
+      if (row.IS_AUDIT == null && this.IS_POLICE === '1') {
         return true
-      }else {
+      } else {
         return false
       }
     },
     detail(row) {
       this.form.MOTORCADE_ID = row.MOTORCADE_ID
       this.getFileList()
-      this.dialogVisible = true; // 打开弹窗
+      this.dialogVisible = true // 打开弹窗
     },
     approve(row) {
       this.$refs.sendUtil.init(row)
@@ -201,8 +230,8 @@ export default {
       this.getList()
     },
     handleClose(done) {
-      this.dialogVisible = false;
+      this.dialogVisible = false
-      done();
+      done()
     },
     // 获取列表
     getList() {
@@ -233,13 +262,13 @@ export default {
     getRowKey() {
 
     },
-    getPermissions(){
+    getPermissions() {
       requestFN(
         '/mkmjManagement/getPermissions'
       ).then((data) => {
         this.IS_POLICE = data.pageData.IS_POLICE
         console.log('IS_POLICE:', this.IS_POLICE)
-        this.getList();
+        this.getList()
       })
     }
   }

src/views/freightVehicles/publicAuidt/components/list.vue

@@ -107,6 +107,8 @@
 import Pagination from '@/components/Pagination' // 通过 el-pagination二次打包
 import { requestFN } from '@/utils/request'
 import SendUtil from './sendUtil.vue'
+import formatDate from '../../../../utils/dateformat'
+
 export default{
   components: { SendUtil, Pagination },
   data() {
@@ -240,7 +242,7 @@ export default{
         console.log('IS_POLICE:', this.IS_POLICE)
       })
     },
-    detail(row){
+    detail(row) {
       this.dialogVisible = true
       requestFN(
         '/mkmjManagement/getCarInfo',
@@ -254,8 +256,8 @@ export default{
         this.detailForm.ECO_FRIENDLY_CHECKLIST = data.pageData.ECO_FRIENDLY_CHECKLIST
         this.detailForm.FACTORY_CERTIFICATE = data.pageData.FACTORY_CERTIFICATE
         this.detailForm.ENVIRONMENTAL_SCREENSHOTS = data.pageData.ENVIRONMENTAL_SCREENSHOTS
-        this.detailForm.VISIT_START_TIME = data.pageData.VISIT_START_TIME
+        this.detailForm.VISIT_START_TIME = formatDate(data.pageData.VISIT_START_TIME, 'YYYY-MM-DD HH:mm:ss')
-        this.detailForm.VISIT_END_TIME = data.pageData.VISIT_END_TIME
+        this.detailForm.VISIT_END_TIME = formatDate(data.pageData.VISIT_END_TIME, 'YYYY-MM-DD HH:mm:ss')
         this.detailForm.DOOR_NAME = data.pageData.DOOR_NAME
       }).catch((e) => {
         this.listLoading = false

src/views/freightVehicles/publicAuidt/components/sendUtil.vue

@@ -58,7 +58,7 @@
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="handleClose">关 闭</el-button>
-        <el-button type="primary" @click="sendMessage">确 定</el-button>
+        <el-button type="primary" @click="sendMessage('form')">确 定</el-button>
       </div>
     </el-dialog>
   </div>
@@ -163,27 +163,33 @@ export default {
     goDetail() {
       this.$parent.activeName = 'List'
     },
-    sendMessage() {
+    sendMessage(formName) {
-      requestFN(
+      this.$refs[formName].validate((valid) => {
-        '/mkmjManagement/motorcadeAudit',
+        if (!valid) {
-        {
+          return false
-          AUDITOR: JSON.parse(sessionStorage.getItem('user')).USER_ID,
-          VEHICLE_ID: this.VEHICLE_ID,
-          IS_AUDIT: this.form.STATUS,
-          REMARK: this.form.OPINION,
-          QY_AUDITOR: this.form.AUDITOR_ID
         }
-      ).then((data) => {
+        requestFN(
-        this.visible = false
+          '/mkmjManagement/motorcadeAudit',
-        this.$emit('refresh', '')
+          {
-      }).catch((e) => {
+            AUDITOR: JSON.parse(sessionStorage.getItem('user')).USER_ID,
-        this.loading = false
+            VEHICLE_ID: this.VEHICLE_ID,
+            IS_AUDIT: this.form.STATUS,
+            REMARK: this.form.OPINION,
+            QY_AUDITOR: this.form.AUDITOR_ID
+          }
+        ).then((data) => {
+          this.$refs[formName].resetFields()
+          this.visible = false
+          this.$emit('refresh', '')
+        }).catch((e) => {
+          this.loading = false
+        })
       })
     },
-    handleStatusChange(){
+    handleStatusChange() {
       this.getCorpList()
     },
-    getCorpList(){
+    getCorpList() {
       requestFN(
         '/mkmjManagement/getCorpList'
       ).then((data) => {
@@ -192,16 +198,16 @@ export default {
         this.loading = false
       })
     },
-    handleCompanyChange(corpId){
+    handleCompanyChange(corpId) {
-      this.getAuditorList(corpId);
+      this.getAuditorList(corpId)
     },
     getAuditorList(corpId) {
       // 调用接口获取审核人列表
       requestFN('/mkmjManagement/getPersonList',
         { CORPINFO_ID: corpId }
       ).then(response => {
-        this.personList = response.personList;
+        this.personList = response.personList
-      });
+      })
     }
   }
 }