From c42c84c59a941d5fa1edd1bde4ea56c83c0d4a8e Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Mon, 20 Jan 2025 08:41:07 +0800
Subject: [PATCH] =?UTF-8?q?[=E9=97=AE=E9=A2=98=E4=BF=AE=E5=A4=8D](hyx=5F?=
 =?UTF-8?q?=E9=97=A8=E5=8F=A3=E9=97=A8=E7=A6=81):=20=20=20-=20bug=E4=BF=AE?=
 =?UTF-8?q?=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/list.vue                       | 53 +++++++----
 .../components/carList.vue                    | 35 +++++---
 .../oprtApplication/components/carList.vue    | 80 +++++++++++++----
 .../longCarPort/CarInfo/components/list.vue   | 87 +++++++++++++++----
 .../longCarPort/CarInfo/components/record.vue |  5 --
 .../PersonInfo/components/list.vue            | 28 ++----
 6 files changed, 200 insertions(+), 88 deletions(-)

diff --git a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
index b349c1e..60a8128 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/fleetFilingApplication/components/list.vue
@@ -36,6 +36,11 @@
         align="center"/>
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="MOTORCADE_NAME" label="车队名称"/>
+      <el-table-column label="审核状态" align="center">
+        <template slot-scope="{row}">
+          {{ getAuditType(row.IS_AUDIT) }}
+        </template>
+      </el-table-column>
       <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>
@@ -52,10 +57,10 @@
     </div>
     <flow-step ref="flowStep" append-to-body @refresh="getList"/>
     <!--新增-->
-    <el-dialog :visible.sync="addLoading"  width="600px">
-      <el-form ref="form" :model="form" label-width="110px" style="width: 500px;">
-        <el-form-item label="车队名称:">
-          <el-input v-model="form.ADD_MOTORCADE_NAME" placeholder="请输入车队名称" class="filter-item" style="width: 200px;"/>
+    <el-dialog :visible.sync="addLoading" width="600px">
+      <el-form ref="form" :model="form" :rules="rules" label-width="110px" style="width: 500px;">
+        <el-form-item label="车队名称:" prop="ADD_MOTORCADE_NAME">
+          <el-input v-model="form.ADD_MOTORCADE_NAME" placeholder="请输入车队名称" class="filter-item" style="width: 200px;" />
         </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
@@ -111,6 +116,11 @@ export default{
         DOOR_NAME: '',
         TEMPORARY_TYPE: '2',
         CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+      },
+      rules: {
+        ADD_MOTORCADE_NAME: [
+          { required: true, message: '车队名称不能为空', trigger: 'blur' }
+        ]
       }
     }
   },
@@ -118,6 +128,13 @@ export default{
     this.getList()
   },
   methods: {
+    getAuditType(IS_AUDIT){
+      if (IS_AUDIT === '1'){
+        return '审核通过'
+      }else {
+        return '未审核'
+      }
+    },
     // 搜索
     getQuery() {
       this.$refs.multipleTable.clearSelection()
@@ -157,18 +174,24 @@ export default{
       this.addLoading = true
     },
     saveMotorcade(){
-      requestFN(
-        '/mkmj/management/motorcadeInfoManagement',
-        {
-          MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+      this.$refs.form.validate((valid) => {
+        if (valid) {
+          requestFN(
+            '/mkmj/management/motorcadeInfoManagement',
+            {
+              MOTORCADE_NAME: this.form.ADD_MOTORCADE_NAME,
+              CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+            }
+          ).then((data) => {
+            this.addLoading = false
+            this.form.MOTORCADE_NAME = ''
+            this.getQuery()
+          }).catch((e) => {
+            this.addLoading = false
+          })
+        } else {
+          this.$message.error('请填写完整信息');
         }
-      ).then((data) => {
-        this.addLoading = false
-        this.form.MOTORCADE_NAME = ''
-        this.getQuery()
-      }).catch((e) => {
-        this.addLoading = false
       })
     },
     handleEdit(row){
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
index 7903d16..7b6f1e1 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/components/carList.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/freightVehicleMaintenance/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 prop="VEHICLE_TYPE" label="车辆类型"/>
+      <el-table-column label="车牌类型" align="center">
+        <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 label="操作" align="left" width="300">
         <template slot-scope="{row}">
           <el-button type="primary" icon="el-icon-edit" size="mini" @click="goEdit(row)">编辑</el-button>
@@ -160,7 +168,7 @@
     <el-dialog :visible.sync="editDialogVisible" title="编辑车辆信息" width="600px">
       <el-form v-if="editDialogVisible" ref="editForm" :model="addForm" label-width="170px" style="padding:0 20px; width: 500px;">
         <el-form-item label="车牌号" prop="LICENCE_NO">
-          <el-input v-model="addForm.LICENCE_NO"  type="text" maxlength="300" placeholder="这里输入车牌号..." @blur="goCheckLicenceNoAdd()"/>
+          <el-input v-model="addForm.LICENCE_NO"  type="text" maxlength="300" placeholder="这里输入车牌号..."/>
         </el-form-item>
         <!-- 白牌、蓝牌、黄牌、绿牌、黑牌 下拉框-->
         <el-form-item label="车牌类型" prop="LICENCE_TYPE">
@@ -260,8 +268,9 @@
         <el-button type="primary" @click="editDialogConfirmBtn">确 定</el-button>
       </div>
     </el-dialog>
+    <div style="margin-left: 20px;"></div>
     <div class="bottom-btn-group">
-      <el-button type="info" icon="el-icon-back" size="mini" @click="goBack">返回</el-button>
+      <el-button size="mini" @click="goBack">返回</el-button>
     </div>
   </div>
 </template>
@@ -385,6 +394,16 @@ export default{
         this.listLoading = 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
+      }
+    },
     goCheckLicenceNoAdd() {
       if (this.addForm.LICENCE_NO) {
         const regex = /^([京津沪渝冀豫云辽黑湘皖鲁新苏浙赣鄂桂甘晋蒙陕吉闽贵粤青藏川宁琼使领A-Z]{1}[A-Z]{1}[A-Z0-9]{4}[A-Z0-9挂学警港澳]{1})$/
@@ -495,8 +514,8 @@ export default{
       })
     },
     goEdit(row){
-      this.addForm.VEHICLE_ID = row.VEHICLE_ID
       this.editDialogVisible = true
+      this.addForm = { ...row };
     },
     editDialogCancelBtn(){
       this.editDialogVisible = false
@@ -521,9 +540,3 @@ export default{
 }
 </script>
 
-<style scoped>
-.bottom-btn-group {
-  margin-top: 20px;
-  text-align: center;
-}
-</style>
diff --git a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
index b02d5ca..221668a 100644
--- a/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
+++ b/src/views/firstLevelDoor/freightVehiclesPort/oprtApplication/components/carList.vue
@@ -4,8 +4,8 @@
       <el-form ref="form" v-model="form">
         <el-row>
           <el-col :span="5">
-            <el-form-item label="车队名称:">
-              <el-input v-model="form.MOTORCADE_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
+            <el-form-item label="车牌号:">
+              <el-input v-model="form.LICENCE_NO" placeholder="搜索" class="filter-item" style="width: 200px;"/>
             </el-form-item>
           </el-col>
           <el-col :span="4">
@@ -38,18 +38,30 @@
       <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 prop="VEHICLE_TYPE" label="车辆类型"/>
+      <el-table-column label="车牌类型" align="center">
+        <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="AUDIT_STATE" label="审核状态" >
         <template slot-scope="{row}">
-                <el-tag v-if="row.IS_AUDIT === '0' || row.IS_AUDIT === null" type="success">待公安审批</el-tag>
-                <el-tag v-if="row.IS_AUDIT === '1'" type="success">待企业审批</el-tag>
-                <el-tag v-if="row.IS_AUDIT === '2'" 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 === '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 === '3'" type="error">审批驳回</el-tag>
         </template>
       </el-table-column>
       <el-table-column label="操作" align="left" width="300">
         <template slot-scope="{row}">
           <el-button v-if="getButton(row)" type="primary" icon="el-icon-edit" size="mini" @click="apply(row)">申请</el-button>
+          <el-button v-if="row.IS_AUDIT === '3'" type="warning" icon="el-icon-edit" size="mini" @click="remark(row)">查看原因</el-button>
+          <el-button v-if="row.IS_AUDIT === '3'" type="primary" icon="el-icon-edit" size="mini" @click="apply(row)">重新申请</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -120,6 +132,26 @@
       <span slot="footer" class="dialog-footer">
     <el-button @click="dialogVisible = false">取 消</el-button>
     <el-button type="primary" @click="submitAudit">确 定</el-button>
+  </span>
+    </el-dialog>
+
+    <el-dialog
+      title="驳回原因"
+      :visible.sync="remarkDialogVisible"
+      width="30%"
+      :before-close="handleRemarkClose">
+      <el-form>
+        <el-form-item label="驳回原因">
+          <el-input
+            v-model="remarkText"
+            type="textarea"
+            :rows="4"
+            readonly>
+          </el-input>
+        </el-form-item>
+      </el-form>
+      <span slot="footer" class="dialog-footer">
+    <el-button @click="remarkDialogVisible = false">关闭</el-button>
   </span>
     </el-dialog>
   </div>
@@ -137,6 +169,8 @@ export default{
         page: 1,
         limit: 10
       },
+      remarkDialogVisible: false, // 控制驳回原因弹窗的显示
+      remarkText: '',
       areaList: [], // 省市县列表
       listLoading: true,
       varList: [],
@@ -207,9 +241,9 @@ export default{
   },
   methods: {
     getButton(row){
-      if (row.IS_DANGEROUS_CAR === '0' && row.IS_AUDIT === '1'){
+      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'){
+      }else if (row.IS_DANGEROUS_CAR === '1' && row.IS_AUDIT === '0' && row.GA_AUDITOR == null){
         return true
       }else {
         return false
@@ -220,18 +254,26 @@ export default{
       this.$refs.multipleTable.clearSelection()
       this.getList()
     },
+    remark(row) {
+      this.remarkText = row.QY_REMARK || row.GA_REMARK; // 假设驳回原因存储在 row.REJECT_REASON 中
+      this.remarkDialogVisible = true; // 显示弹窗
+    },
+    handleRemarkClose() {
+      this.remarkDialogVisible = 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
+      }
+    },
     // 重置
     reset() {
-      this.form = {
-        USER_NAME: '',
-        PHONE: '',
-        ID_CARD: '',
-        CORPINFO_NAME: '',
-        DEPARTMENT_NAME: '',
-        VISIT_START_TIME: '',
-        VISIT_END_TIME: '',
-        DOOR_NAME: ''
-      }
+      this.form.LICENCE_NO = ''
       this.getList()
     },
     // 获取列表
diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
index 596870e..ca39520 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/components/list.vue
@@ -19,7 +19,7 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item v-show="roleName !== '普通用户角色'" label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
+          <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID">
             <SelectTree
               ref="selectTree_Search2"
               :clearable="false"
@@ -30,10 +30,21 @@
           </el-form-item>
         </el-col>
         <el-col :span="3">
-          <el-form-item v-show="roleName !== '普通用户角色'" label="车辆责任人">
+          <el-form-item label="车辆责任人">
             <el-input v-model="searchFrom.USER_NAME" placeholder="请输入车辆责任人..." />
           </el-form-item>
         </el-col>
+        <el-col :span="3">
+          <el-form-item label="审核状态" prop="IS_AUDIT">
+            <SelectTree
+              ref="selectTree_Search3"
+              :clearable="false"
+              :options="auditTypeList"
+              :props="vehicleDefaultProps"
+              v-model="searchFrom.IS_AUDIT"
+              placeholder="请选择车辆所属部门"/>
+          </el-form-item>
+        </el-col>
         <el-col :span="4">
           <el-form-item label-width="10px">
             <el-button v-waves type="primary" icon="el-icon-search" @click="getQuery">
@@ -79,9 +90,16 @@
       </el-table-column>
       <el-table-column prop="DEPT_NAME" label="车辆所属部门" align="center" />
       <el-table-column prop="U_NAME" label="车辆责任人" align="center"/>
-      <el-table-column label="操作" align="center" width="480">
+      <el-table-column prop="VISIT_START_TIME" label="访问起始时间" align="center"/>
+      <el-table-column prop="VISIT_END_TIME" label="访问结束时间" align="center"/>
+      <el-table-column label="审核状态" align="center">
         <template slot-scope="{row}">
-          <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+          {{ getAuditType(row.IS_AUDIT) }}
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" align="center" width="400">
+        <template slot-scope="{row}">
+          <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
         </template>
       </el-table-column>
     </el-table>
@@ -119,17 +137,15 @@
             style="width: 300px"/>
         </el-form-item>
         <el-form-item label="车辆所属部门">
-          <el-select
+          <SelectTree
+            ref="selectTree_add1"
+            :clearable="false"
+            :options="departmentTreeData"
+            :props="defaultProps"
             v-model="addForm.DEPARTMENT_ID"
-            placeholder="请选择部门"
-            @change="handleCorpChange">
-            <el-option
-              v-for="dept in departmentTreeData"
-              :key="dept.DEPARTMENT_ID"
-              :label="dept.NAME"
-              :value="dept.DEPARTMENT_ID">
-            </el-option>
-          </el-select>
+            placeholder="请选择车辆所属部门"
+            style="width: 300px"
+            @change="handleCorpChange"/>
         </el-form-item>
         <el-form-item label="负责人">
           <el-select
@@ -143,6 +159,20 @@
             </el-option>
           </el-select>
         </el-form-item>
+        <el-form-item label="访问起始时间">
+          <el-date-picker
+            v-model="addForm.VISIT_START_TIME"
+            type="datetime"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
+        <el-form-item label="访问结束时间">
+          <el-date-picker
+            v-model="addForm.VISIT_END_TIME"
+            type="datetime"
+            placeholder="选择日期时间">
+          </el-date-picker>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="addDialogCancelBtn">取 消</el-button>
@@ -186,6 +216,11 @@ export default {
       total: 0,
       KEYWORDS: '',
       // 车牌类型列表
+      auditTypeList: [
+        { ID: '1', NAME: '待审核' },
+        { ID: '2', NAME: '已审核' },
+        { ID: '3', NAME: '审核驳回' }
+      ],
       licenceTypeList: [
         // { ID: '', NAME: '请选择' },
         { ID: '0', NAME: '白牌' },
@@ -221,6 +256,7 @@ export default {
       varList: [],
       // 查询表单的数据
       searchFrom: {
+        IS_AUDIT: '',
         VEHICLE_ID: '', // 车辆ID(基础属性)
         LICENCE_NO: '', // 车牌号
         VEHICLE_TYPE: '', // 车辆类型
@@ -238,7 +274,9 @@ export default {
         EMPLOYEE_VEHICLE_USER_NAME: '', // 车辆所属人姓名
         DEPARTMENT_NAME: '', // 部门名称
         DEPARTMENT_ID: '',
-        USER_NAME: '' // 车辆责任人姓名
+        USER_NAME: '', // 车辆责任人姓名
+        VISIT_START_TIME: '',
+        VISIT_END_TIME: ''
       },
       // 修改表单的数据
       editForm: {
@@ -280,6 +318,15 @@ export default {
     this.getPageList() // 获取分页列表要展示的数据
   },
   methods: {
+    getAuditType(IS_AUDIT){
+      if (IS_AUDIT === '2'){
+        return '已审核'
+      }else if (IS_AUDIT === '1'){
+        return '待审核'
+      }else if (IS_AUDIT === '3'){
+        return '审核驳回'
+      }
+    },
     getRowKey(row) {
       return row.VEHICLE_ID
     },
@@ -326,8 +373,7 @@ export default {
         '/mkmj/management/getXgfCarList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
           ...this.searchFrom,
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
-          IS_AUDIT: 1
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
         }
       ).then((data) => {
         this.listLoading = false
@@ -362,18 +408,19 @@ export default {
     // 获得部门树
     getDepartmentTreeData() {
       requestFN(
-        '/mkmj/management/getDeptList',
+        '/department/listzTree',
         {
           CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
         }
       ).then((data) => {
-        this.departmentTreeData = data.deptList
+        this.departmentTreeData = JSON.parse(data.zTreeNodes)
       }).catch((e) => {
       })
     },
     handleCorpChange(deptId) {
       // 根据选择的公司ID获取审核人列表
       this.getUserList(deptId);
+
     },
     getUserList(deptId){
       requestFN(
@@ -450,6 +497,8 @@ export default {
           LICENCE_NO: this.addForm.LICENCE_NO,
           LICENCE_TYPE: this.addForm.LICENCE_TYPE,
           VEHICLE_TYPE: this.addForm.VEHICLE_TYPE,
+          VISIT_START_TIME: this.addForm.VISIT_START_TIME,
+          VISIT_END_TIME: this.addForm.VISIT_END_TIME,
           CAR_FROM: '2'
         }
       ).then((data) => {
diff --git a/src/views/firstLevelDoor/longCarPort/CarInfo/components/record.vue b/src/views/firstLevelDoor/longCarPort/CarInfo/components/record.vue
index 4095573..77e4cf5 100644
--- a/src/views/firstLevelDoor/longCarPort/CarInfo/components/record.vue
+++ b/src/views/firstLevelDoor/longCarPort/CarInfo/components/record.vue
@@ -58,16 +58,11 @@
       <el-table-column prop="AREA_NAME" label="口门名称" width="100px" align="center"/>
       <el-table-column prop="AREA_LEVEL_NAME" label="口门级别" width="100px" align="center"/>
       <el-table-column prop="vehicle_plate_number" label="车牌号" width="100px" align="center"/>
-      <!--      <el-table-column prop="vehicle_category_name" label="车辆类型" width="150px" align="center"/>-->
       <el-table-column prop="VEHICLE_TYPE_NAME" label="车辆类型" width="150px" align="center"/>
-      <!--      <el-table-column prop="vehicle_filing_method" label="车辆所属类型" width="100px" align="center"/>-->
       <el-table-column prop="VEHICLE_BELONG_TYPE_NAME" label="车辆所属类型" width="100px" align="center"/>
       <el-table-column prop="vehicle_arrival_status" label="车辆在港状态" width="100px" align="center"/>
       <el-table-column prop="VEHICLE_DEPARTMENT_NAME" label="车辆所属部门" align="center"/>
-      <!--      <el-table-column prop="vehicle_filing_info_recording_org" label="车辆所属部门" align="center"/>-->
       <el-table-column prop="USER_NAME" label="车辆责任人" width="150ox" align="center"/>
-      <!--      <el-table-column prop="vehicle_contact_name" label="车辆联系人" width="150ox" align="center"/>-->
-      <!--      <el-table-column prop="vehicle_contact_phone_number" label="联系人手机号" width="120px" align="center"/>-->
       <el-table-column prop="vehicle_arrival_barrier" label="入港闸口" align="center"/>
       <el-table-column prop="vehicle_arrival_time" label="入港时间" align="center"/>
       <el-table-column prop="vehicle_departure_barrier" label="离港闸口" align="center"/>
diff --git a/src/views/firstLevelDoor/personPortInfo/PersonInfo/components/list.vue b/src/views/firstLevelDoor/personPortInfo/PersonInfo/components/list.vue
index 81a10e8..a7d84cc 100644
--- a/src/views/firstLevelDoor/personPortInfo/PersonInfo/components/list.vue
+++ b/src/views/firstLevelDoor/personPortInfo/PersonInfo/components/list.vue
@@ -3,25 +3,13 @@
     <div class="filter-container">
       <el-form ref="form" v-model="form">
         <el-col :span="5">
-          <el-form-item label="人员名称:">
-            <el-input v-model="form.USER_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="5">
-          <el-form-item label="企业名称:">
-            <el-input v-model="form.CORPINFO_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
+          <el-form-item label="姓名:">
+            <el-input v-model="form.USER_NAME" placeholder="请输入人员名称" class="filter-item" style="width: 200px;"/>
           </el-form-item>
         </el-col>
         <el-col :span="5">
           <el-form-item label="部门名称:">
-            <el-input v-model="form.DEPARTMENT_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
-          </el-form-item>
-        </el-col>
-        <el-col :span="4">
-          <el-form-item label="用户类型">
-            <el-select v-model="form.USER_TYPE" placeholder="请选择" style="width: 100%;">
-              <el-option v-for="item in typeList" :key="item.ID" :label="item.NAME" :value="item.ID" />
-            </el-select>
+            <el-input v-model="form.DEPARTMENT_NAME" placeholder="请输入部门名称" class="filter-item" style="width: 200px;"/>
           </el-form-item>
         </el-col>
         <el-col :span="4">
@@ -52,13 +40,12 @@
       <el-table-column type="index" label="序号" width="50" align="center" />
       <el-table-column prop="NAME" label="姓名"/>
       <el-table-column prop="USERNAME" label="手机号"/>
-      <el-table-column prop="BELONG_TO_CORP_NAME" label="企业名称"/>
       <el-table-column prop="DEPARTMENT_NAME" label="部门名称"/>
       <el-table-column prop="VALIDITY_PERIOD_START" label="培训有效期开始时间"/>
       <el-table-column prop="VALIDITY_PERIOD_END" label="培训有效期结束时间"/>
-      <el-table-column label="操作" align="left" width="110">
+      <el-table-column label="操作" align="left" width="200">
         <template slot-scope="{row}">
-          <el-button 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>
         </template>
       </el-table-column>
     </el-table>
@@ -146,7 +133,10 @@ export default{
       requestFN(
         '/mkmj/management/personPortInfoList?showCount=' + this.listQuery.limit + '&currentPage=' + this.listQuery.page,
         {
-          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
+          CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID,
+          NAME: this.form.USER_NAME,
+          CORPINFO_NAME: this.form.CORPINFO_NAME,
+          DEPARTMENT_NAME: this.form.DEPARTMENT_NAME
         }
       ).then((data) => {
         console.log(data)