From 7c2297f4d9c0844987609c6fc6dff3c63612d838 Mon Sep 17 00:00:00 2001
From: huangyuxuan <huangyuxuan@zcloudchina.com>
Date: Mon, 20 Jan 2025 11:42:10 +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=E9=97=A8?=
=?UTF-8?q?=E5=8F=A3=E9=97=A8=E7=A6=81bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../carInfoManagement/components/corpList.vue | 8 +++----
.../filingAudit/components/list.vue | 8 ++++---
.../publicAuidt/components/list.vue | 11 +--------
.../components/peopleRecordList.vue | 6 ++---
.../jgCarMessage/components/List.vue | 6 ++---
.../jgCarMessage/components/car_view.vue | 24 +++++++++----------
.../vehiclemessage/components/index_view.vue | 13 +---------
.../xgfCarMessage/components/List.vue | 8 +++----
.../xgfCarMessage/components/car_view.vue | 8 +++----
.../zgCarMessage/components/List.vue | 8 +++----
.../jgPerson/components/list.vue | 13 +++-------
.../jgPerson/components/recordsList.vue | 2 +-
.../qyPerson/components/list.vue | 13 +++-------
.../qyPerson/components/recordsList.vue | 2 +-
.../xgfPerson/components/list.vue | 13 +++-------
.../xgfPerson/components/recordsList.vue | 2 +-
.../zgPerson/components/list.vue | 13 +++-------
.../zgPerson/components/recordsList.vue | 2 +-
18 files changed, 57 insertions(+), 103 deletions(-)
diff --git a/src/views/freightVehicles/carInfoManagement/components/corpList.vue b/src/views/freightVehicles/carInfoManagement/components/corpList.vue
index 57a5fa0..08509a7 100644
--- a/src/views/freightVehicles/carInfoManagement/components/corpList.vue
+++ b/src/views/freightVehicles/carInfoManagement/components/corpList.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form label-width="90px">
+ <el-form label-width="130px">
<el-row>
<el-col :span="4">
- <el-form-item label="分公司名称">
- <el-input v-model="searchForm.CORP_NAME" placeholder="分公司名称"/>
+ <el-form-item label="相关方单位名称">
+ <el-input v-model="searchForm.CORP_NAME" placeholder="相关方单位名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -34,7 +34,7 @@
highlight-current-row
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="CORP_NAME" label="分公司名称" />
+ <el-table-column prop="CORP_NAME" label="相关方单位名称" />
<el-table-column prop="SOCIAL_CODE" label="统一社会信用代码" />
<el-table-column prop="COMPANY_AREA" label="所属地区" />
<el-table-column label="企业状态" align="center">
diff --git a/src/views/freightVehicles/filingAudit/components/list.vue b/src/views/freightVehicles/filingAudit/components/list.vue
index ffd495d..5fb5aa9 100644
--- a/src/views/freightVehicles/filingAudit/components/list.vue
+++ b/src/views/freightVehicles/filingAudit/components/list.vue
@@ -5,7 +5,7 @@
<el-row>
<el-col :span="5">
<el-form-item label="车队名称:">
- <el-input v-model="form.LICENCE_NO" placeholder="搜索" class="filter-item" style="width: 200px;"/>
+ <el-input v-model="form.MOTORCADE_NAME" placeholder="搜索" class="filter-item" style="width: 200px;"/>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -37,6 +37,7 @@
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center"/>
<el-table-column prop="MOTORCADE_NAME" label="车队名称"/>
+ <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称"/>
<el-table-column label="审核状态" align="center" width="120">
<template slot-scope="{row}">
{{ getType(row.IS_AUDIT) }}
@@ -144,6 +145,7 @@ export default {
VISIT_START_TIME: '',
VISIT_END_TIME: '',
DOOR_NAME: '',
+ MOTORACDE_NAME: '',
IS_DANGEROUS_CAR: '1',
CORPINFO_ID: JSON.parse(sessionStorage.getItem('user')).CORPINFO_ID
}
@@ -173,9 +175,9 @@ export default {
this.$refs.sendUtil.init(row)
},
getType(AUDIT_TYPE) {
- if (AUDIT_TYPE === '0' || AUDIT_TYPE == null) {
+ if (AUDIT_TYPE === '0' || AUDIT_TYPE == null || AUDIT_TYPE === '') {
return '待审核'
- } else if (AUDIT_TYPE === '1') {
+ } else if (AUDIT_TYPE === '1' || AUDIT_TYPE === '2') {
return '审核通过'
}
},
diff --git a/src/views/freightVehicles/publicAuidt/components/list.vue b/src/views/freightVehicles/publicAuidt/components/list.vue
index fe99b48..8f87b6a 100644
--- a/src/views/freightVehicles/publicAuidt/components/list.vue
+++ b/src/views/freightVehicles/publicAuidt/components/list.vue
@@ -213,16 +213,7 @@ export default{
},
// 重置
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/gatemachine/primarygatemanager/peoplerecord/components/peopleRecordList.vue b/src/views/gatemachine/primarygatemanager/peoplerecord/components/peopleRecordList.vue
index e894d7f..927b273 100644
--- a/src/views/gatemachine/primarygatemanager/peoplerecord/components/peopleRecordList.vue
+++ b/src/views/gatemachine/primarygatemanager/peoplerecord/components/peopleRecordList.vue
@@ -53,7 +53,7 @@
<el-table-column prop="cardNumber" label="卡号" width="100px" align="center"/>
<el-table-column prop="personCode" label="用户编号" width="100px" align="center"/>
<el-table-column prop="openType" label="验证方式" width="150px" align="center"/>
- <el-table-column prop="reportTime" label="上报时间" align="center"/>
+ <el-table-column prop="syncTime" label="上报时间" align="center"/>
</el-table>
<div class="page-btn-group">
<pagination
@@ -106,7 +106,7 @@ export default {
getRowKey(row) {
return row.id_sequence
},
-
+
getQuery() {
this.getList()
// this.hasButton()
@@ -125,7 +125,7 @@ export default {
requestFN(
'/mkmjGateLog/peoplePage?showCount=' + this.listQuery.limit + '¤tPage=' + this.listQuery.page,
{
- ...this.searchForm
+ ...this.searchForm
}
).then((data) => {
this.listLoading = false
diff --git a/src/views/longtermvehicle/jgCarMessage/components/List.vue b/src/views/longtermvehicle/jgCarMessage/components/List.vue
index 6481542..435410d 100644
--- a/src/views/longtermvehicle/jgCarMessage/components/List.vue
+++ b/src/views/longtermvehicle/jgCarMessage/components/List.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form label-width="90px">
+ <el-form label-width="130px">
<el-row>
<el-col :span="4">
- <el-form-item label="分公司名称">
- <el-input v-model="searchForm.CORP_NAME" placeholder="分公司名称"/>
+ <el-form-item label="股份公司部门名称">
+ <el-input v-model="searchForm.DEPARTMENT_NAME" placeholder="股份公司部门名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
diff --git a/src/views/longtermvehicle/jgCarMessage/components/car_view.vue b/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
index b8f0d4e..d325e8a 100644
--- a/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/jgCarMessage/components/car_view.vue
@@ -1,18 +1,18 @@
<template>
<div class="icons-container">
<el-container>
- <el-aside width="200px" style="background-color:#fff">
- <div class="filter-btn-group">
- <el-tree
- v-loading="treeLoading"
- ref="tree"
- :data="treeData"
- :props="defaultProps"
- :filter-node-method="filterNode"
- class="filter-tree"
- @node-click="handleNodeClick"/>
- </div>
- </el-aside>
+<!-- <el-aside width="200px" style="background-color:#fff">-->
+<!-- <div class="filter-btn-group">-->
+<!-- <el-tree-->
+<!-- v-loading="treeLoading"-->
+<!-- ref="tree"-->
+<!-- :data="treeData"-->
+<!-- :props="defaultProps"-->
+<!-- :filter-node-method="filterNode"-->
+<!-- class="filter-tree"-->
+<!-- @node-click="handleNodeClick"/>-->
+<!-- </div>-->
+<!-- </el-aside>-->
<el-main>
<el-form label-width="60px">
<el-row>
diff --git a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
index 3d67dbd..dfbbc1c 100644
--- a/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
+++ b/src/views/longtermvehicle/vehiclemessage/components/index_view.vue
@@ -37,17 +37,6 @@
placeholder="请选择车辆类型"/>
</el-form-item>
</el-col>
- <el-col :span="4" class="m-l-10">
- <el-form-item label="车辆所属部门" prop="VEHICLE_DEPARTMENT_ID" label-width="100px">
- <SelectTree
- ref="selectTree_Search2"
- :clearable="false"
- :options="treeData"
- :props="defaultProps"
- v-model="searchForm.VEHICLE_DEPARTMENT_ID"
- placeholder="请选择车辆所属部门"/>
- </el-form-item>
- </el-col>
<el-col :span="4" class="m-l-10">
<el-form-item label="车辆责任人" label-width="100px">
<el-input v-model="searchForm.USER_NAME" placeholder="请输入车辆责任人..." />
@@ -101,7 +90,7 @@
<el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
<el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}">
- <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+ <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
<el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)">修改</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">删除</el-button>
diff --git a/src/views/longtermvehicle/xgfCarMessage/components/List.vue b/src/views/longtermvehicle/xgfCarMessage/components/List.vue
index b175851..ca14c4d 100644
--- a/src/views/longtermvehicle/xgfCarMessage/components/List.vue
+++ b/src/views/longtermvehicle/xgfCarMessage/components/List.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form label-width="90px">
+ <el-form label-width="130px">
<el-row>
<el-col :span="4">
- <el-form-item label="分公司名称">
- <el-input v-model="searchForm.CORP_NAME" placeholder="分公司名称"/>
+ <el-form-item label="相关方单位名称">
+ <el-input v-model="searchForm.CORP_NAME" placeholder="相关方单位名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -34,7 +34,7 @@
highlight-current-row
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="CORP_NAME" label="分公司名称" />
+ <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="企业状态">
diff --git a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
index 68190ab..bffe6b7 100644
--- a/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
+++ b/src/views/longtermvehicle/xgfCarMessage/components/car_view.vue
@@ -85,7 +85,7 @@
width="55"
align="center"/>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="CORPINFO_NAME" label="分公司名称" align="center" />
+ <el-table-column prop="RELEVANT_UNIT_NAME" label="相关方单位名称" align="center" />
<el-table-column prop="LICENCE_NO" label="车牌号" align="center" />
<el-table-column label="车牌类型" align="center">
<template slot-scope="{row}">
@@ -97,11 +97,11 @@
{{ translateVehicleType(row.VEHICLE_TYPE) }}
</template>
</el-table-column>
- <el-table-column prop="DEPARTMENT_NAME" label="车辆所属部门" align="center" />
+ <el-table-column prop="XGF_DEPT_NAME" label="车辆所属部门" align="center" />
<el-table-column prop="USER_NAME" label="车辆责任人" align="center"/>
<el-table-column label="操作" align="center" width="480">
<template slot-scope="{row}">
- <el-button type="warning" icon="el-icon-more" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
+ <el-button type="warning" size="mini" @click="vehicleInOutRecordBtn(row.LICENCE_NO)">车辆进出记录</el-button>
<el-button icon="el-icon-view" size="mini" @click="showDetail(row.VEHICLE_ID)">查看</el-button>
<el-button type="primary" icon="el-icon-edit" size="mini" @click="openEditDialogEditBtn(row.VEHICLE_ID)">修改</el-button>
<el-button type="danger" icon="el-icon-delete" size="mini" @click="deleteSingleDataDeleteBtn(row.VEHICLE_ID, row.USER_ID, row.EMPLOYEE_VEHICLE_USER_ID)">删除</el-button>
@@ -396,7 +396,7 @@ export default {
},
updateBranchName(ID) {
requestFN(
- '/department/listTreeCorpInfo',
+ '/xgf/department/listzTree',
// '/department/listTree',
{
CORPINFO_ID: ID
diff --git a/src/views/longtermvehicle/zgCarMessage/components/List.vue b/src/views/longtermvehicle/zgCarMessage/components/List.vue
index 46809bd..cdab68e 100644
--- a/src/views/longtermvehicle/zgCarMessage/components/List.vue
+++ b/src/views/longtermvehicle/zgCarMessage/components/List.vue
@@ -1,10 +1,10 @@
<template>
<div class="app-container">
- <el-form label-width="90px">
+ <el-form label-width="130px">
<el-row>
<el-col :span="4">
- <el-form-item label="分公司名称">
- <el-input v-model="searchForm.CORP_NAME" placeholder="分公司名称"/>
+ <el-form-item label="驻港单位名称">
+ <el-input v-model="searchForm.CORP_NAME" placeholder="驻港单位名称"/>
</el-form-item>
</el-col>
<el-col :span="4">
@@ -34,7 +34,7 @@
highlight-current-row
>
<el-table-column type="index" label="序号" width="50" align="center" />
- <el-table-column prop="CORP_NAME" label="分公司名称" />
+ <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="企业状态">
diff --git a/src/views/mkmjManagement/jgPerson/components/list.vue b/src/views/mkmjManagement/jgPerson/components/list.vue
index 16e4f79..7f35e5f 100644
--- a/src/views/mkmjManagement/jgPerson/components/list.vue
+++ b/src/views/mkmjManagement/jgPerson/components/list.vue
@@ -124,16 +124,9 @@ export default{
},
// 重置
reset() {
- this.form = {
- USER_NAME: '',
- PHONE: '',
- ID_CARD: '',
- CORPINFO_NAME: '',
- DEPARTMENT_NAME: '',
- VISIT_START_TIME: '',
- VISIT_END_TIME: '',
- DOOR_NAME: ''
- }
+ this.form.USER_NAME = ''
+ this.form.CORPINFO_NAME = ''
+ this.form.DEPARTMENT_NAME = ''
this.getList()
},
// 获取列表
diff --git a/src/views/mkmjManagement/jgPerson/components/recordsList.vue b/src/views/mkmjManagement/jgPerson/components/recordsList.vue
index 224e96a..24a42ca 100644
--- a/src/views/mkmjManagement/jgPerson/components/recordsList.vue
+++ b/src/views/mkmjManagement/jgPerson/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="reportTime" label="上报时间"/>
+ <el-table-column prop="syncTime" label="上报时间"/>
</el-table>
<div class="page-btn-group">
<div/><div/>
diff --git a/src/views/mkmjManagement/qyPerson/components/list.vue b/src/views/mkmjManagement/qyPerson/components/list.vue
index a71a42b..6ed1623 100644
--- a/src/views/mkmjManagement/qyPerson/components/list.vue
+++ b/src/views/mkmjManagement/qyPerson/components/list.vue
@@ -124,16 +124,9 @@ export default{
},
// 重置
reset() {
- this.form = {
- USER_NAME: '',
- PHONE: '',
- ID_CARD: '',
- CORPINFO_NAME: '',
- DEPARTMENT_NAME: '',
- VISIT_START_TIME: '',
- VISIT_END_TIME: '',
- DOOR_NAME: ''
- }
+ this.form.USER_NAME = ''
+ this.form.CORPINFO_NAME = ''
+ this.form.DEPARTMENT_NAME = ''
this.getList()
},
// 获取列表
diff --git a/src/views/mkmjManagement/qyPerson/components/recordsList.vue b/src/views/mkmjManagement/qyPerson/components/recordsList.vue
index 224e96a..24a42ca 100644
--- a/src/views/mkmjManagement/qyPerson/components/recordsList.vue
+++ b/src/views/mkmjManagement/qyPerson/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="reportTime" label="上报时间"/>
+ <el-table-column prop="syncTime" label="上报时间"/>
</el-table>
<div class="page-btn-group">
<div/><div/>
diff --git a/src/views/mkmjManagement/xgfPerson/components/list.vue b/src/views/mkmjManagement/xgfPerson/components/list.vue
index bc36508..1372c5c 100644
--- a/src/views/mkmjManagement/xgfPerson/components/list.vue
+++ b/src/views/mkmjManagement/xgfPerson/components/list.vue
@@ -124,16 +124,9 @@ export default{
},
// 重置
reset() {
- this.form = {
- USER_NAME: '',
- PHONE: '',
- ID_CARD: '',
- CORPINFO_NAME: '',
- DEPARTMENT_NAME: '',
- VISIT_START_TIME: '',
- VISIT_END_TIME: '',
- DOOR_NAME: ''
- }
+ this.form.USER_NAME = ''
+ this.form.CORPINFO_NAME = ''
+ this.form.DEPARTMENT_NAME = ''
this.getList()
},
// 获取列表
diff --git a/src/views/mkmjManagement/xgfPerson/components/recordsList.vue b/src/views/mkmjManagement/xgfPerson/components/recordsList.vue
index 224e96a..24a42ca 100644
--- a/src/views/mkmjManagement/xgfPerson/components/recordsList.vue
+++ b/src/views/mkmjManagement/xgfPerson/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="reportTime" label="上报时间"/>
+ <el-table-column prop="syncTime" label="上报时间"/>
</el-table>
<div class="page-btn-group">
<div/><div/>
diff --git a/src/views/mkmjManagement/zgPerson/components/list.vue b/src/views/mkmjManagement/zgPerson/components/list.vue
index 754c1d3..9f6e78d 100644
--- a/src/views/mkmjManagement/zgPerson/components/list.vue
+++ b/src/views/mkmjManagement/zgPerson/components/list.vue
@@ -124,16 +124,9 @@ export default{
},
// 重置
reset() {
- this.form = {
- USER_NAME: '',
- PHONE: '',
- ID_CARD: '',
- CORPINFO_NAME: '',
- DEPARTMENT_NAME: '',
- VISIT_START_TIME: '',
- VISIT_END_TIME: '',
- DOOR_NAME: ''
- }
+ this.form.USER_NAME = ''
+ this.form.CORPINFO_NAME = ''
+ this.form.DEPARTMENT_NAME = ''
this.getList()
},
// 获取列表
diff --git a/src/views/mkmjManagement/zgPerson/components/recordsList.vue b/src/views/mkmjManagement/zgPerson/components/recordsList.vue
index 224e96a..24a42ca 100644
--- a/src/views/mkmjManagement/zgPerson/components/recordsList.vue
+++ b/src/views/mkmjManagement/zgPerson/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="reportTime" label="上报时间"/>
+ <el-table-column prop="syncTime" label="上报时间"/>
</el-table>
<div class="page-btn-group">
<div/><div/>