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

- 门口门禁bug修复

src/views/freightVehicles/carInfoManagement/components/carList.vue

@@ -38,8 +38,16 @@
       <el-table-column prop="LICENCE_NO" label="车牌号"/>
       <el-table-column prop="CONTACT" label="联系人姓名"/>
       <el-table-column prop="PHONE" label="联系人电话"/>
-      <el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
+      <el-table-column label="车牌类型" align="center">
-      <el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
+        <template slot-scope="{row}">
+          {{ translateLicenceType(row.LICENCE_TYPE) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" align="center">
+        <template slot-scope="{row}">
+          {{ translateVehicleType(row.VEHICLE_TYPE) }}
+        </template>
+      </el-table-column>
     </el-table>
     <div class="page-btn-group">
       <div/>
@@ -253,6 +261,9 @@
         <el-button type="primary" @click="editDialogConfirmBtn">确 定</el-button>
       </div>
     </el-dialog>
+    <div>
+      <el-button plain type="info" @click="returnBtn">返回</el-button>
+    </div>
     <flow-step ref="flowStep" append-to-body @refresh="getList"/>
   </div>
 </template>
@@ -346,16 +357,7 @@ export default{
     },
     // 重置
     reset() {
-      this.form = {
+      this.form.LICENCE_NO = ''
-        USER_NAME: '',
-        PHONE: '',
-        ID_CARD: '',
-        CORPINFO_NAME: '',
-        DEPARTMENT_NAME: '',
-        VISIT_START_TIME: '',
-        VISIT_END_TIME: '',
-        DOOR_NAME: ''
-      }
       this.getList()
     },
     // 获取列表
@@ -404,11 +406,15 @@ export default{
         }
       }
     },
-    // 打开新增弹窗的新增按钮
+    translateLicenceType(id) {
-    openAddDialogAddBtn() {
+      for (var i = 0; i < this.licenceTypeList.length; i++) {
-      this.addDialogVisible = true
+        if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
-      this.reSetAddDialog()
+      }
-      this.ISCHECK = false
+    },
+    translateVehicleType(id) {
+      for (var i = 0; i < this.vehicleTypeList.length; i++) {
+        if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
+      }
     },
     reSetAddDialog() {
         this.addForm.VEHICLE_ID = '',
@@ -501,6 +507,9 @@ export default{
       }).catch((e) => {
         this.editDialogVisible = false
       })
+    },
+    returnBtn(){
+      this.$parent.activeName = 'List'
     }
   }
 

src/views/freightVehicles/carInfoManagement/components/corpList.vue

@@ -37,7 +37,11 @@
       <el-table-column prop="CORP_NAME" label="分公司名称" />
       <el-table-column prop="SOCIAL_CODE" label="统一社会信用代码" />
       <el-table-column prop="COMPANY_AREA" label="所属地区" />
-      <el-table-column prop="STATE" label="企业状态" />
+      <el-table-column label="企业状态" align="center">
+        <template slot-scope="{row}">
+          {{ getCorpType(row.STATE) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="USER_COUNT" label="企业人数" />
       <el-table-column label="操作" align="left" width="110">
         <template slot-scope="{row}">
@@ -80,6 +84,19 @@ export default {
     this.getList()
   },
   methods: {
+    getCorpType(STATE){
+      if (STATE === '0'){
+        return '未填报'
+      }else if (STATE === '1'){
+        return '待审核'
+      }else if (STATE === '2'){
+        return '已审核'
+      }else if (STATE === '3'){
+        return '已打回'
+      }else if (STATE === '4'){
+        return '已填报'
+      }
+    },
     getRowKey(row) {
       return row.CORPINFO_ID
     },

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

@@ -43,7 +43,9 @@
       </el-table-column>
     </el-table>
     <div class="page-btn-group">
-      <div/><div/>
+      <div>
+        <el-button plain type="info" @click="returnBtn">返回</el-button>
+      </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
     <flow-step ref="flowStep" append-to-body @refresh="getList"/>
@@ -93,16 +95,7 @@ export default{
     },
     // 重置
     reset() {
-      this.form = {
+      this.form.MOTORCADE_NAME = ''
-        USER_NAME: '',
-        PHONE: '',
-        ID_CARD: '',
-        CORPINFO_NAME: '',
-        DEPARTMENT_NAME: '',
-        VISIT_START_TIME: '',
-        VISIT_END_TIME: '',
-        DOOR_NAME: ''
-      }
       this.getList()
     },
     // 获取列表
@@ -127,9 +120,10 @@ export default{
       this.$parent.MOTORCADE_ID = row.MOTORCADE_ID
       this.$parent.activeName = 'CarList'
     },
-    getAuditInfo(row) {
+    returnBtn(){
-      this.$refs.flowStep.init(row)
+      this.$parent.activeName = 'CorpList'
     }
+
   }
 
 }

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

@@ -36,15 +36,25 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="LICENCE_NO" label="车牌号"/>
-      <el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
+      <el-table-column label="车牌类型" align="center">
-      <el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
+        <template slot-scope="{row}">
+          {{ translateLicenceType(row.LICENCE_TYPE) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" align="center">
+        <template slot-scope="{row}">
+          {{ translateVehicleType(row.VEHICLE_TYPE) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="vehicle_arrival_barrier" label="车辆入港闸口"/>
       <el-table-column prop="vehicle_arrival_time" label="车辆入港时间"/>
       <el-table-column prop="vehicle_departure_barrier" label="车辆离岗闸口"/>
       <el-table-column prop="vehicle_departure_time" label="车辆离岗时间"/>
     </el-table>
     <div class="page-btn-group">
-      <div/><div/>
+      <div>
+        <el-button plain type="info" @click="returnBtn">返回</el-button>
+      </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
   </div>
@@ -61,6 +71,21 @@ export default{
         page: 1,
         limit: 10
       },
+      // 车牌类型列表
+      licenceTypeList: [
+        { ID: '0', NAME: '白牌' },
+        { ID: '1', NAME: '蓝牌' },
+        { ID: '2', NAME: '黄牌' },
+        { ID: '3', NAME: '绿牌' },
+        { ID: '4', NAME: '黑牌' }
+      ],
+      // 车辆类型列表
+      vehicleTypeList: [
+        // { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '货车' },
+        { ID: '1', NAME: '轿车' },
+        { ID: '2', NAME: '大巴客车' }
+      ],
       areaList: [], // 省市县列表
       placeList: [],
       listLoading: true,
@@ -91,18 +116,18 @@ export default{
       this.$refs.multipleTable.clearSelection()
       this.getList()
     },
-    // 重置
+    translateLicenceType(id) {
-    reset() {
+      for (var i = 0; i < this.licenceTypeList.length; i++) {
-      this.form = {
+        if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
-        USER_NAME: '',
-        PHONE: '',
-        ID_CARD: '',
-        CORPINFO_NAME: '',
-        DEPARTMENT_NAME: '',
-        VISIT_START_TIME: '',
-        VISIT_END_TIME: '',
-        DOOR_NAME: ''
       }
+    },
+    translateVehicleType(id) {
+      for (var i = 0; i < this.vehicleTypeList.length; i++) {
+        if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
+      }
+    },
+    reset() {
+      this.form.LICENCE_NO = ''
       this.getList()
     },
     // 获取列表
@@ -120,6 +145,9 @@ export default{
       }).catch((e) => {
         this.listLoading = false
       })
+    },
+    returnBtn(){
+      this.$parent.activeName = 'CorpList'
     }
   }
 

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

@@ -44,10 +44,8 @@
       </el-table-column>
       <el-table-column label="操作" align="left" width="300">
         <template slot-scope="{row}">
-          <el-button type="success" icon="el-icon-view" size="mini" @click="detail(row)">查看详情</el-button>
+          <el-button type="primary" icon="el-icon-view" size="mini" @click="detail(row)">查看详情</el-button>
-          <el-button v-if="row.IS_AUDIT === '0' || row.IS_AUDIT == null" type="success" icon="el-icon-view" size="mini"
+          <el-button v-if="checkButton(row)" type="success" icon="el-icon-check" size="mini" @click="approve(row)">审核</el-button>
-                     @click="approve(row)">审核
-          </el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -152,9 +150,20 @@ export default {
     }
   },
   created() {
+    this.getPermissions()
     this.getList()
   },
   methods: {
+    checkButton(row){
+      console.log('---------------------')
+      console.log('row.IS_AUDIT:', row.IS_AUDIT); // 添加日志输出
+      console.log('this.IS_POLICE:', this.IS_POLICE); // 添加日志输出
+      if (row.IS_AUDIT == null && this.IS_POLICE === '1'){
+        return true
+      }else {
+        return false
+      }
+    },
     detail(row) {
       this.form.MOTORCADE_ID = row.MOTORCADE_ID
       this.getFileList()
@@ -221,6 +230,15 @@ export default {
     },
     getRowKey() {
 
+    },
+    getPermissions(){
+      requestFN(
+        '/mkmjManagement/getPermissions'
+      ).then((data) => {
+        this.IS_POLICE = data.pageData.IS_POLICE
+        console.log('IS_POLICE:', this.IS_POLICE)
+        this.getList();
+      })
     }
   }
 

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

@@ -36,15 +36,25 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="LICENCE_NO" label="车牌号"/>
-      <el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
+      <el-table-column label="车牌类型" align="center">
-      <el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
+        <template slot-scope="{row}">
+          {{ translateLicenceType(row.LICENCE_TYPE) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" align="center">
+        <template slot-scope="{row}">
+          {{ translateVehicleType(row.VEHICLE_TYPE) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="vehicle_arrival_barrier" label="车辆入港闸口"/>
       <el-table-column prop="vehicle_arrival_time" label="车辆入港时间"/>
       <el-table-column prop="vehicle_departure_barrier" label="车辆离岗闸口"/>
       <el-table-column prop="vehicle_departure_time" label="车辆离岗时间"/>
     </el-table>
     <div class="page-btn-group">
-      <div/><div/>
+      <div>
+        <el-button plain type="info" @click="returnBtn">返回</el-button>
+      </div>
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
   </div>
@@ -61,6 +71,21 @@ export default{
         page: 1,
         limit: 10
       },
+      // 车牌类型列表
+      licenceTypeList: [
+        { ID: '0', NAME: '白牌' },
+        { ID: '1', NAME: '蓝牌' },
+        { ID: '2', NAME: '黄牌' },
+        { ID: '3', NAME: '绿牌' },
+        { ID: '4', NAME: '黑牌' }
+      ],
+      // 车辆类型列表
+      vehicleTypeList: [
+        // { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '货车' },
+        { ID: '1', NAME: '轿车' },
+        { ID: '2', NAME: '大巴客车' }
+      ],
       areaList: [], // 省市县列表
       placeList: [],
       listLoading: true,
@@ -91,18 +116,19 @@ export default{
       this.$refs.multipleTable.clearSelection()
       this.getList()
     },
+    translateLicenceType(id) {
+      for (var i = 0; i < this.licenceTypeList.length; i++) {
+        if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
+      }
+    },
+    translateVehicleType(id) {
+      for (var i = 0; i < this.vehicleTypeList.length; i++) {
+        if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
+      }
+    },
     // 重置
     reset() {
-      this.form = {
+      this.form.LICENCE_NO = ''
-        USER_NAME: '',
-        PHONE: '',
-        ID_CARD: '',
-        CORPINFO_NAME: '',
-        DEPARTMENT_NAME: '',
-        VISIT_START_TIME: '',
-        VISIT_END_TIME: '',
-        DOOR_NAME: ''
-      }
       this.getList()
     },
     // 获取列表
@@ -120,6 +146,9 @@ export default{
       }).catch((e) => {
         this.listLoading = false
       })
+    },
+    returnBtn(){
+      this.$parent.activeName = 'CorpList'
     }
   }
 

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

@@ -36,8 +36,16 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="LICENCE_NO" label="车牌号"/>
-      <el-table-column prop="LICENCE_TYPE" label="车牌类型"/>
+      <el-table-column label="车牌类型" align="center">
-      <el-table-column prop="VEHICLE_TYPE" label="车辆类型"/>
+        <template slot-scope="{row}">
+          {{ translateLicenceType(row.LICENCE_TYPE) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="车辆类型" align="center">
+        <template slot-scope="{row}">
+          {{ translateVehicleType(row.VEHICLE_TYPE) }}
+        </template>
+      </el-table-column>
       <el-table-column prop="CONTACT" label="联系人"/>
       <el-table-column prop="PHONE" label="联系人电话"/>
       <el-table-column label="审核状态" align="center" width="120">
@@ -45,9 +53,10 @@
           {{ getType(row.IS_AUDIT) }}
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="left" width="110">
+      <el-table-column label="操作" align="left" width="300">
         <template slot-scope="{row}">
-          <el-button v-if="checkButton(row)" type="success" icon="el-icon-view" size="mini" @click="approve(row)">审核</el-button>
+          <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>
         </template>
       </el-table-column>
     </el-table>
@@ -56,6 +65,41 @@
       <pagination :total="total" :page.sync="listQuery.page" :limit.sync="listQuery.limit" @pagination="getList" />
     </div>
     <send-util ref="sendUtil" append-to-body @refresh="getList"/>
+
+    <el-dialog :title="detailTitle" :visible.sync="dialogVisible" width="50%">
+      <el-form :model="detailForm" label-width="120px">
+        <el-form-item label="排放标准">
+          <el-input v-model="detailForm.EMISSION_STANDARDS" readonly />
+        </el-form-item>
+        <el-form-item label="驾驶证图片">
+          <el-image :src="config.fileUrl + detailForm.DRIVING_LICENSE" style="width: 100px; height: 100px" />
+        </el-form-item>
+        <el-form-item label="绿本图片">
+          <el-image :src="config.fileUrl + detailForm.GREEN_BOOK" style="width: 100px; height: 100px" />
+        </el-form-item>
+        <el-form-item label="环保随车清单图片">
+          <el-image :src="config.fileUrl + detailForm.ECO_FRIENDLY_CHECKLIST" style="width: 100px; height: 100px" />
+        </el-form-item>
+        <el-form-item label="出厂合格证图片">
+          <el-image :src="config.fileUrl + detailForm.FACTORY_CERTIFICATE" style="width: 100px; height: 100px" />
+        </el-form-item>
+        <el-form-item label="环保信息截图图片">
+          <el-image :src="config.fileUrl + detailForm.ENVIRONMENTAL_SCREENSHOTS" style="width: 100px; height: 100px" />
+        </el-form-item>
+        <el-form-item label="访问起始时间">
+          <el-input v-model="detailForm.VISIT_START_TIME" readonly />
+        </el-form-item>
+        <el-form-item label="访问结束时间">
+          <el-input v-model="detailForm.VISIT_END_TIME" readonly />
+        </el-form-item>
+        <el-form-item label="访问口门名称">
+          <el-input v-model="detailForm.DOOR_NAME" readonly />
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+      <el-button @click="dialogVisible = false">关闭</el-button>
+    </span>
+    </el-dialog>
   </div>
 </template>
 
@@ -71,6 +115,36 @@ export default{
         page: 1,
         limit: 10
       },
+      config: config,
+      dialogVisible: false,
+      detailTitle: '详情',
+      detailForm: {
+        EMISSION_STANDARDS: '',
+        DRIVING_LICENSE: '',
+        GREEN_BOOK: '',
+        ECO_FRIENDLY_CHECKLIST: '',
+        CERTIFICATE_IMAGE: '',
+        FACTORY_CERTIFICATE: '',
+        ENVIRONMENTAL_SCREENSHOTS: '',
+        VISIT_START_TIME: '',
+        VISIT_END_TIME: '',
+        DOOR_NAME: ''
+      },
+      // 车牌类型列表
+      licenceTypeList: [
+        { ID: '0', NAME: '白牌' },
+        { ID: '1', NAME: '蓝牌' },
+        { ID: '2', NAME: '黄牌' },
+        { ID: '3', NAME: '绿牌' },
+        { ID: '4', NAME: '黑牌' }
+      ],
+      // 车辆类型列表
+      vehicleTypeList: [
+        // { ID: '', NAME: '请选择' },
+        { ID: '0', NAME: '货车' },
+        { ID: '1', NAME: '轿车' },
+        { ID: '2', NAME: '大巴客车' }
+      ],
       IS_POLICE: '',
       areaList: [], // 省市县列表
       placeList: [],
@@ -100,14 +174,24 @@ export default{
   methods: {
     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 === '0' && this.IS_POLICE === '1'){
         return true
       }else {
         return false
       }
     },
+    translateLicenceType(id) {
+      for (var i = 0; i < this.licenceTypeList.length; i++) {
+        if (this.licenceTypeList[i].ID == id) return this.licenceTypeList[i].NAME
+      }
+    },
+    translateVehicleType(id) {
+      for (var i = 0; i < this.vehicleTypeList.length; i++) {
+        if (this.vehicleTypeList[i].ID == id) return this.vehicleTypeList[i].NAME
+      }
+    },
     approve(row) {
       this.$refs.sendUtil.init(row)
     },
@@ -164,6 +248,27 @@ export default{
         this.IS_POLICE = data.pageData.IS_POLICE
         console.log('IS_POLICE:', this.IS_POLICE)
       })
+    },
+    detail(row){
+      this.dialogVisible = true
+      requestFN(
+        '/mkmjManagement/getCarInfo',
+        {
+          VEHICLE_ID: row.VEHICLE_ID
+        }
+      ).then((data) => {
+        this.detailForm.EMISSION_STANDARDS = data.pageData.EMISSION_STANDARDS
+        this.detailForm.DRIVING_LICENSE = data.pageData.DRIVING_LICENSE
+        this.detailForm.GREEN_BOOK = data.pageData.GREEN_BOOK
+        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_END_TIME = data.pageData.VISIT_END_TIME
+        this.detailForm.DOOR_NAME = data.pageData.DOOR_NAME
+      }).catch((e) => {
+        this.listLoading = false
+      })
     }
   }
 

src/views/longtermvehicle/vehiclemessage/components/indexList.vue

@@ -33,7 +33,6 @@
       fit
       highlight-current-row
     >
-      <!--      <el-table-column :reserve-selection="true" type="selection" width="55" align="center"/>-->
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="CORP_NAME" label="分公司名称" />
       <el-table-column label="属地" >
@@ -45,9 +44,6 @@
         </template>
       </el-table-column>
       <el-table-column prop="INDUSTRYALL" label="所属行业">
-        <!--        <template slot-scope="{row}">-->
-        <!--          {{ translate(industryList,row.INDUSTRY) }}-->
-        <!--        </template>-->
       </el-table-column>
       <el-table-column prop="count" label="人数"/>
       <el-table-column prop="CORP_STATE" label="分公司状态">

src/views/longtermvehicle/xgfCarMessage/components/List.vue

@@ -37,7 +37,15 @@
       <el-table-column prop="CORP_NAME" label="分公司名称" />
       <el-table-column prop="SOCIAL_CODE" label="统一社会信用代码" />
       <el-table-column prop="COMPANY_AREA" label="所属地区" />
-      <el-table-column prop="STATE" label="企业状态" />
+      <el-table-column prop="STATE" label="企业状态">
+        <template slot-scope="{row}">
+          <span v-if="row.STATE =='0'">未填报</span>
+          <span v-if="row.STATE =='1'">待审核</span>
+          <span v-if="row.STATE =='2'">已审核</span>
+          <span v-if="row.STATE =='3'">已打回</span>
+          <span v-if="row.STATE =='4'">已填报</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="USER_COUNT" label="企业人数" />
       <el-table-column label="操作" align="left" width="110">
         <template slot-scope="{row}">

src/views/longtermvehicle/zgCarMessage/components/List.vue

@@ -37,7 +37,15 @@
       <el-table-column prop="CORP_NAME" label="分公司名称" />
       <el-table-column prop="SOCIAL_CODE" label="统一社会信用代码" />
       <el-table-column prop="COMPANY_AREA" label="所属地区" />
-      <el-table-column prop="STATE" label="企业状态" />
+      <el-table-column prop="STATE" label="企业状态">
+        <template slot-scope="{row}">
+          <span v-if="row.STATE =='0'">未填报</span>
+          <span v-if="row.STATE =='1'">待审核</span>
+          <span v-if="row.STATE =='2'">已审核</span>
+          <span v-if="row.STATE =='3'">已打回</span>
+          <span v-if="row.STATE =='4'">已填报</span>
+        </template>
+      </el-table-column>
       <el-table-column prop="USER_COUNT" label="企业人数" />
       <el-table-column label="操作" align="left" width="110">
         <template slot-scope="{row}">