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

# Conflicts:
#	src/views/longtermvehicleinputportmessage/auditChronicallyCar/components/sendUtil.vue

src/views/truckinputportmanage/dangertruckcheck/components/list.vue

@@ -54,7 +54,7 @@
           {{ getType(row.IS_AUDIT) }}
         </template>
       </el-table-column>
-      <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="detail(row)">详情</el-button>
           <el-button v-if="row.IS_AUDIT === '1'" type="success" icon="el-icon-view" size="mini" @click="approve(row)">审核</el-button>
@@ -206,16 +206,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()
     },
     // 获取列表

src/views/truckinputportmanage/normaltruckcheck/components/list.vue

@@ -201,16 +201,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()
     },
     // 获取列表