From e80fb1e51d652d0ccecc27688c72a168c8297075 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期四, 27 二月 2025 17:12:41 +0800
Subject: [PATCH] 表格优化lll
---
admin/src/views/system/permission.vue | 2
pda/utils/service.js | 2
admin/src/views/business/deviceBroadcast.vue | 2
admin/src/views/business/deviceLed.vue | 117 +-
admin/src/views/business/reportRecord.vue | 130 +--
admin/src/views/operation/danger/typeSet.vue | 8
admin/src/views/business/empower.vue | 8
admin/src/views/business/visits.vue | 77 +
admin/src/views/business/strandedPersonnel.vue | 8
admin/src/views/operation/danger/areaSet.vue | 8
admin/src/views/business/retention.vue | 72 +
admin/src/views/platform/gas.vue | 2
h5/pages/staff/task/visitorApprove.vue | 2
admin/src/views/vehicle/cars.vue | 95 +-
admin/src/views/vehicle/visitPark.vue | 128 +-
admin/src/views/platform/smokebox.vue | 2
admin/src/views/business/platformEvent.vue | 186 ++--
admin/src/views/system/user.vue | 8
admin/src/views/vehicle/parkBook.vue | 4
admin/src/views/platform/water.vue | 2
admin/src/layouts/AppLayout.vue | 2
admin/src/views/business/carEvent.vue | 92 +-
admin/src/views/business/blackmailPersonnel.vue | 8
admin/src/views/business/freezePersonnel.vue | 2
h5/pages/login/login.vue | 2
admin/src/views/platform/platform.vue | 45
admin/src/views/meeting/rooms.vue | 4
admin/src/views/operation/serviceCar/driverConfig.vue | 6
admin/src/views/business/tmsFactoryParam.vue | 2
h5/pages/visitorApplication/visitorApplication.vue | 39
admin/src/views/business/visitorManagement.vue | 12
admin/src/views/business/device.vue | 157 ++--
admin/src/views/business/internalCompany.vue | 145 +-
admin/src/views/business/platformBroadcastLog.vue | 169 ++--
admin/src/views/business/relativeMember.vue | 140 +-
admin/src/views/system/role.vue | 12
admin/src/components/base/BaseTable.vue | 3
admin/src/views/business/internalMember.vue | 130 +-
admin/src/views/operation/serviceCar/apprRecord.vue | 291 ++-----
admin/src/views/business/deviceEvent.vue | 90 +-
admin/src/views/operation/danger/record.vue | 6
admin/src/views/platform/oil.vue | 2
42 files changed, 1,080 insertions(+), 1,142 deletions(-)
diff --git a/admin/src/components/base/BaseTable.vue b/admin/src/components/base/BaseTable.vue
index 5b96868..e5d5f9d 100644
--- a/admin/src/components/base/BaseTable.vue
+++ b/admin/src/components/base/BaseTable.vue
@@ -39,7 +39,8 @@
pageSize: 10,
total: 0
}
- }
+ },
+ tableHeight: 400
}
},
methods: {
diff --git a/admin/src/layouts/AppLayout.vue b/admin/src/layouts/AppLayout.vue
index 837c9bb..857b53a 100644
--- a/admin/src/layouts/AppLayout.vue
+++ b/admin/src/layouts/AppLayout.vue
@@ -103,7 +103,7 @@
& > main {
height: 100%;
box-sizing: border-box;
- overflow-y: auto;
+ /* overflow-y: auto; */
}
}
}
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 5093b78..9e4fe7e 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -41,9 +41,9 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="idcardDecode" label="韬唤璇佸彿鐮�" min-width="100px"></el-table-column>
+ <el-table-column prop="idcardDecode" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="140px"></el-table-column>
<el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.type === 0">鍔冲姟璁垮</span>
@@ -51,8 +51,8 @@
<span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>
</el-table-column>
- <el-table-column prop="visitCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
- <el-table-column prop="optRemark" label="鎿嶄綔淇℃伅" min-width="300px"></el-table-column>
+ <el-table-column prop="visitCompanyName" label="缁勭粐" show-overflow-tooltip min-width="200px"></el-table-column>
+ <el-table-column prop="optRemark" label="鎿嶄綔淇℃伅" show-overflow-tooltip min-width="200px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index a14baf4..ca1c76e 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -1,46 +1,49 @@
<template>
<TableLayout :permissions="['business:carevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="杞︾墝鍙�" prop="plateNos">
- <el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
- <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
- <el-select v-model="searchForm.queryUserType" clearable placeholder="璇烽�夋嫨">
- <el-option label="璁垮" value="0"></el-option>
- <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
- <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="鍏ュ満鍘嬬嚎浜嬩欢" value="771760130"></el-option>
- <el-option label="鍏ュ満鏀捐浜嬩欢" value="771760131"></el-option>
- <el-option label="鍑哄満鍘嬬嚎浜嬩欢" value="771760133"></el-option>
- <el-option label="鍑哄満鏀捐浜嬩欢" value="771760134"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧峰鏃堕棿" prop="eventType">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="杞︾墝鍙�" prop="plateNos">
+ <el-input v-model="searchForm.plateNos" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
+ <el-select v-model="searchForm.queryUserType" clearable placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="0"></el-option>
+ <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+ <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+ <el-option label="鍏ュ満鍘嬬嚎浜嬩欢" value="771760130"></el-option>
+ <el-option label="鍏ュ満鏀捐浜嬩欢" value="771760131"></el-option>
+ <el-option label="鍑哄満鍘嬬嚎浜嬩欢" value="771760133"></el-option>
+ <el-option label="鍑哄満鏀捐浜嬩欢" value="771760134"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧峰鏃堕棿" prop="eventType">
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:carevent:exportExcel']">
@@ -53,7 +56,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
<el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
@@ -91,7 +94,7 @@
</div>
</template>
</el-table-column>
- <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
</el-table>
<pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
@@ -137,6 +140,11 @@
this.changeRadio('0')
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
reset() {
this.$refs.searchForm.resetFields()
diff --git a/admin/src/views/business/device.vue b/admin/src/views/business/device.vue
index e5d3caa..987f067 100644
--- a/admin/src/views/business/device.vue
+++ b/admin/src/views/business/device.vue
@@ -1,78 +1,70 @@
<template>
- <TableLayout :permissions="['business:device:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="闂ㄧ鐐瑰悕绉�" prop="doorName">
- <el-input v-model="searchForm.doorName" placeholder="璇疯緭鍏ラ棬绂佺偣鍚嶇О" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
- <el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鏄惁鍥尯鍏ュ彛" prop="isEntrance">
- <el-select v-model="searchForm.isEntrance" placeholder="璇烽�夋嫨">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍦ㄧ嚎鐘舵��" prop="online">
- <el-select v-model="searchForm.online" placeholder="璇烽�夋嫨" clearable>
- <el-option label="绂荤嚎" value="0"></el-option>
- <el-option label="鍦ㄧ嚎" value="1"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar">
- <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
- <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
- <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
- <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.online == 0">绂荤嚎</span>
- <span v-if="row.online == 1">鍦ㄧ嚎</span>
- </template>
- </el-table-column>
- <el-table-column prop="ip" label="璁惧ip"></el-table-column>
- <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column label="鏄惁鍥尯鍏ュ彛">
- <template slot-scope="{row}">
- <el-switch
- @change="changeManufature($event, row)"
- v-model="row.isEntrance"
- active-color="#13ce66"
- inactive-color="#ff4949"
- :active-value="1"
- :inactive-value="0">
- </el-switch>
- </template>
- </el-table-column>
- <el-table-column prop="no" width="200px" label="璁惧鍙�"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
-<!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
- </TableLayout>
+ <TableLayout :permissions="['business:device:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="闂ㄧ鐐瑰悕绉�" prop="doorName">
+ <el-input v-model="searchForm.doorName" placeholder="璇疯緭鍏ラ棬绂佺偣鍚嶇О" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鍖哄煙鍚嶇О" prop="regionPathName">
+ <el-input v-model="searchForm.regionPathName" placeholder="璇疯緭鍏ュ尯鍩熷悕绉�"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鏄惁鍥尯鍏ュ彛" prop="isEntrance">
+ <el-select v-model="searchForm.isEntrance" placeholder="璇烽�夋嫨">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍦ㄧ嚎鐘舵��" prop="online">
+ <el-select v-model="searchForm.online" placeholder="璇烽�夋嫨" clearable>
+ <el-option label="绂荤嚎" value="0"></el-option>
+ <el-option label="鍦ㄧ嚎" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope">{{ scope.$index + 1
+ }}</template></el-table-column>
+ <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
+ <el-table-column prop="doorName" label="闂ㄧ鐐瑰悕绉�"></el-table-column>
+ <el-table-column prop="regionPathName" label="鍖哄煙鍚嶇О"></el-table-column>
+ <el-table-column prop="doorNo" label="闂ㄧ鐐圭紪鍙�"></el-table-column>
+ <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
+ <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
+ <template slot-scope="{row}">
+ <span v-if="row.online == 0">绂荤嚎</span>
+ <span v-if="row.online == 1">鍦ㄧ嚎</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ip" label="璁惧ip"></el-table-column>
+ <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
+ <el-table-column label="鏄惁鍥尯鍏ュ彛">
+ <template slot-scope="{row}">
+ <el-switch @change="changeManufature($event, row)" v-model="row.isEntrance" active-color="#13ce66"
+ inactive-color="#ff4949" :active-value="1" :inactive-value="0">
+ </el-switch>
+ </template>
+ </el-table-column>
+ <el-table-column prop="no" width="200px" label="璁惧鍙�"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <!-- <OperaDeviceWindow ref="operaDeviceWindow" @success="handlePageChange"/>-->
+ </TableLayout>
</template>
<script>
@@ -85,7 +77,7 @@
name: 'Device',
extends: BaseTable,
components: { TableLayout, Pagination, OperaDeviceWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -93,12 +85,12 @@
regionPathName: '',
isEntrance: '',
online: '',
- type:0
+ type: 0
},
options: []
}
},
- created () {
+ created() {
this.config({
module: '璁惧淇℃伅琛�',
api: '/business/device',
@@ -107,6 +99,11 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
changeManufature(e, row) {
updateEntranceById({
@@ -114,11 +111,11 @@
isEntrance: e
})
},
- synchronousData () {
+ synchronousData() {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({type:0})
+ syncDevices({ type: 0 })
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
@@ -130,7 +127,7 @@
this.isWorking.delete = false
})
})
- .catch(() => {})
+ .catch(() => { })
}
}
}
diff --git a/admin/src/views/business/deviceBroadcast.vue b/admin/src/views/business/deviceBroadcast.vue
index d40fbe1..1dfd766 100644
--- a/admin/src/views/business/deviceBroadcast.vue
+++ b/admin/src/views/business/deviceBroadcast.vue
@@ -22,7 +22,7 @@
>
<el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
<el-table-column prop="name" label="鍚嶇О"></el-table-column>
- <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑"></el-table-column>
+ <el-table-column prop="hkId" label="骞挎挱鐐瑰敮涓�鏍囪瘑" min-width="200"></el-table-column>
<el-table-column prop="channelInfo" label="骞挎挱鐐圭被鍨�"></el-table-column>
<el-table-column prop="channelNo" label="閫氶亾鍙�"></el-table-column>
<el-table-column prop="regionName" label="鍖哄煙鍚嶇О"></el-table-column>
diff --git a/admin/src/views/business/deviceEvent.vue b/admin/src/views/business/deviceEvent.vue
index 6dd132c..18b6ada 100644
--- a/admin/src/views/business/deviceEvent.vue
+++ b/admin/src/views/business/deviceEvent.vue
@@ -1,47 +1,50 @@
<template>
<TableLayout :permissions="['business:deviceevent:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
- <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <!-- <el-form-item label="浜哄憳绫诲瀷" prop="personType">
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="浜哄憳绫诲瀷" prop="personType">
<el-select v-model="searchForm.personType" placeholder="璇烽�夋嫨">
<el-option label="澶栨潵璁垮" value="1"></el-option>
<el-option label="鍐呴儴浜哄憳" value="2"></el-option>
</el-select>
</el-form-item> -->
- <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
- <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮" value="0"></el-option>
- <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
- <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
- <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
- <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
- <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="eventType">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
+ <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="0"></el-option>
+ <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+ <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="浜嬩欢绫诲瀷" prop="eventType">
+ <el-select v-model="searchForm.eventType" placeholder="璇烽�夋嫨">
+ <el-option label="浜鸿劯璁よ瘉澶辫触" value="197163"></el-option>
+ <el-option label="浜鸿劯璁よ瘉閫氳繃" value="196893"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="eventType">
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:deviceevent:exportExcel']">
@@ -49,7 +52,7 @@
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:deviceevent:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
-->
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
<!-- <el-table-column prop="userType" label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.personType == 0">鍔冲姟璁垮</span>
@@ -58,9 +61,9 @@
<span v-if="row.personType == null">澶栨潵璁垮</span>
</template>
</el-table-column> -->
- <el-table-column prop="personName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="personName" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="personPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="personIdcardDecode" label="璇佷欢鍙�" min-width="140px"></el-table-column>
<el-table-column prop="personCompanyName" label="缁勭粐" min-width="100px"></el-table-column>
<el-table-column label="浜哄憳绫诲瀷" min-width="100px">
<template slot-scope="{ row }">
@@ -69,9 +72,9 @@
<span v-else>璁垮</span>
</template>
</el-table-column>
- <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="happenTime" label="浜嬩欢鏃堕棿" min-width="140px"></el-table-column>
<el-table-column prop="devName" label="闂ㄧ鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="100px"></el-table-column>
+ <el-table-column prop="srcName" label="闂ㄧ鐐�" min-width="110px"></el-table-column>
<el-table-column prop="eventTypeName" label="浜嬩欢绫诲瀷" min-width="100px"></el-table-column>
<el-table-column label="鍑哄叆绫诲瀷" min-width="100px">
<template slot-scope="{row}">
@@ -129,6 +132,11 @@
})
this.changeRadio('0')
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+ })
+ },
methods: {
changeRadio(e) {
if (e === '0') {
diff --git a/admin/src/views/business/deviceLed.vue b/admin/src/views/business/deviceLed.vue
index 4cdd754..8e20baa 100644
--- a/admin/src/views/business/deviceLed.vue
+++ b/admin/src/views/business/deviceLed.vue
@@ -1,58 +1,50 @@
<template>
- <TableLayout :permissions="['business:device:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item title="鍚嶇О" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar">
- <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope" >{{scope.$index+1}}</template></el-table-column>
- <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
- <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
- <el-table-column prop="no" label="璁惧缂栧彿"></el-table-column>
- <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
- <template slot-scope="{row}">
- <span v-if="row.online == 0">绂荤嚎</span>
- <span v-if="row.online == 1">鍦ㄧ嚎</span>
- </template>
- </el-table-column>
- <el-table-column prop="ip" label="璁惧ip"></el-table-column>
- <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
- <el-table-column
- v-if="containPermissions(['business:device:update' ])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaDeviceLedWindow.open('璁剧疆灞忔樉鍐呭', row)" icon="el-icon-edit" v-permissions="['business:device:update']">璁剧疆灞忔樉鍐呭</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaDeviceLedWindow ref="OperaDeviceLedWindow" @success="handlePageChange"/>
- </TableLayout>
+ <TableLayout :permissions="['business:device:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="鍚嶇О" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar">
+ <li><el-button type="primary" @click="synchronousData">鍚屾</el-button></li>
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column label="搴忓彿" width="55" fixed><template slot-scope="scope">{{ scope.$index + 1
+ }}</template></el-table-column>
+ <el-table-column prop="name" label="璁惧鍚嶇О"></el-table-column>
+ <el-table-column prop="manufature" label="鍘傚晢"></el-table-column>
+ <el-table-column prop="no" label="璁惧缂栧彿"></el-table-column>
+ <el-table-column prop="online" label="鍦ㄧ嚎鐘舵��">
+ <template slot-scope="{row}">
+ <span v-if="row.online == 0">绂荤嚎</span>
+ <span v-if="row.online == 1">鍦ㄧ嚎</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="ip" label="璁惧ip"></el-table-column>
+ <el-table-column prop="port" label="璁惧绔彛"></el-table-column>
+ <el-table-column v-if="containPermissions(['business:device:update'])" label="鎿嶄綔" min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="$refs.OperaDeviceLedWindow.open('璁剧疆灞忔樉鍐呭', row)" icon="el-icon-edit"
+ v-permissions="['business:device:update']">璁剧疆灞忔樉鍐呭</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaDeviceLedWindow ref="OperaDeviceLedWindow" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -65,7 +57,7 @@
name: 'Device',
extends: BaseTable,
components: { TableLayout, Pagination, OperaDeviceLedWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -73,12 +65,12 @@
regionPathName: '',
isEntrance: '',
online: '',
- type:2
+ type: 2
},
options: []
}
},
- created () {
+ created() {
this.config({
module: '璁惧淇℃伅琛�',
api: '/business/device',
@@ -87,6 +79,11 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
changeManufature(e, row) {
updateEntranceById({
@@ -94,11 +91,11 @@
isEntrance: e
})
},
- synchronousData () {
+ synchronousData() {
this.$dialog.actionConfirm('鎿嶄綔纭鎻愰啋', '鎮ㄧ‘璁ゅ悓姝ュ叏閮ㄤ俊鎭悧锛�')
.then(() => {
this.isWorking.delete = true
- syncDevices({type:2})
+ syncDevices({ type: 2 })
.then(res => {
this.$tip.apiSuccess(res || '鍚屾鎴愬姛')
this.search()
@@ -110,7 +107,7 @@
this.isWorking.delete = false
})
})
- .catch(() => {})
+ .catch(() => { })
}
}
}
diff --git a/admin/src/views/business/empower.vue b/admin/src/views/business/empower.vue
index bab44d4..de18c1b 100644
--- a/admin/src/views/business/empower.vue
+++ b/admin/src/views/business/empower.vue
@@ -61,10 +61,10 @@
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="memberName" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
- <el-table-column prop="memberidCard" label="韬唤璇佸彿鐮�" min-width="130px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
- <el-table-column prop="deviceName" label="璁惧鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column label="闂ㄧ鏈夋晥鏈�" min-width="170px">
+ <el-table-column prop="memberidCard" show-overflow-tooltip label="韬唤璇佸彿鐮�" min-width="160px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="240px"></el-table-column>
+ <el-table-column prop="deviceName" show-overflow-tooltip label="璁惧鍚嶇О" min-width="150px"></el-table-column>
+ <el-table-column label="闂ㄧ鏈夋晥鏈�" show-overflow-tooltip min-width="170px">
<template slot-scope="{row}">
<span v-if="!row.startTime || !row.endTime">闀挎湡</span>
<div v-else>
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index aea6fe8..c553700 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -37,7 +37,7 @@
>
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="閮ㄩ棬" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="閮ㄩ棬" min-width="100px"></el-table-column>
<el-table-column prop="code" label="宸ュ彿" min-width="100px"></el-table-column>
<el-table-column prop="visitsLastDate" label="鏈�鍚庝竴娆￠棬绂佹椂闂�" min-width="100px"></el-table-column>
<el-table-column prop="optRemark" label="鍐荤粨淇℃伅" min-width="100px"></el-table-column>
diff --git a/admin/src/views/business/internalCompany.vue b/admin/src/views/business/internalCompany.vue
index 60279db..0947c2b 100644
--- a/admin/src/views/business/internalCompany.vue
+++ b/admin/src/views/business/internalCompany.vue
@@ -1,63 +1,61 @@
<template>
- <TableLayout>
-<!-- :permissions="['business:company:query']"-->
- <!-- 鎼滅储琛ㄥ崟 -->
-<!-- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>-->
-<!-- <el-form-item label="缁勭粐鍚嶇О" prop="name">-->
-<!-- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>-->
-<!-- </el-form-item>-->
-<!-- <el-form-item label="鎵�灞炰笂绾х粍缁�" prop="parentName">-->
-<!-- <el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ユ墍灞炰笂绾х粍缁�" @keypress.enter.native="search"></el-input>-->
-<!-- </el-form-item>-->
-<!-- <section>-->
-<!-- <el-button type="primary" @click="search">鎼滅储</el-button>-->
-<!-- <el-button @click="reset">閲嶇疆</el-button>-->
-<!-- </section>-->
-<!-- </el-form>-->
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
- <li><el-button type="primary" v-permissions="['business:company:create']" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟',null,null)">鏂板缓</el-button></li>
- <li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up" v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
- <li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down" v-permissions="['business:company:sort']">涓嬬Щ</el-button></li>
- <li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading" @click="synchronous()">鍚屾</el-button></li>
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="list"
- stripe
- :tree-props="{children: 'childList',hasChildren: 'hasChildren'}"
- row-key="id"
- @selection-change="handleSelectionChange"
- default-expand-all
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="缁勭粐绫诲瀷" min-width="80px">
- <template scope="{row}">
- <span v-if="row.type == 0">鐩稿叧鏂圭粍缁�</span>
- <span v-if="row.type == 1">鍐呴儴缁勭粐</span>
- </template>
- </el-table-column>
- <el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
- <el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- width="230"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅',{ id: row.parentId,name:row.parentName,type:row.parentType, companyPath:row.parentCompanyPath}, row)" icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
- <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row,null)" icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
- <el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete" v-permissions="['business:company:delete']">鍒犻櫎</el-button>
- </template>
- </el-table-column>
- </el-table>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaInternalCompanyWindow ref="OperaInternalCompanyWindow" :list="list" @success="handlePageChange"/>
- </TableLayout>
+ <TableLayout>
+ <!-- :permissions="['business:company:query']"-->
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <!-- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>-->
+ <!-- <el-form-item label="缁勭粐鍚嶇О" prop="name">-->
+ <!-- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <el-form-item label="鎵�灞炰笂绾х粍缁�" prop="parentName">-->
+ <!-- <el-input v-model="searchForm.parentName" placeholder="璇疯緭鍏ユ墍灞炰笂绾х粍缁�" @keypress.enter.native="search"></el-input>-->
+ <!-- </el-form-item>-->
+ <!-- <section>-->
+ <!-- <el-button type="primary" @click="search">鎼滅储</el-button>-->
+ <!-- <el-button @click="reset">閲嶇疆</el-button>-->
+ <!-- </section>-->
+ <!-- </el-form>-->
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:company:create', 'business:company:sync']">
+ <li><el-button type="primary" v-permissions="['business:company:create']"
+ @click="$refs.OperaInternalCompanyWindow.open('鏂板缓浼佷笟', null, null)">鏂板缓</el-button></li>
+ <li><el-button @click="sort('top')" :loading="sorting" icon="el-icon-sort-up"
+ v-permissions="['business:company:sort']">涓婄Щ</el-button></li>
+ <li><el-button @click="sort('bottom')" :loading="sorting" icon="el-icon-sort-down"
+ v-permissions="['business:company:sort']">涓嬬Щ</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:company:sync']" :loading="loading"
+ @click="synchronous()">鍚屾</el-button></li>
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="list" stripe
+ :tree-props="{ children: 'childList', hasChildren: 'hasChildren' }" row-key="id"
+ @selection-change="handleSelectionChange" default-expand-all>
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="name" label="缁勭粐鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="缁勭粐绫诲瀷" min-width="80px">
+ <template scope="{row}">
+ <span v-if="row.type == 0">鐩稿叧鏂圭粍缁�</span>
+ <span v-if="row.type == 1">鍐呴儴缁勭粐</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="companyNamePath" label="缁勭粐璺緞" min-width="100px"></el-table-column>
+ <el-table-column prop="editorName" label="鎿嶄綔浜�" width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏈�鍚庢洿鏂版椂闂�" min-width="100px"></el-table-column>
+ <el-table-column label="鎿嶄綔" width="230" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text"
+ @click="$refs.OperaInternalCompanyWindow.open('缂栬緫浼佷笟淇℃伅', { id: row.parentId, name: row.parentName, type: row.parentType, companyPath: row.parentCompanyPath }, row)"
+ icon="el-icon-edit" v-permissions="['business:company:update']">缂栬緫</el-button>
+ <el-button type="text" @click="$refs.OperaInternalCompanyWindow.open('鏂板缓瀛愮骇', row, null)"
+ icon="el-icon-plus">鏂板缓瀛愮骇</el-button>
+ <el-button type="text" @click="deleteById(row)" style="color: red" icon="el-icon-delete"
+ v-permissions="['business:company:delete']">鍒犻櫎</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaInternalCompanyWindow ref="OperaInternalCompanyWindow" :list="list" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -69,7 +67,7 @@
name: 'internalCompany',
extends: BaseTable,
components: { TableLayout, OperaInternalCompanyWindow },
- data () {
+ data() {
return {
// 鎼滅储
loading: false,
@@ -81,7 +79,7 @@
total: 0
}
},
- created () {
+ created() {
this.config({
module: '浼佷笟淇℃伅琛�',
api: '/business/company',
@@ -90,9 +88,14 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - 220
+ })
+ },
methods: {
// 椤电爜鍙樻洿澶勭悊
- handlePageChange (pageIndex) {
+ handlePageChange(pageIndex) {
this.__checkApi()
this.isWorking.search = true
this.api.fetchList(this.searchForm.type)
@@ -107,7 +110,7 @@
})
},
// 鍚屾淇℃伅
- async synchronous () {
+ async synchronous() {
this.$dialog.actionConfirm('璇ユ搷浣滃皢绯荤粺娓呯┖宸叉湁缁勭粐淇℃伅锛屾偍纭鍚屾鍏ㄩ儴淇℃伅鍚楋紵', '鎿嶄綔纭鎻愰啋')
.then(() => {
this.loading = true
@@ -123,10 +126,10 @@
this.loading = false
})
})
- .catch(() => {})
+ .catch(() => { })
},
// 鎺掑簭
- sort (direction) {
+ sort(direction) {
if (this.sorting) {
return
}
@@ -166,11 +169,11 @@
direction
})
.then(() => {
- /* if (direction === 'top') {
- menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex - 1, 1)[0])
- } else {
- menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex + 1, 1)[0])
- }*/
+ /* if (direction === 'top') {
+ menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex - 1, 1)[0])
+ } else {
+ menuPool.splice(menuIndex, 0, menuPool.splice(menuIndex + 1, 1)[0])
+ }*/
this.search()
})
.catch(e => {
@@ -181,7 +184,7 @@
})
},
// 鏌ヨ鐖惰妭鐐�
- __findParent (id, parent) {
+ __findParent(id, parent) {
if (parent.childList === 0) {
return
}
diff --git a/admin/src/views/business/internalMember.vue b/admin/src/views/business/internalMember.vue
index 0b2d1f1..cdd8f28 100644
--- a/admin/src/views/business/internalMember.vue
+++ b/admin/src/views/business/internalMember.vue
@@ -1,46 +1,49 @@
<template>
<TableLayout1 :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="keyword">
- <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="positionId" >
- <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
- <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hasFace">
- <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
- <el-option label="鏃�" value="0"></el-option>
- <el-option label="鏈�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="canVisit">
- <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="workStatus">
- <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
- <el-option label="鍦ㄨ亴" value="0"></el-option>
- <el-option label="绂昏亴" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hkStatus">
- <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
- <el-option label="寰呭悓姝�" value="0"></el-option>
- <el-option label="鍚屾鎴愬姛" value="1"></el-option>
- <el-option label="鍚屾澶辫触" value="2"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="keyword">
+ <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="positionId">
+ <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
+ <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="hasFace">
+ <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" clearable placeholder="鏄惁鏈変汉鑴�">
+ <el-option label="鏃�" value="0"></el-option>
+ <el-option label="鏈�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="canVisit">
+ <el-select v-model="searchForm.canVisit" clearable @keypress.enter.native="search" placeholder="鍙嫓璁�">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="workStatus">
+ <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
+ <el-option label="鍦ㄨ亴" value="0"></el-option>
+ <el-option label="绂昏亴" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="hkStatus">
+ <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" clearable placeholder="娴峰悍鍚屾鐘舵��">
+ <el-option label="寰呭悓姝�" value="0"></el-option>
+ <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+ <el-option label="鍚屾澶辫触" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<template v-slot:menu>
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
@@ -62,16 +65,16 @@
icon="el-icon-plus" v-permissions="['business:member:create']">浜哄憳瀵煎叆</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()"
- >涓嬪彂鎺堟潈</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:create']"
+ @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
<li style="float: right">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
@change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -80,7 +83,7 @@
<el-table-column label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
@@ -94,14 +97,14 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
-<!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+ <!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1" style="color: green">鍏氬憳</span>
<span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
</el-table-column>-->
<el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"></el-table-column>
-<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
<span v-if="row.status == 1" style="color: red">绂佺敤</span>
@@ -163,14 +166,14 @@
<el-table-column label="鍗＄墖" min-width="80px">
<template slot-scope="{row}">
<el-button @click="$refs.cardOpeningRecord.open('寮�鍗¤褰�', row.id)" type="text">{{ row.memberCardCount ||
- '0'}}</el-button>
+ '0' }}</el-button>
</template>
</el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
- label="鎿嶄綔" min-width="280" >
+ label="鎿嶄綔" min-width="280">
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
@@ -213,7 +216,7 @@
name: 'internalMember',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow, OperaMemberImportWindow },
- data () {
+ data() {
return {
TreeList: [],
// 鎼滅储
@@ -241,7 +244,7 @@
department: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳淇℃伅琛�',
api: '/business/member',
@@ -252,8 +255,13 @@
this.getfindCompanyTreePage()
this.getPositionList()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
+ })
+ },
methods: {
- startEmpowerBatch () {
+ startEmpowerBatch() {
if (this.tableData.selectedRows.length === 0) {
this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
return
@@ -266,13 +274,13 @@
})
this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
},
- getPositionList () {
+ getPositionList() {
allList({})
.then(res => {
this.positionList = res
})
},
- empower (id) {
+ empower(id) {
var that = this
this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -289,7 +297,7 @@
})
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage () {
+ getfindCompanyTreePage() {
fetchList()
.then(res => {
if (res && res.length > 0) {
@@ -301,7 +309,7 @@
}
})
},
- getDepartmentTree (tree) {
+ getDepartmentTree(tree) {
if (tree == null) {
return []
}
@@ -325,7 +333,7 @@
})
},
// 鍚屾淇℃伅
- async synchronous () {
+ async synchronous() {
this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
@@ -343,7 +351,7 @@
})
.catch(() => { })
},
- async updateHead (row, type) {
+ async updateHead(row, type) {
this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
.then(() => {
this.heading = true
@@ -361,7 +369,7 @@
.catch(() => { })
})
},
- changeWorkStatus (e, row) {
+ changeWorkStatus(e, row) {
this.working = true
updateWorkStatus({ id: row.id, workStatus: e })
.then(res => {
@@ -376,7 +384,7 @@
})
.catch(() => { })
},
- changeCanvisit (e, row) {
+ changeCanvisit(e, row) {
this.canvisiting = true
updateCanVisit({ id: row.id, canVisit: e })
.then(res => {
@@ -391,7 +399,7 @@
})
.catch(() => { })
},
- callback (row) {
+ callback(row) {
console.log(row)
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index 9abaad8..2fe2dcc 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -1,89 +1,77 @@
<template>
- <TableLayout :permissions="['business:platformbroadcastlog:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="content">
- <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="personType">
- <el-select v-model="searchForm.deviceType" placeholder="璇烽�夋嫨璁惧绫诲瀷">
- <el-option label="骞挎挱" value="0"></el-option>
- <el-option label="LED" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="eventType">
- <el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨涓嬪彂鐘舵��">
- <el-option label="寰呬笅鍙�" value="0"></el-option>
- <el-option label="涓嬪彂涓�" value="1"></el-option>
- <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
- <el-option label="涓嬪彂澶辫触" value="3"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="eventType">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:platformbroadcastlog:exportExcel']">
-<!--
+ <TableLayout :permissions="['business:platformbroadcastlog:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div slot="search-form" ref="QueryFormRef">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ユ爣棰�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="content">
+ <el-input v-model="searchForm.content" placeholder="璇疯緭鍏ュ唴瀹�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="personType">
+ <el-select v-model="searchForm.deviceType" placeholder="璇烽�夋嫨璁惧绫诲瀷">
+ <el-option label="骞挎挱" value="0"></el-option>
+ <el-option label="LED" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="eventType">
+ <el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨涓嬪彂鐘舵��">
+ <el-option label="寰呬笅鍙�" value="0"></el-option>
+ <el-option label="涓嬪彂涓�" value="1"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="2"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="3"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="eventType">
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:platformbroadcastlog:exportExcel']">
+ <!--
<li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:platformbroadcastlog:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
-->
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="deviceType" label="璁惧绫诲瀷" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.deviceType == 0">骞挎挱</span>
- <span v-if="row.deviceType == 1">LED</span>
- </template>
- </el-table-column>
- <el-table-column prop="hkStatus" label="涓嬪彂鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.hkStatus == 0" style="color: #0c6ce3">寰呬笅鍙�</span>
- <span v-if="row.hkStatus == 1" style="color: #0c6ce3">涓嬪彂涓�</span>
- <span v-if="row.hkStatus == 2" style="color: green">涓嬪彂鎴愬姛</span>
- <span v-if="row.hkStatus == 3" style="color: red">涓嬪彂澶辫触</span>
- </template>
- </el-table-column>
- <el-table-column prop="name" label="鏍囬" min-width="100px"></el-table-column>
- <el-table-column prop="info" label="鍐呭" min-width="100px"></el-table-column>
- <el-table-column prop="ids" label="璁惧缂栫爜" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe>
+ <el-table-column prop="deviceType" label="璁惧绫诲瀷" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.deviceType == 0">骞挎挱</span>
+ <span v-if="row.deviceType == 1">LED</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="hkStatus" label="涓嬪彂鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.hkStatus == 0" style="color: #0c6ce3">寰呬笅鍙�</span>
+ <span v-if="row.hkStatus == 1" style="color: #0c6ce3">涓嬪彂涓�</span>
+ <span v-if="row.hkStatus == 2" style="color: green">涓嬪彂鎴愬姛</span>
+ <span v-if="row.hkStatus == 3" style="color: red">涓嬪彂澶辫触</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="name" label="鏍囬" min-width="100px"></el-table-column>
+ <el-table-column prop="info" label="鍐呭" min-width="100px"></el-table-column>
+ <el-table-column prop="ids" label="璁惧缂栫爜" min-width="100px"></el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="100px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -95,7 +83,7 @@
name: 'DeviceEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -110,7 +98,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: 'LED骞挎挱鎾斁璁板綍',
api: '/business/platformBroadcastLog',
@@ -119,8 +107,13 @@
})
this.changeRadio('0')
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+ })
+ },
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startTime = timeForMat(0)[0]
this.searchForm.endTime = timeForMat(0)[1]
@@ -136,13 +129,13 @@
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startTime = e[0]
this.searchForm.endTime = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.time = []
this.searchForm.radio = ''
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index 5271aab..97f2557 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -1,95 +1,84 @@
<template>
- <TableLayout :permissions="['business:platformevent:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="platformName">
- <el-input v-model="searchForm.platformName" placeholder="璇疯緭鍏ユ湀鍙板悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="channelName">
- <el-input v-model="searchForm.channelName" placeholder="璇疯緭鍏ョ洃鎺х偣鍚嶇О" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="plateNo">
- <el-input v-model="searchForm.plateNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="eventType">
- <el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
- <el-option label="绂诲紑" value="leave"></el-option>
- <el-option label="杩涘叆" value="enter"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startDate">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫椂闂�"
- end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- >
- <el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="150px"></el-table-column>
- <el-table-column prop="channelName" label="鐩戞帶鐐瑰悕绉�" min-width="150px"></el-table-column>
- <el-table-column prop="plateNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
- <el-table-column label="杩涘嚭绫诲瀷" min-width="90px">
- <template slot-scope="{row}">
- <span v-if="row.motionStatus == 'enter'">杩涘叆</span>
- <span v-if="row.motionStatus == 'leave'">绂诲紑</span>
- <span v-if="row.motionStatus != 'leave' && row.motionStatus != 'enter'">{{ row.motionStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column label="鍓嶅悗鏍囪瘑" min-width="90px">
- <template slot-scope="{row}">
- <span v-if="row.stockStatus == 'rear'">杞﹀熬</span>
- <span v-if="row.stockStatus == 'front'">杞﹀ご</span>
- <span v-if="row.stockStatus != 'rear' && row.stockStatus != 'front'">{{ row.stockStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column label="杞﹂棬鐘舵��" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.vehicleDoorStatus == 'open'">寮�闂�</span>
- <span v-if="row.vehicleDoorStatus == 'close'">鍏抽棬</span>
- <span v-if="row.vehicleDoorStatus != 'open' && row.vehicleDoorStatus != 'close'">{{ row.vehicleDoorStatus }}</span>
- </template>
- </el-table-column>
- <el-table-column prop="srcIndex" label="璁惧缂栫爜" min-width="180px"></el-table-column>
- <el-table-column prop="ipAddress" label="IP鍦板潃" min-width="100px"></el-table-column>
- <el-table-column prop="portNo" label="绔彛" min-width="80px"></el-table-column>
- <el-table-column fixed="right" label="鎶撴媿鍥�" min-width="100px">
- <template slot-scope="{row}">
- <el-image v-if="row.backgroundImageDown" style="width: 60px; height: 60px" :src="row.backgroundImageDown"
- :preview-src-list="[row.backgroundImageDown]">
- </el-image>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="160px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ <TableLayout :permissions="['business:platformevent:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div slot="search-form" ref="QueryFormRef">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="platformName">
+ <el-input v-model="searchForm.platformName" placeholder="璇疯緭鍏ユ湀鍙板悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="channelName">
+ <el-input v-model="searchForm.channelName" placeholder="璇疯緭鍏ョ洃鎺х偣鍚嶇О" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="plateNo">
+ <el-input v-model="searchForm.plateNo" placeholder="璇疯緭鍏ヨ溅鐗屽彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="eventType">
+ <el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
+ <el-option label="绂诲紑" value="leave"></el-option>
+ <el-option label="杩涘叆" value="enter"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startDate">
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <el-table v-loading="isWorking.search" :max-height="tableHeight" :data="tableData.list" stripe>
+ <el-table-column prop="platformName" label="鏈堝彴鍚嶇О" min-width="150px"></el-table-column>
+ <el-table-column prop="channelName" label="鐩戞帶鐐瑰悕绉�" min-width="150px"></el-table-column>
+ <el-table-column prop="plateNo" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column label="杩涘嚭绫诲瀷" min-width="90px">
+ <template slot-scope="{row}">
+ <span v-if="row.motionStatus == 'enter'">杩涘叆</span>
+ <span v-if="row.motionStatus == 'leave'">绂诲紑</span>
+ <span v-if="row.motionStatus != 'leave' && row.motionStatus != 'enter'">{{ row.motionStatus }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="鍓嶅悗鏍囪瘑" min-width="90px">
+ <template slot-scope="{row}">
+ <span v-if="row.stockStatus == 'rear'">杞﹀熬</span>
+ <span v-if="row.stockStatus == 'front'">杞﹀ご</span>
+ <span v-if="row.stockStatus != 'rear' && row.stockStatus != 'front'">{{ row.stockStatus }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column label="杞﹂棬鐘舵��" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.vehicleDoorStatus == 'open'">寮�闂�</span>
+ <span v-if="row.vehicleDoorStatus == 'close'">鍏抽棬</span>
+ <span v-if="row.vehicleDoorStatus != 'open' && row.vehicleDoorStatus != 'close'">{{ row.vehicleDoorStatus
+ }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="srcIndex" label="璁惧缂栫爜" min-width="260px"></el-table-column>
+ <el-table-column prop="ipAddress" label="IP鍦板潃" min-width="100px"></el-table-column>
+ <el-table-column prop="portNo" label="绔彛" min-width="80px"></el-table-column>
+ <el-table-column fixed="right" label="鎶撴媿鍥�" min-width="100px">
+ <template slot-scope="{row}">
+ <el-image v-if="row.backgroundImageDown" style="width: 60px; height: 60px" :src="row.backgroundImageDown"
+ :preview-src-list="[row.backgroundImageDown]">
+ </el-image>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="160px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -101,7 +90,7 @@
name: 'platformEvent',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -116,7 +105,7 @@
time: []
}
},
- created () {
+ created() {
this.config({
module: '鏈堝彴杞﹁締鐘舵�佷簨浠朵氦浜掕褰�',
api: '/business/platformEvent',
@@ -125,8 +114,13 @@
})
this.changeRadio('0')
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+ })
+ },
methods: {
- changeRadio (e) {
+ changeRadio(e) {
if (e === '0') {
this.searchForm.startDate = timeForMat(0)[0]
this.searchForm.endDate = timeForMat(0)[1]
@@ -142,13 +136,13 @@
}
this.search()
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.startDate = e[0]
this.searchForm.endDate = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.startDate = ''
this.searchForm.endDate = ''
diff --git a/admin/src/views/business/relativeMember.vue b/admin/src/views/business/relativeMember.vue
index 98f1b72..abecc87 100644
--- a/admin/src/views/business/relativeMember.vue
+++ b/admin/src/views/business/relativeMember.vue
@@ -1,50 +1,52 @@
<template>
<TableLayout1 :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="keyword">
- <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
- </el-form-item>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="keyword">
+ <el-input v-model="searchForm.keyword" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�/宸ュ彿" @keypress.enter.native="search"></el-input>
+ </el-form-item>
- <el-form-item label="" prop="positionId" >
- <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
- <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hasFace">
- <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="鏄惁鏈変汉鑴�">
- <el-option label="鏃�" value="0"></el-option>
- <el-option label="鏈�" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="canVisit">
- <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="鍙嫓璁�">
- <el-option label="鏄�" value="1"></el-option>
- <el-option label="鍚�" value="0"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="workStatus">
- <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
- <el-option label="鍦ㄨ亴" value="0"></el-option>
- <el-option label="绂昏亴" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="hkStatus">
- <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
- <el-option label="寰呭悓姝�" value="0"></el-option>
- <el-option label="鍚屾鎴愬姛" value="1"></el-option>
- <el-option label="鍚屾澶辫触" value="2"></el-option>
- </el-select>
- </el-form-item>
-<!-- <el-form-item label="">
+ <el-form-item label="" prop="positionId">
+ <el-select v-model="searchForm.positionId" clearable filterable placeholder="宀椾綅">
+ <el-option v-for="item in positionList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="hasFace">
+ <el-select v-model="searchForm.hasFace" @keypress.enter.native="search" placeholder="鏄惁鏈変汉鑴�">
+ <el-option label="鏃�" value="0"></el-option>
+ <el-option label="鏈�" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="canVisit">
+ <el-select v-model="searchForm.canVisit" @keypress.enter.native="search" placeholder="鍙嫓璁�">
+ <el-option label="鏄�" value="1"></el-option>
+ <el-option label="鍚�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="workStatus">
+ <el-select v-model="searchForm.workStatus" @keypress.enter.native="search" clearable placeholder="鍦ㄨ亴鐘舵��">
+ <el-option label="鍦ㄨ亴" value="0"></el-option>
+ <el-option label="绂昏亴" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="hkStatus">
+ <el-select v-model="searchForm.hkStatus" @keypress.enter.native="search" placeholder="娴峰悍鍚屾鐘舵��">
+ <el-option label="寰呭悓姝�" value="0"></el-option>
+ <el-option label="鍚屾鎴愬姛" value="1"></el-option>
+ <el-option label="鍚屾澶辫触" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <el-form-item label="">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</el-form-item>-->
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
<template v-slot:menu>
<div
style="width: 100%; height: 50px; background: rgba(242, 242, 242, 1); line-height: 50px; text-align: center; font-size: 14px;">
@@ -71,18 +73,21 @@
icon="el-icon-plus" v-permissions="['business:traintime:create']">鍩硅鏈熷鍏�</el-button></li>
<li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:member:delete']">鎵归噺鍒犻櫎</el-button></li>
- <li><el-button type="primary" v-permissions="['business:empower:create']" @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:create']"
+ @click="startEmpowerBatch()">涓嬪彂鎺堟潈</el-button></li>
<li style="float: right">
<el-checkbox style="font-size: 12px" label="1" v-model="searchForm.includeChild" key="1"
- @change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
+ @change="search">鏄惁鍖呭惈涓嬬骇缁勭粐</el-checkbox>
</li>
- <li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
+ <li><el-button type="primary" v-permissions="['business:empower:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
+ <el-table-column fixed="left" prop="name" label="濮撳悕" min-width="80px">
<template slot-scope="{row}">
<span>{{ row.name }}</span>
<span class="zhuguan" v-if="row.headStatus == 1">涓荤</span>
@@ -91,7 +96,7 @@
<el-table-column label="浜鸿劯淇℃伅" min-width="100px">
<template slot-scope="{row}">
<el-image v-if="row.faceImgFull" style="width: 60px; height: 60px" :src="row.faceImgFull"
- :preview-src-list="[row.faceImgFull]">
+ :preview-src-list="[row.faceImgFull]">
</el-image>
</template>
</el-table-column>
@@ -105,21 +110,21 @@
</el-table-column>
<el-table-column prop="companyName" label="鎵�灞為儴闂�" min-width="100px"></el-table-column>
<el-table-column prop="positionName" label="宀椾綅" min-width="100px"></el-table-column>
-<!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
+ <!-- <el-table-column prop="isDangyuan" label="鏄惁鍏氬憳" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isDangyuan ==1 " style="color: green">鍏氬憳</span>
<span v-if="row.isDangyuan ==0">闈炲厷鍛�</span>
</template>
</el-table-column>-->
- <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
-<!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <el-table-column prop="jobDate" label="鍏ヨ亴鏃ユ湡" min-width="100px"> </el-table-column>
+ <!-- <el-table-column prop="status" label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.status == 0" style="color: green">姝ｅ父</span>
<span v-if="row.status == 1" style="color: red">绂佺敤</span>
<span v-if="row.status == 2" style="color: red">鎷夐粦/鍐荤粨</span>
</template>
</el-table-column>-->
- <el-table-column prop="trainEndTime" label="鍩硅鏈夋晥鏈�" min-width="100px"> </el-table-column>
+ <el-table-column prop="trainEndTime" label="鍩硅鏈夋晥鏈�" min-width="100px"> </el-table-column>
<el-table-column label="閮ㄩ棬绫诲瀷" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.companyType == 0">鐩稿叧鏂圭粍缁�</span>
@@ -182,7 +187,7 @@
<el-table-column prop="editDate" label="鏈�鍚庢搷浣滄椂闂�" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:member:update', 'business:member:delete', 'business:empower:create'])"
- label="鎿嶄綔" min-width="280" >
+ label="鎿嶄綔" min-width="280">
<template slot-scope="{row}">
<el-button type="text" icon="el-icon-edit" @click="$refs.OperaMemberWindow.open('缂栬緫鍛樺伐淇℃伅', row, department)"
v-permissions="['business:empower:update']">缂栬緫</el-button>
@@ -194,7 +199,7 @@
<el-button type="text" :loading="heading" icon="el-icon-edit" @click="updateHead(row, 1)"
v-if="row.headStatus == 0" v-permissions="['business:member:head']">璁句负涓荤</el-button>
<el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
- v-permissions="['business:member:delete']">鍒犻櫎</el-button>
+ v-permissions="['business:member:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
@@ -227,7 +232,7 @@
name: 'internalMember',
extends: BaseTable,
components: { TableLayout1, Pagination, Tree, cardOpeningRecord, OperaMemberWindow, OperaMemberRoleWindow, OperaMemberImportWindow, OperaTrainTimeImportWindow },
- data () {
+ data() {
return {
TreeList: [],
// 鎼滅储
@@ -255,7 +260,7 @@
department: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳淇℃伅琛�',
api: '/business/member',
@@ -266,8 +271,13 @@
this.getfindCompanyTreePage()
this.getPositionList()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 276
+ })
+ },
methods: {
- startEmpowerBatch () {
+ startEmpowerBatch() {
if (this.tableData.selectedRows.length === 0) {
this.$tip.warning('璇疯嚦灏戦�夋嫨涓�鏉℃暟鎹�')
return
@@ -280,13 +290,13 @@
})
this.$refs.OperaMemberRoleWindow.open('鍐呴儴鍛樺伐涓嬪彂鏉冮檺', ids, names, this.searchForm.companyType)
},
- getPositionList () {
+ getPositionList() {
positionList({})
.then(res => {
this.positionList = res
})
},
- empower (id) {
+ empower(id) {
var that = this
this.$confirm('纭畾閲嶆柊鎺堟潈鍚�?', '鎻愮ず', {
confirmButtonText: '纭畾',
@@ -303,7 +313,7 @@
})
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage () {
+ getfindCompanyTreePage() {
fetchList()
.then(res => {
if (res && res.length > 0) {
@@ -315,7 +325,7 @@
}
})
},
- getDepartmentTree (tree) {
+ getDepartmentTree(tree) {
if (tree == null) {
return []
}
@@ -338,7 +348,7 @@
})
},
// 鍚屾淇℃伅
- async synchronous () {
+ async synchronous() {
this.$dialog.actionConfirm('璇ユ搷浣滈檷瑙﹀彂鍏ㄥ憳淇℃伅鏇存柊鍜岄噸鏂颁笅鍙戯紒璇疯皑鎱庢搷浣�', '鎮ㄧ‘璁ゅ叏閲忓悓姝ュ唴閮ㄤ汉鍛樹俊鎭悧锛�')
.then(() => {
this.loading = true
@@ -356,7 +366,7 @@
})
.catch(() => { })
},
- async updateHead (row, type) {
+ async updateHead(row, type) {
this.$dialog.actionConfirm('鎮ㄧ‘璁よ繘琛屽綋鍓嶆搷浣滃悧锛�', '閮ㄩ棬涓荤璁剧疆鎿嶄綔鎻愮ず')
.then(() => {
this.heading = true
@@ -374,7 +384,7 @@
.catch(() => { })
})
},
- changeWorkStatus (e, row) {
+ changeWorkStatus(e, row) {
this.working = true
updateWorkStatus({ id: row.id, workStatus: e })
.then(res => {
@@ -389,7 +399,7 @@
})
.catch(() => { })
},
- changeCanvisit (e, row) {
+ changeCanvisit(e, row) {
this.canvisiting = true
updateCanVisit({ id: row.id, canVisit: e })
.then(res => {
@@ -404,7 +414,7 @@
})
.catch(() => { })
},
- callback (row) {
+ callback(row) {
this.searchForm.erpOrgId = row.erpId
this.searchForm.companyId = row.id
this.search()
diff --git a/admin/src/views/business/reportRecord.vue b/admin/src/views/business/reportRecord.vue
index f9a206d..aef500a 100644
--- a/admin/src/views/business/reportRecord.vue
+++ b/admin/src/views/business/reportRecord.vue
@@ -1,77 +1,35 @@
<template>
<div class="main_app">
- <QueryForm
- v-model="filters"
- :query-form-config="queryFormConfig"
- @handleQuery="getList(1)"
- @clear="clear"
- />
- <div class="query_btns" style="margin: 16px 0 0" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
- <el-button type="primary" @click="handleEdit()" icon="el-icon-plus" v-permissions="['business:visits:create']">鏂板缓</el-button>
- <el-button type="primary" :loading="exLoading" @click="exportExcel" v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button>
+
+ <div ref="QueryFormRef">
+ <QueryForm v-model="filters" :query-form-config="queryFormConfig" @handleQuery="getList(1)" @clear="clear" />
</div>
- <el-table
- v-loading="loading"
- :data="dataList"
- stripe
- row-key="id"
- default-expand-all
- >
+ <div class="query_btns" style="margin: 16px 0 0"
+ v-permissions="['business:visits:create', 'business:visits:exportExcel']">
+ <el-button type="primary" @click="handleEdit()" icon="el-icon-plus"
+ v-permissions="['business:visits:create']">鏂板缓</el-button>
+ <el-button type="primary" :loading="exLoading" @click="exportExcel"
+ v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button>
+ </div>
+ <el-table :max-height="tableHeight" v-loading="loading" :data="dataList" stripe row-key="id" default-expand-all>
<el-table-column type="selection" width="55" align="center"></el-table-column>
- <el-table-column
- prop="carNos"
- label="鍏ュ洯杞﹁締"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="companyName"
- label="鍏徃鍚嶇О"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="name"
- label="鑱旂郴浜轰俊鎭�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="phone"
- label="鎵嬫満鍙�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="receptMemberName"
- label="琚浜�"
- min-width="100px"
- ></el-table-column>
+ <el-table-column prop="carNos" label="鍏ュ洯杞﹁締" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="鍏徃鍚嶇О" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="鑱旂郴浜轰俊鎭�" min-width="100px"></el-table-column>
+ <el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="receptMemberName" label="琚浜�" min-width="100px"></el-table-column>
<el-table-column label="鎷滆鏃堕棿" min-width="160px">
<template slot-scope="{ row }">
- <span>璧凤細{{ row.starttime }}</span
- ><br />
+ <span>璧凤細{{ row.starttime }}</span><br />
<span>姝細{{ row.endtime }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="reason"
- label="鎷滆浜嬬敱"
- min-width="100"
- ></el-table-column>
- <el-table-column
- prop="status"
- fixed="right"
- label="鐘舵��"
- align="center"
- min-width="100"
- >
+ <el-table-column prop="reason" label="鎷滆浜嬬敱" min-width="100"></el-table-column>
+ <el-table-column prop="status" fixed="right" label="鐘舵��" align="center" min-width="100">
<template slot-scope="{ row }">
- <span style="color: rgba(245, 154, 35, 0.996)" v-if="row.status === 0"
- >寰呮彁浜ゅ鎵�</span
- >
- <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996)"
- >澶勭悊涓�</span
- >
- <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996)"
- >宸插悓鎰�</span
- >
+ <span style="color: rgba(245, 154, 35, 0.996)" v-if="row.status === 0">寰呮彁浜ゅ鎵�</span>
+ <span v-if="row.status === 1" style="color: rgba(245, 154, 35, 0.996)">澶勭悊涓�</span>
+ <span v-if="row.status === 2" style="color: rgba(245, 154, 35, 0.996)">宸插悓鎰�</span>
<span style="color: gray" v-if="row.status === 3">宸叉嫆缁�</span>
<span v-if="row.status === 4" style="color: gray">鍙栨秷</span>
<span v-if="row.status === 5" style="color: green">涓嬪彂鎴愬姛</span>
@@ -83,21 +41,16 @@
</el-table-column>
<el-table-column label="鎿嶄綔" align="center" width="180" fixed="right">
<template slot-scope="{ row }">
- <el-button
- type="text"
- @click="handleDetail(row)"
- v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
+ <el-button type="text" @click="handleDetail(row)" v-permissions="['business:company:update']">鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="getList"
- :pagination="pagination"
- />
+ <pagination class="mt10" @size-change="handleSizeChange" @current-change="getList" :pagination="pagination" />
<ReportDetail v-if="isShowReport" ref="VisReportDetailRef" />
- <OperaVisitsReportWindow @close="isShowEdit = false" @success="getList" v-if="isShowEdit" ref="operaVisitsWindowRef" />
+ <OperaVisitsReportWindow @close="isShowEdit = false" @success="getList" v-if="isShowEdit"
+ ref="operaVisitsWindowRef" />
</div>
</template>
@@ -115,10 +68,11 @@
Pagination,
OperaVisitsReportWindow
},
- data () {
+ data() {
return {
isShowEdit: false,
exLoading: false,
+ tableHeight: 400,
isShowReport: false,
activeTab: '0',
@@ -154,11 +108,16 @@
total: 0
}
},
- created () {
+ created() {
this.getList()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
- exportExcel () {
+ exportExcel() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -178,13 +137,13 @@
})
})
},
- handleEdit () {
+ handleEdit() {
this.isShowEdit = true
this.$nextTick(() => {
this.$refs.operaVisitsWindowRef.isShowModal = true
})
},
- deleteById (row) {
+ deleteById(row) {
this.$confirm('纭畾鍒犻櫎璇ヨ褰曞悧, 鏄惁缁х画?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -199,7 +158,7 @@
}).catch(() => {
})
},
- handleDetail (row) {
+ handleDetail(row) {
this.isShowReport = true
this.$nextTick(() => {
this.$nextTick(() => {
@@ -210,7 +169,7 @@
})
})
},
- getList (page) {
+ getList(page) {
const { pagination, filters } = this
pagination.page = page || pagination.page
fetchList({
@@ -221,13 +180,13 @@
this.pagination.total = res.total
})
},
- clear () {
+ clear() {
this.filters = {
type: 2
}
this.getList(0)
},
- handleSizeChange (capacity) {
+ handleSizeChange(capacity) {
this.pagination.capacity = capacity
this.getList()
}
@@ -235,5 +194,4 @@
}
</script>
-<style lang="scss" scoped>
-</style>
+<style lang="scss" scoped></style>
diff --git a/admin/src/views/business/retention.vue b/admin/src/views/business/retention.vue
index 054b175..2818825 100644
--- a/admin/src/views/business/retention.vue
+++ b/admin/src/views/business/retention.vue
@@ -1,35 +1,38 @@
<template>
<TableLayout :permissions="['business:retention:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
- <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="缁勭粐" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
- <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
- <el-option label="璁垮" value="0"></el-option>
- <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
- <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="璧锋鏃堕棿" prop="startTime">
- <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
- </el-date-picker>
- </el-form-item>
- <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="keyWords">
+ <el-input v-model="searchForm.keyWords" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="缁勭粐" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="浜哄憳绫诲瀷" prop="queryUserType">
+ <el-select v-model="searchForm.queryUserType" placeholder="璇烽�夋嫨">
+ <el-option label="璁垮" value="0"></el-option>
+ <el-option label="鐩稿叧鏂圭粍缁�" value="1"></el-option>
+ <el-option label="鍐呴儴鍛樺伐" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="璧锋鏃堕棿" prop="startTime">
+ <el-date-picker @change="seleTime" v-model="time" type="datetimerange" format="yyyy-MM-dd HH:mm:ss"
+ value-format="yyyy-MM-dd HH:mm:ss" range-separator="鑷�" start-placeholder="寮�濮嬫椂闂�" end-placeholder="缁撴潫鏃堕棿">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:retention:exportExcel']">
@@ -38,7 +41,7 @@
@click="exportExcel">瀵煎嚭</el-button>
</li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -47,7 +50,7 @@
<template slot-scope="{ row }">
<span v-if="row.type === 2 || row.type === 0">{{
row.companyName
- }}</span>
+ }}</span>
<span v-else>{{ row.visitCompanyName }}</span>
</template>
</el-table-column>
@@ -64,7 +67,7 @@
<span>{{ row.deviceName || '-' }}</span>
</template>
</el-table-column>
- <el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="eventDate" label="杩涘満鏃堕棿" min-width="140px"></el-table-column>
<el-table-column label="浜鸿劯鐓х墖" min-width="100px">
<template slot-scope="{ row }">
<el-image v-if="row.faceImgFull != null" style="width: 80px; height: 80px" :src="row.faceImgFull"
@@ -117,6 +120,11 @@
})
this.changeRadio('0')
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
changeRadio(e) {
if (e === '0') {
diff --git a/admin/src/views/business/strandedPersonnel.vue b/admin/src/views/business/strandedPersonnel.vue
index 89e0d2a..2455d22 100644
--- a/admin/src/views/business/strandedPersonnel.vue
+++ b/admin/src/views/business/strandedPersonnel.vue
@@ -26,9 +26,9 @@
<!-- </ul>-->
<el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<!-- <el-table-column type="selection" width="55"></el-table-column>-->
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="缁勭粐" min-width="200px"></el-table-column>
<el-table-column label="鐢ㄦ埛绫诲瀷" min-width="100px">
<span>璁垮</span>
<!-- <template slot-scope="{ row }">
@@ -37,8 +37,8 @@
<span v-if="row.type === 2">鍐呴儴浜哄憳</span>
</template>-->
</el-table-column>
- <el-table-column prop="inDate" label="鍦ㄥ洯鏃堕棿" min-width="100px"></el-table-column>
- <el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="inDate" label="鍦ㄥ洯鏃堕棿" show-overflow-tooltip min-width="150px"></el-table-column>
+ <el-table-column prop="outDate" label="鎺堟潈鍒版湡鏃堕棿" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column label="瓒呮椂鏃堕暱" min-width="100px">
<template slot-scope="{ row }">
<span v-if="row.outStatus === 1">{{ row.timeOut.toString().replace("-", "") }}鍒嗛挓</span>
diff --git a/admin/src/views/business/tmsFactoryParam.vue b/admin/src/views/business/tmsFactoryParam.vue
index f2ec0a5..370b9b6 100644
--- a/admin/src/views/business/tmsFactoryParam.vue
+++ b/admin/src/views/business/tmsFactoryParam.vue
@@ -33,7 +33,7 @@
<el-table-column prop="num2" label="鏈�澶у嚭搴撹兘鍔涳紙涓囨敮锛�" min-width="100px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
<el-table-column prop="editorName" label="鎿嶄綔浜�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:tmsfactoryparam:update', 'business:tmsfactoryparam:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/business/visitorManagement.vue b/admin/src/views/business/visitorManagement.vue
index fe0cd12..f05ea9b 100644
--- a/admin/src/views/business/visitorManagement.vue
+++ b/admin/src/views/business/visitorManagement.vue
@@ -32,15 +32,15 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="濮撳悕" min-width="80px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="phone" label="鎬у埆" min-width="100px">
+ <el-table-column prop="phone" label="鎬у埆" min-width="60px">
<template slot-scope="{row}">
<span v-if="row.sex === 1">鐢�</span>
<span v-if="row.sex === 2">濂�</span>
</template>
</el-table-column>
- <el-table-column prop="status" label="鐘舵��" min-width="100px">
+ <el-table-column prop="status" label="鐘舵��" min-width="80px">
<template slot-scope="{row}">
<span v-if="(row.status || 0) === 0" style="color: green">姝ｅ父</span>
<span v-else style="color: red">寮傚父</span>
@@ -54,9 +54,9 @@
</template>
</el-table-column>
<el-table-column prop="idcardDecode" label="韬唤璇佸彿" width="150px"></el-table-column>
- <el-table-column prop="visitCompanyName" label="鍏徃" min-width="100px"></el-table-column>
- <el-table-column prop="visitTimes" label="鎷滆娆℃暟" min-width="100px"></el-table-column>
- <el-table-column prop="lastVisitDate" label="鏈�鍚庢嫓璁挎椂闂�" min-width="100px"></el-table-column>
+ <el-table-column prop="visitCompanyName" label="鍏徃" show-overflow-tooltip min-width="100px"></el-table-column>
+ <el-table-column prop="visitTimes" label="鎷滆娆℃暟" min-width="80px"></el-table-column>
+ <el-table-column prop="lastVisitDate" label="鏈�鍚庢嫓璁挎椂闂�" min-width="130px"></el-table-column>
</el-table>
<pagination
@size-change="handleSizeChange"
diff --git a/admin/src/views/business/visits.vue b/admin/src/views/business/visits.vue
index bfac6a3..a781692 100644
--- a/admin/src/views/business/visits.vue
+++ b/admin/src/views/business/visits.vue
@@ -1,36 +1,39 @@
<template>
<TableLayout :permissions="['business:visits:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="name">
- <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="韬唤璇佸彿" prop="idcardNo">
- <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="璁垮鍗曚綅" prop="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ瀹㈠崟浣�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="瀹℃壒鐘舵��" prop="status">
- <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
- <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
- <el-option label="瀹℃壒涓�" value="1"></el-option>
- <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
- <el-option label="瀹℃壒椹冲洖" value="3"></el-option>
- <el-option label="鍙栨秷" value="4"></el-option>
- <el-option label="涓嬪彂鎴愬姛" value="5"></el-option>
- <el-option label="涓嬪彂澶辫触" value="6"></el-option>
- <el-option label="鎷滆涓�" value="7"></el-option>
- <el-option label="宸茬绂�" value="8"></el-option>
- <el-option label="宸插け鏁�" value="9"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div slot="search-form" ref="QueryFormRef">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="濮撳悕/鎵嬫満鍙�" prop="name">
+ <el-input v-model="searchForm.name" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="韬唤璇佸彿" prop="idcardNo">
+ <el-input v-model="searchForm.idcardNo" placeholder="璇疯緭鍏ヨ韩浠借瘉鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="璁垮鍗曚綅" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ヨ瀹㈠崟浣�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="瀹℃壒鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" placeholder="璇烽�夋嫨">
+ <el-option label="寰呮彁浜ゅ鎵�" value="0"></el-option>
+ <el-option label="瀹℃壒涓�" value="1"></el-option>
+ <el-option label="瀹℃牳閫氳繃" value="2"></el-option>
+ <el-option label="瀹℃壒椹冲洖" value="3"></el-option>
+ <el-option label="鍙栨秷" value="4"></el-option>
+ <el-option label="涓嬪彂鎴愬姛" value="5"></el-option>
+ <el-option label="涓嬪彂澶辫触" value="6"></el-option>
+ <el-option label="鎷滆涓�" value="7"></el-option>
+ <el-option label="宸茬绂�" value="8"></el-option>
+ <el-option label="宸插け鏁�" value="9"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <!-- <el-button type="primary" :loading="isWorking.export" v-permissions="['business:visits:exportExcel']" @click="exportExcel">瀵煎嚭</el-button>-->
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:visits:create', 'business:visits:exportExcel']">
@@ -39,7 +42,8 @@
<li><el-button type="primary" :loading="isWorking.export" @click="exportExcel"
v-permissions="['business:visits:exportExcel']">瀵煎嚭</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="璁垮濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="phone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
@@ -89,14 +93,16 @@
<el-table-column v-if="containPermissions(['business:visits:update', 'business:visits:delete'])" label="鎿嶄綔"
min-width="200" fixed="right">
<template slot-scope="{row}">
- <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red" v-if="row.status == 7">绂诲満</el-button>
+ <el-button type="text" @click="departure(row.id)" icon="el-icon-delete" style="color: red"
+ v-if="row.status == 7">绂诲満</el-button>
<!-- <el-button type="text" @click="cancel(row.id)" v-permissions="['business:visits:cancel']"
icon="el-icon-delete" style="color: red" v-if="row.status == 5">鍙栨秷棰勭害</el-button>-->
<el-button type="text" @click="resend(row.id)" v-permissions="['business:visits:update']"
icon="el-icon-edit" v-if="row.status == 6">閲嶆柊涓嬪彂</el-button>
<!-- <el-button type="text" @click="$refs.OperaVisitsDesWindow.open('璇︽儏', row.id)" icon="el-icon-view">璇︽儏</el-button> -->
<el-button type="text" @click="handleDetail(row)" icon="el-icon-view">璇︽儏</el-button>
- <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red" v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
+ <el-button type="text" icon="el-icon-delete" @click="deleteById(row)" style="color: red"
+ v-permissions="['business:visits:delete']">鍒犻櫎</el-button>
<!-- <el-button type="text" @click="deleteById(row)" icon="el-icon-delete" v-permissions="['business:visits:delete']">鏌ヨ瀹℃壒缁撴灉</el-button>-->
</template>
</el-table-column>
@@ -147,6 +153,11 @@
})
this.search()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
handleDetail(row) {
this.isShowDetail = true
diff --git a/admin/src/views/meeting/rooms.vue b/admin/src/views/meeting/rooms.vue
index 9742cab..7e3b102 100644
--- a/admin/src/views/meeting/rooms.vue
+++ b/admin/src/views/meeting/rooms.vue
@@ -88,8 +88,8 @@
></el-switch>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="140px"></el-table-column>
- <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" align="center" min-width="160px"></el-table-column>
+ <el-table-column prop="editDate" label="鏇存柊鏃堕棿" min-width="160px"></el-table-column>
<!-- <el-table-column prop="editor" label="鏇存柊浜虹紪鐮�" min-width="100px"></el-table-column>
<el-table-column prop="isdeleted" label="鏄惁鍒犻櫎0鍚� 1鏄�" min-width="100px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px"></el-table-column>
diff --git a/admin/src/views/operation/danger/areaSet.vue b/admin/src/views/operation/danger/areaSet.vue
index 6423fdc..0964cd1 100644
--- a/admin/src/views/operation/danger/areaSet.vue
+++ b/admin/src/views/operation/danger/areaSet.vue
@@ -26,11 +26,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="闅愭偅鍖哄煙" min-width="120px"></el-table-column>
- <el-table-column prop="companyName" label="璐ｄ换閮ㄩ棬" min-width="120px"></el-table-column>
+ <el-table-column prop="name" show-overflow-tooltip label="闅愭偅鍖哄煙" min-width="120px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="120px"></el-table-column>
<el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="70px"></el-table-column>
- <el-table-column prop="memberNames" label="瀹夊叏鍛�" min-width="80px"></el-table-column>
- <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="160px"></el-table-column>
+ <el-table-column prop="memberNames" show-overflow-tooltip label="瀹夊叏鍛�" min-width="80px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" width="160px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:hiddendangerparam:update', 'business:hiddendangerparam:delete' ])"
label="鎿嶄綔"
diff --git a/admin/src/views/operation/danger/record.vue b/admin/src/views/operation/danger/record.vue
index a685a96..fc53b4c 100644
--- a/admin/src/views/operation/danger/record.vue
+++ b/admin/src/views/operation/danger/record.vue
@@ -75,11 +75,11 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="dutyCompanyName" label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
- <el-table-column prop="areaName" label="闅愭偅鍖哄煙" min-width="150px"></el-table-column>
+ <el-table-column prop="dutyCompanyName" show-overflow-tooltip label="璐ｄ换閮ㄩ棬" min-width="150px"></el-table-column>
+ <el-table-column prop="areaName" label="闅愭偅鍖哄煙" show-overflow-tooltip min-width="150px"></el-table-column>
<el-table-column prop="categoryName" label="闅愭偅绫诲瀷" min-width="150px"></el-table-column>
<el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
+ <el-table-column prop="companyName" show-overflow-tooltip label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
<el-table-column prop="createDate" label="鎻愭姤鏃堕棿" min-width="150px"></el-table-column>
<el-table-column label="澶勭悊缁撴灉" min-width="100px">
<template slot-scope="{row}">
diff --git a/admin/src/views/operation/danger/typeSet.vue b/admin/src/views/operation/danger/typeSet.vue
index 1d5bbb9..17cb72b 100644
--- a/admin/src/views/operation/danger/typeSet.vue
+++ b/admin/src/views/operation/danger/typeSet.vue
@@ -23,13 +23,13 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="name" label="闅愭偅绫诲瀷" min-width="200px"></el-table-column>
- <el-table-column prop="sortnum" label="鎺掑簭鐮�" min-width="100px"></el-table-column>
- <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="200px"></el-table-column>
+ <el-table-column prop="name" label="闅愭偅绫诲瀷" show-overflow-tooltip min-width="200px"></el-table-column>
+ <el-table-column prop="sortnum" label="鎺掑簭鐮�" width="100px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" width="170px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:hiddendangerparam:update', 'business:hiddendangerparam:delete' ])"
label="鎿嶄綔"
- min-width="250"
+ width="140"
fixed="right"
>
<template slot-scope="{row}">
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 7c6e24d..01da171 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,160 +1,83 @@
<template>
<TableLayout :permissions="['business:empower:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form
- ref="searchForm"
- slot="search-form"
- :model="searchForm"
- label-width="100px"
- inline
- >
- <el-form-item label="鐢宠浜�" prop="memberName">
- <el-input
- v-model="searchForm.memberName"
- placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�"
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="鐢宠浜虹粍缁�" prop="companyName">
- <el-input
- v-model="searchForm.companyName"
- placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐"
- clearable
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="杞︾墝鍙�" prop="carCode">
- <el-input
- v-model="searchForm.carCode"
- placeholder="璇疯緭鍏ヨ溅鐗屽彿"
- clearable
- @keypress.enter.native="search"
- ></el-input>
- </el-form-item>
- <el-form-item label="鐘舵��" prop="status">
- <el-select
- v-model="searchForm.status"
- @change="search"
- clearable
- placeholder="鐘舵��"
- >
- <el-option label="鐢宠涓�" value="0"></el-option>
- <el-option label="瀹℃牳涓�" value="1"></el-option>
- <el-option label="瀹℃壒閫氳繃" value="2"></el-option>
- <el-option label="瀹℃壒涓嶉�氳繃" value="3"></el-option>
- <el-option label="宸叉挙閿�" value="4"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鐩殑鍦扮被鍨�" prop="type">
- <el-select
- v-model="searchForm.type"
- @change="search"
- clearable
- placeholder="鐩殑鍦扮被鍨�"
- >
- <el-option label="甯傚唴鐢ㄨ溅" value="0"></el-option>
- <el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
- <el-date-picker
- @change="seleTime"
- v-model="time"
- @keypress.enter.native="search"
- type="datetimerange"
- format="yyyy-MM-dd HH:mm:ss"
- value-format="yyyy-MM-dd HH:mm:ss"
- :default-time="['00:00:00', '23:59:59']"
- range-separator="鑷�"
- start-placeholder="寮�濮嬫棩鏈�"
- end-placeholder="缁撴潫鏃ユ湡"
- >
- </el-date-picker>
- </el-form-item>
- <el-radio-group
- v-model="searchForm.radio"
- size="small"
- @input="changeRadio"
- >
- <el-radio-button label="0">褰撳ぉ</el-radio-button>
- <el-radio-button label="1">杩�7澶�</el-radio-button>
- <el-radio-button label="2">杩�30澶�</el-radio-button>
- </el-radio-group>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="鐢宠浜�" prop="memberName">
+ <el-input v-model="searchForm.memberName" placeholder="璇疯緭鍏ュ鍚�/鎵嬫満鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐢宠浜虹粍缁�" prop="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ敵璇蜂汉缁勭粐" clearable
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="璇疯緭鍏ヨ溅鐗屽彿" clearable
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="鐘舵��" prop="status">
+ <el-select v-model="searchForm.status" @change="search" clearable placeholder="鐘舵��">
+ <el-option label="鐢宠涓�" value="0"></el-option>
+ <el-option label="瀹℃牳涓�" value="1"></el-option>
+ <el-option label="瀹℃壒閫氳繃" value="2"></el-option>
+ <el-option label="瀹℃壒涓嶉�氳繃" value="3"></el-option>
+ <el-option label="宸叉挙閿�" value="4"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鐩殑鍦扮被鍨�" prop="type">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="鐩殑鍦扮被鍨�">
+ <el-option label="甯傚唴鐢ㄨ溅" value="0"></el-option>
+ <el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+ <el-date-picker @change="seleTime" v-model="time" @keypress.enter.native="search" type="datetimerange"
+ format="yyyy-MM-dd HH:mm:ss" value-format="yyyy-MM-dd HH:mm:ss" :default-time="['00:00:00', '23:59:59']"
+ range-separator="鑷�" start-placeholder="寮�濮嬫棩鏈�" end-placeholder="缁撴潫鏃ユ湡">
+ </el-date-picker>
+ </el-form-item>
+ <el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
+ <el-radio-button label="0">褰撳ぉ</el-radio-button>
+ <el-radio-button label="1">杩�7澶�</el-radio-button>
+ <el-radio-button label="2">杩�30澶�</el-radio-button>
+ </el-radio-group>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul
- class="toolbar"
- v-permissions="[
- 'business:carusebook:create',
- 'business:carusebook:exportExcel',
- ]"
- >
+ <ul class="toolbar" v-permissions="[
+ 'business:carusebook:create',
+ 'business:carusebook:exportExcel',
+ ]">
<li>
- <el-button
- type="primary"
- @click="handleEdit"
- icon="el-icon-plus"
- v-permissions="['business:carusebook:create']"
- >鏂板缓</el-button
- >
+ <el-button type="primary" @click="handleEdit" icon="el-icon-plus"
+ v-permissions="['business:carusebook:create']">鏂板缓</el-button>
</li>
<li>
- <el-button
- type="primary"
- @click="handleEx"
- v-permissions="['business:carusebook:exportExcel']"
- >瀵煎嚭</el-button
- >
+ <el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button>
</li>
</ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column
- prop="carCode"
- label="杞︾墝鍙�"
- min-width="100px"
- ></el-table-column>
- <el-table-column
- prop="memberName"
- label="鎻愭姤浜�"
- min-width="80px"
- ></el-table-column>
- <el-table-column
- prop="memberNames"
- label="涔樿溅浜�"
- min-width="180px"
- ></el-table-column>
- <el-table-column
- prop="companyName"
- label="鎵�灞炵粍缁�"
- min-width="150px"
- ></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
+ <el-table-column prop="memberName" label="鎻愭姤浜�" min-width="80px"></el-table-column>
+ <el-table-column prop="memberNames" label="涔樿溅浜�" min-width="180px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="150px"></el-table-column>
<el-table-column label="鐢ㄨ溅鏃堕棿" min-width="170px">
<template slot-scope="{ row }">
- <span v-if="row.startTime">璧�:{{ row.startTime.slice(0,16) }}</span
- ><br />
- <span v-if="row.endTime">姝�:{{ row.endTime.slice(0,16) }}</span>
+ <span v-if="row.startTime">璧�:{{ row.startTime.slice(0, 16) }}</span><br />
+ <span v-if="row.endTime">姝�:{{ row.endTime.slice(0, 16) }}</span>
</template>
</el-table-column>
- <el-table-column
- prop="planUseDate"
- label="鍑哄彂鏃堕棿"
- min-width="150px"
- >
- <template slot-scope="{ row }">
- <span v-if="row.planUseDate">{{ row.planUseDate.slice(0,16) }}</span>
- </template>
- </el-table-column>
+ <el-table-column prop="planUseDate" label="鍑哄彂鏃堕棿" min-width="150px">
+ <template slot-scope="{ row }">
+ <span v-if="row.planUseDate">{{ row.planUseDate.slice(0, 16) }}</span>
+ </template>
+ </el-table-column>
<el-table-column label="鐩殑鍦�" min-width="200px">
<template slot-scope="{ row }">
<span class="status-green" v-if="row.type === 0">銆愬競鍐呫��</span>
@@ -172,58 +95,28 @@
</template>
</el-table-column>
- <el-table-column
- prop="createDate"
- label="鐢宠鏃堕棿"
- min-width="150px"
- ></el-table-column>
- <el-table-column
- prop="editDate"
- label="鎿嶄綔鏃堕棿"
- min-width="150px"
- ></el-table-column>
- <el-table-column
- label="鎿嶄綔"
- min-width="160"
- align="center"
- fixed="right"
- >
+ <el-table-column prop="createDate" label="鐢宠鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
+ <el-table-column label="鎿嶄綔" min-width="160" align="center" fixed="right">
<template slot-scope="{ row }">
- <el-button
- type="text"
- icon="el-icon-edit"
- @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)"
- >鏌ョ湅璇︽儏</el-button
- >
+ <el-button type="text" icon="el-icon-edit"
+ @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�', row)">鏌ョ湅璇︽儏</el-button>
<!-- <el-button v-if="(row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button> -->
- <el-button style="color: red" v-if=" (row.status === 0 || row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime() " type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
- <el-button style="color: red" type="text" icon="el-icon-delete" @click="deleteById(row)" >鍒犻櫎</el-button>
+ <el-button style="color: red"
+ v-if="(row.status === 0 || row.status === 1 || row.status === 2) && new Date().getTime() < new Date(row.startTime).getTime()"
+ type="text" icon="el-icon-delete" @click="rowRevokeClick(row)">鎾ら攢</el-button>
+ <el-button style="color: red" type="text" icon="el-icon-delete" @click="deleteById(row)">鍒犻櫎</el-button>
</template>
</el-table-column>
</el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
</pagination>
</template>
<!-- -->
<el-dialog title="鐢ㄨ溅鎾ら攢" :visible.sync="isShowBack" width="520px">
- <el-form
- :model="backParam"
- :rules="rules"
- ref="backForm"
- label-width="100px"
- class="demo-ruleForm"
- >
+ <el-form :model="backParam" :rules="rules" ref="backForm" label-width="100px" class="demo-ruleForm">
<el-form-item label="璇存槑" prop="info">
- <el-input
- type="textarea"
- :rows="4"
- v-model="backParam.info"
- placeholder="璇疯緭鍏ユ挙閿�璇存槑"
- ></el-input>
+ <el-input type="textarea" :rows="4" v-model="backParam.info" placeholder="璇疯緭鍏ユ挙閿�璇存槑"></el-input>
</el-form-item>
</el-form>
<span slot="footer" class="dialog-footer">
@@ -231,10 +124,7 @@
<el-button type="primary" @click="backSubmit">纭畾</el-button>
</span>
</el-dialog>
- <OperaCarUseBookWindow
- ref="OperaDetailsWindow"
- @success="handlePageChange"
- />
+ <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange" />
<OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search" />
</TableLayout>
</template>
@@ -252,7 +142,7 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -275,7 +165,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '鐢ㄨ溅鐢宠绠＄悊',
api: '/business/carUseBook',
@@ -286,8 +176,13 @@
this.changeRadio('0')
this.loadParams()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
- rowRevokeClick (row) {
+ rowRevokeClick(row) {
this.isShowBack = true
this.backParam = {}
this.$set(this.backParam, 'id', row.id)
@@ -295,14 +190,14 @@
this.$refs.backForm.clearValidate()
})
},
- backSubmit () {
+ backSubmit() {
revokeById({ ...this.backParam }).then(res => {
this.$tip.success('鎾ら攢鎴愬姛')
this.isShowBack = false
this.search()
})
},
- handleEx () {
+ handleEx() {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
this.exLoading = true
@@ -319,7 +214,7 @@
})
})
},
- changeRadio (e) {
+ changeRadio(e) {
this.searchForm.radio = e
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
@@ -336,10 +231,10 @@
}
this.search()
},
- handleEdit () {
+ handleEdit() {
this.$refs.OperaParamWindow.open()
},
- loadParams () {
+ loadParams() {
allList({
})
.then(res => {
@@ -360,13 +255,13 @@
.finally(() => {
})
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.queryStartTime = e[0]
this.searchForm.queryEndTime = e[1]
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
this.searchForm.radio = '0'
this.changeRadio('0')
diff --git a/admin/src/views/operation/serviceCar/driverConfig.vue b/admin/src/views/operation/serviceCar/driverConfig.vue
index 3878456..b7bb9fa 100644
--- a/admin/src/views/operation/serviceCar/driverConfig.vue
+++ b/admin/src/views/operation/serviceCar/driverConfig.vue
@@ -23,15 +23,15 @@
@selection-change="handleSelectionChange"
>
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="memberName" label="濮撳悕" min-width="150px"></el-table-column>
- <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="200px"></el-table-column>
+ <el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
+ <el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="120px"></el-table-column>
<el-table-column prop="memberSex" label="鎬у埆" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.memberSex == 1">鐢�</span>
<span v-if="row.memberSex == 2">濂�</span>
</template>
</el-table-column>
- <el-table-column prop="companyName" label="缁勭粐" min-width="260px"></el-table-column>
+ <el-table-column prop="companyName" label="缁勭粐" show-overflow-tooltip min-width="260px"></el-table-column>
<el-table-column prop="carCode" label="杞︾墝鍙�" min-width="100px"></el-table-column>
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
diff --git a/admin/src/views/platform/gas.vue b/admin/src/views/platform/gas.vue
index 7cb6c13..51bbff9 100644
--- a/admin/src/views/platform/gas.vue
+++ b/admin/src/views/platform/gas.vue
@@ -38,7 +38,7 @@
</template>
</el-table-column>
<el-table-column prop="num" label="鐢ㄦ皵閲忥紙绔嬫柟绫筹級" fixed min-width="150px"></el-table-column>
- <el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
+ <el-table-column show-overflow-tooltip prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])"
diff --git a/admin/src/views/platform/oil.vue b/admin/src/views/platform/oil.vue
index 8ae45c5..13c9778 100644
--- a/admin/src/views/platform/oil.vue
+++ b/admin/src/views/platform/oil.vue
@@ -40,7 +40,7 @@
</template>
</el-table-column>
<el-table-column prop="num" label="娌硅�楋紙鍗囷級" fixed min-width="150px"></el-table-column>
- <el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
+ <el-table-column show-overflow-tooltip prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])" label="鎿嶄綔"
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index fc0e89f..ea6a838 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -1,24 +1,26 @@
<template>
<TableLayout :permissions="['business:platform:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <SearchFormCollapse slot="search-form" :need-more="false">
- <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="name">
- <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
- @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="">
- <el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
- <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
- </el-option>
- </el-select>
- </el-form-item>
- <!-- <section> -->
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- <!-- </section> -->
- </el-form>
- </SearchFormCollapse>
+ <div ref="QueryFormRef" slot="search-form">
+ <SearchFormCollapse :need-more="false">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="name">
+ <el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="">
+ <el-select v-model="searchForm.groupId" placeholder="璇烽�夋嫨鏈堝彴鍒嗙粍" @change="search" clearable>
+ <el-option v-for="item in groupList" :key="item.id" :label="item.name" :value="item.id">
+ </el-option>
+ </el-select>
+ </el-form-item>
+ <!-- <section> -->
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ <!-- </section> -->
+ </el-form>
+ </SearchFormCollapse>
+ </div>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar" v-permissions="['business:hksync:platforms']">
@@ -27,7 +29,7 @@
<li><el-button type="primary" :loading="working1" @click="syncStatus" icon="el-icon-plus"
v-permissions="['business:hksync:platforms']">鍚屾瀹炴椂鐘舵��</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
<el-table-column prop="name" label="鏈堝彴鍚嶇О" fixed min-width="100px"></el-table-column>
<el-table-column prop="code" label="鏈堝彴缂栫爜" fixed min-width="100px"></el-table-column>
@@ -110,6 +112,11 @@
this.search()
this.loadGroupList()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
loadGroupList() {
allList({})
diff --git a/admin/src/views/platform/smokebox.vue b/admin/src/views/platform/smokebox.vue
index 19c12f6..f35a28e 100644
--- a/admin/src/views/platform/smokebox.vue
+++ b/admin/src/views/platform/smokebox.vue
@@ -39,7 +39,7 @@
</template>
</el-table-column>
<el-table-column prop="num" label="鐑熺閲忥紙涓級" fixed min-width="150px"></el-table-column>
- <el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
+ <el-table-column show-overflow-tooltip prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])"
diff --git a/admin/src/views/platform/water.vue b/admin/src/views/platform/water.vue
index 1adb08a..3348273 100644
--- a/admin/src/views/platform/water.vue
+++ b/admin/src/views/platform/water.vue
@@ -39,7 +39,7 @@
</template>
</el-table-column>
<el-table-column prop="num" label="鐢ㄦ按閲忥紙鍚級" fixed min-width="150px"></el-table-column>
- <el-table-column prop="content" label="璇存槑" min-width="120px"></el-table-column>
+ <el-table-column show-overflow-tooltip prop="content" label="璇存槑" min-width="120px"></el-table-column>
<el-table-column prop="editDate" label="鏈�杩戞搷浣滄椂闂�" min-width="140px"></el-table-column>
<el-table-column
v-if="containPermissions(['business:platformwatergas:update', 'business:platformwatergas:delete'])"
diff --git a/admin/src/views/system/permission.vue b/admin/src/views/system/permission.vue
index 18935a1..56a021b 100644
--- a/admin/src/views/system/permission.vue
+++ b/admin/src/views/system/permission.vue
@@ -28,7 +28,7 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="200px"></el-table-column>
+ <el-table-column prop="code" label="鏉冮檺缂栫爜" fixed="left" min-width="240px"></el-table-column>
<el-table-column prop="name" label="鏉冮檺鍚嶇О" fixed="left" min-width="200px"></el-table-column>
<el-table-column prop="remark" label="鏉冮檺澶囨敞" min-width="200px"></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
diff --git a/admin/src/views/system/role.vue b/admin/src/views/system/role.vue
index cfb8d9d..0d44875 100644
--- a/admin/src/views/system/role.vue
+++ b/admin/src/views/system/role.vue
@@ -28,21 +28,21 @@
@sort-change="handleSortChange"
>
<el-table-column type="selection" fixed="left" width="55"></el-table-column>
- <el-table-column prop="code" label="瑙掕壊缂栫爜" fixed="left" min-width="100px"></el-table-column>
- <el-table-column prop="name" label="瑙掕壊鍚嶇О" fixed="left" min-width="100px"></el-table-column>
- <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="120px"></el-table-column>
+ <el-table-column prop="code" label="瑙掕壊缂栫爜" show-overflow-tooltip fixed="left" min-width="100px"></el-table-column>
+ <el-table-column prop="name" label="瑙掕壊鍚嶇О" show-overflow-tooltip fixed="left" min-width="140px"></el-table-column>
+ <el-table-column prop="remark" label="瑙掕壊澶囨敞" min-width="130px" show-overflow-tooltip></el-table-column>
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="140px" sortable="custom" sort-by="role.CREATE_TIME"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" min-width="150px" sortable="custom" sort-by="role.CREATE_TIME"></el-table-column>
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="140px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['system:role:update', 'system:role:createRolePermission','system:datapermission:create', 'system:role:createRoleMenu', 'system:role:delete'])"
label="鎿嶄綔"
- min-width="270"
+ min-width="300"
fixed="right"
>
<template v-if="isAdmin || (row.code !== adminCode && userInfo.roles.findIndex(code => code === row.code) === -1)" slot-scope="{row}">
diff --git a/admin/src/views/system/user.vue b/admin/src/views/system/user.vue
index fefcc31..2295442 100644
--- a/admin/src/views/system/user.vue
+++ b/admin/src/views/system/user.vue
@@ -48,7 +48,7 @@
<el-table-column prop="realname" label="濮撳悕" width="80px" fixed="left"></el-table-column>
<el-table-column prop="username" label="鐢ㄦ埛鍚�" min-width="120px"></el-table-column>
<el-table-column prop="empNo" label="宸ュ彿" sortable="custom" sort-by="EMP_NO" min-width="80px"></el-table-column>
- <el-table-column prop="companyName" label="鎵�灞炵粍缁�" min-width="250px"></el-table-column>
+ <el-table-column prop="companyName" label="鎵�灞炵粍缁�" show-overflow-tooltip min-width="250px"></el-table-column>
<!-- <el-table-column prop="department" label="閮ㄩ棬" min-width="120px">-->
<!-- <template slot-scope="{row}">{{row.department == null ? '' : row.department.name}}</template>-->
<!-- </el-table-column>-->
@@ -65,7 +65,7 @@
</template>
</el-table-column>
<el-table-column prop="mobile" label="鎵嬫満鍙风爜" min-width="100px"></el-table-column>
- <el-table-column prop="openid" label="寰俊openid" min-width="100px"></el-table-column>
+ <el-table-column prop="openid" label="寰俊openid" show-overflow-tooltip min-width="100px"></el-table-column>
<!-- <el-table-column prop="email" label="閭" min-width="180px"></el-table-column>-->
<!-- <el-table-column prop="birthday" label="鐢熸棩" sortable="custom" sort-by="BIRTHDAY" min-width="100px"></el-table-column>-->
<el-table-column prop="roles" label="瑙掕壊" min-width="160px" class-name="table-column-strings">
@@ -78,11 +78,11 @@
<el-table-column prop="createUser" label="鍒涘缓浜�" min-width="100px">
<template slot-scope="{row}">{{row.createUserInfo == null ? '' : row.createUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="140px"></el-table-column>
+ <el-table-column prop="createTime" label="鍒涘缓鏃堕棿" sortable="custom" sort-by="CREATE_TIME" min-width="150px"></el-table-column>
<el-table-column prop="updateUser" label="鏇存柊浜�" min-width="100px">
<template slot-scope="{row}">{{row.updateUserInfo == null ? '' : row.updateUserInfo.username}}</template>
</el-table-column>
- <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" sortable="custom" sort-by="UPDATE_TIME" min-width="140px"></el-table-column>
+ <el-table-column prop="updateTime" label="鏇存柊鏃堕棿" sortable="custom" sort-by="UPDATE_TIME" min-width="150px"></el-table-column>
<el-table-column
v-if="containPermissions(['system:user:update', 'system:user:createUserRole', 'system:user:resetPwd', 'system:user:delete'])"
label="鎿嶄綔"
diff --git a/admin/src/views/vehicle/cars.vue b/admin/src/views/vehicle/cars.vue
index 2d74182..59ac763 100644
--- a/admin/src/views/vehicle/cars.vue
+++ b/admin/src/views/vehicle/cars.vue
@@ -1,60 +1,66 @@
<template>
<TableLayout :permissions="['business:member:query']">
<!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item label="" prop="code" title="杞︾墝鍙�">
- <el-input v-model="searchForm.code" clearable placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="memberName" title="杞︿富淇℃伅">
- <el-input v-model="searchForm.memberName" clearable placeholder="杞︿富淇℃伅"
- @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="catePName" title="鍒嗙被鍚嶇О">
- <el-cascader v-model="searchForm.cateIds" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable :options="cateList" :props="{
- label: 'name',
- value: 'id',
- children: 'childCategoryList',
- checkStrictly: true
- }"></el-cascader>
- </el-form-item>
- <el-form-item label="" prop="companyName" title="杞︿富缁勭粐鍚嶇О">
- <el-input v-model="searchForm.companyName" clearable placeholder="杞︿富缁勭粐鍚嶇О"
- @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="" prop="authStatus" title="鏄惁鎺堟潈">
- <el-select v-model="searchForm.authStatus" @change="search" clearable placeholder="鏄惁鎺堟潈">
- <el-option label="宸叉巿鏉�" value="1"></el-option>
- <el-option label="鏈巿鏉�" value="0"></el-option>
- </el-select>
- </el-form-item>
- <el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
- <el-select v-model="searchForm.type" @change="search" clearable placeholder="澶囨敞">
- <el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
- <el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
- <el-option label="鍏朵粬" value="2"></el-option>
- </el-select>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item label="" prop="code" title="杞︾墝鍙�">
+ <el-input v-model="searchForm.code" clearable placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="memberName" title="杞︿富淇℃伅">
+ <el-input v-model="searchForm.memberName" clearable placeholder="杞︿富淇℃伅"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="catePName" title="鍒嗙被鍚嶇О">
+ <el-cascader v-model="searchForm.cateIds" @change="changeSel" placeholder="璇烽�夋嫨鍒嗙被" clearable
+ :options="cateList" :props="{
+ label: 'name',
+ value: 'id',
+ children: 'childCategoryList',
+ checkStrictly: true
+ }"></el-cascader>
+ </el-form-item>
+ <el-form-item label="" prop="companyName" title="杞︿富缁勭粐鍚嶇О">
+ <el-input v-model="searchForm.companyName" clearable placeholder="杞︿富缁勭粐鍚嶇О"
+ @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <el-form-item label="" prop="authStatus" title="鏄惁鎺堟潈">
+ <el-select v-model="searchForm.authStatus" @change="search" clearable placeholder="鏄惁鎺堟潈">
+ <el-option label="宸叉巿鏉�" value="1"></el-option>
+ <el-option label="鏈巿鏉�" value="0"></el-option>
+ </el-select>
+ </el-form-item>
+ <el-form-item label="" prop="type" title="涓氬姟绫诲瀷">
+ <el-select v-model="searchForm.type" @change="search" clearable placeholder="澶囨敞">
+ <el-option label="瀹夋嘲鍏姟杞�" value="0"></el-option>
+ <el-option label="瀹夋嘲鑷湁鐗╂祦杞�" value="1"></el-option>
+ <el-option label="鍏朵粬" value="2"></el-option>
+ </el-select>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
<ul class="toolbar"
v-permissions="['business:cars:create', 'business:cars:exportExcel', 'business:parkBook:create']">
<li><el-button type="primary" @click="handleEdit" icon="el-icon-plus"
v-permissions="['business:cars:create']">鏂板缓</el-button></li>
- <li><el-button type="primary" @click="$refs.OperaCarsImportWindowRef.open('杞﹁締瀵煎叆', searchForm.companyType)" v-permissions="['business:cars:create']">杞﹁締瀵煎叆</el-button>
+ <li><el-button type="primary" @click="$refs.OperaCarsImportWindowRef.open('杞﹁締瀵煎叆', searchForm.companyType)"
+ v-permissions="['business:cars:create']">杞﹁締瀵煎叆</el-button>
</li>
<li><el-button type="primary" @click="exportExcel" v-permissions="['business:cars:exportExcel']">瀵煎嚭</el-button>
</li>
<li><el-button type="primary" @click="startEmpowerBatch" icon="el-icon-plus"
v-permissions="['business:parkbook:create']">涓嬪彂鎺堟潈</el-button></li>
</ul>
- <el-table v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
<el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="code" label="杞︾墝鍙�" fixed="left" min-width="100px"></el-table-column>
+ <el-table-column prop="code" label="杞︾墝鍙�" fixed="left" min-width="100px"></el-table-column>
<el-table-column prop="memberName" label="杞︿富濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="memberPhone" label="杞︿富鎵嬫満鍙�" min-width="100px"></el-table-column>
<el-table-column prop="catePName" label="涓�绾у垎绫�" min-width="120px"></el-table-column>
@@ -137,7 +143,7 @@
export default {
name: 'Cars',
extends: BaseTable,
- components: { TableLayout, Pagination, OperaCarsWindow, OperaCarAuthWindow,OperaCarsImportWindow },
+ components: { TableLayout, Pagination, OperaCarsWindow, OperaCarAuthWindow, OperaCarsImportWindow },
data() {
return {
// 鎼滅储
@@ -167,6 +173,11 @@
this.search()
this.getCate()
},
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
+ })
+ },
methods: {
// handleSelectionChange(e) {
// this.searchForm.ids = e.map(i => i.id).join(',')
diff --git a/admin/src/views/vehicle/parkBook.vue b/admin/src/views/vehicle/parkBook.vue
index 5902ae2..51244de 100644
--- a/admin/src/views/vehicle/parkBook.vue
+++ b/admin/src/views/vehicle/parkBook.vue
@@ -63,13 +63,13 @@
</el-table-column>
<el-table-column prop="memberName" label="濮撳悕" min-width="100px"></el-table-column>
<el-table-column prop="memberPhone" label="鎵嬫満鍙�" min-width="100px"></el-table-column>
- <el-table-column prop="companyName" label="缁勭粐" min-width="100px"></el-table-column>
+ <el-table-column prop="companyName" label="缁勭粐" min-width="150px"></el-table-column>
<el-table-column prop="remark" label="澶囨敞" min-width="100px">
<template slot-scope="{row}">
<span v-if="row.isdeleted !=2">{{row.remark}}</span>
</template>
</el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="150px"></el-table-column>
<!-- <el-table-column-->
<!-- v-if="containPermissions(['business:member:update', 'business:member:delete'])"-->
<!-- label="鎿嶄綔"-->
diff --git a/admin/src/views/vehicle/visitPark.vue b/admin/src/views/vehicle/visitPark.vue
index 680b58c..908a221 100644
--- a/admin/src/views/vehicle/visitPark.vue
+++ b/admin/src/views/vehicle/visitPark.vue
@@ -1,65 +1,60 @@
<template>
- <TableLayout :permissions="['business:visitpark:query']">
- <!-- 鎼滅储琛ㄥ崟 -->
- <el-form ref="searchForm" slot="search-form" :model="searchForm" label-width="100px" inline>
- <el-form-item title="杞︾墝鍙�" prop="carCode">
- <el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <section>
- <el-button type="primary" @click="search">鎼滅储</el-button>
- <el-button @click="reset">閲嶇疆</el-button>
- </section>
- </el-form>
- <!-- 琛ㄦ牸鍜屽垎椤� -->
- <template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:visitpark:create', 'business:visitpark:delete']">
- </ul>
- <el-table
- v-loading="isWorking.search"
- :data="tableData.list"
- stripe
- @selection-change="handleSelectionChange"
- >
- <el-table-column type="selection" width="55"></el-table-column>
- <el-table-column prop="carCode" label="杞︾墝鍙�" fixed min-width="100px"></el-table-column>
- <el-table-column prop="parksName" label="鍋滆溅鍦�" fixed min-width="100px"></el-table-column>
- <el-table-column prop="startTime" label="鏈夋晥鏈�" align="center" fixed min-width="150px">
- <template slot-scope="{row}">
- <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
- <div v-else>
- <span style="color: green">璧凤細{{row.startTime}}</span><br/>
- <span style="color: red">姝細{{row.endTime}}</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="startTime" label="鐘舵��" fixed min-width="100px">
- <template slot-scope="{row}">
- <div v-if="row.isdeleted==1" style="color: red">宸插垹闄�</div>
- <div v-else style="color: green">
- <span v-if="row.hkStatus==0" style="color: #435EBE">寰呬笅鍙�</span>
- <span v-if="row.hkStatus==1" style="color: green">棰勭害鎴愬姛</span>
- <span v-if="row.hkStatus==2" style="color: red">棰勭害澶辫触</span>
- <span v-if="row.hkStatus==2" style="color: red">宸插彇娑�</span>
- </div>
- </template>
- </el-table-column>
- <el-table-column prop="remark" label="澶囨敞" min-width="100px">
- <template slot-scope="{row}">
- <span v-if="row.isdeleted !=2">{{row.remark}}</span>
- </template>
- </el-table-column>
- <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- <!-- 鏂板缓/淇敼 -->
- <OperaCarsWindow ref="operaCarsWindow" @success="handlePageChange"/>
- </TableLayout>
+ <TableLayout :permissions="['business:visitpark:query']">
+ <!-- 鎼滅储琛ㄥ崟 -->
+ <div ref="QueryFormRef" slot="search-form">
+ <el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
+ <el-form-item title="杞︾墝鍙�" prop="carCode">
+ <el-input v-model="searchForm.carCode" placeholder="杞︾墝鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <section>
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ </section>
+ </el-form>
+ </div>
+
+ <!-- 琛ㄦ牸鍜屽垎椤� -->
+ <template v-slot:table-wrap>
+ <ul class="toolbar" v-permissions="['business:visitpark:create', 'business:visitpark:delete']">
+ </ul>
+ <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ @selection-change="handleSelectionChange">
+ <el-table-column type="selection" width="55"></el-table-column>
+ <el-table-column prop="carCode" label="杞︾墝鍙�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="parksName" label="鍋滆溅鍦�" fixed min-width="100px"></el-table-column>
+ <el-table-column prop="startTime" label="鏈夋晥鏈�" align="center" fixed min-width="150px">
+ <template slot-scope="{row}">
+ <div v-if="!row.startTime || !row.endTime">闀挎湡鏈夋晥</div>
+ <div v-else>
+ <span style="color: green">璧凤細{{ row.startTime }}</span><br />
+ <span style="color: red">姝細{{ row.endTime }}</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="startTime" label="鐘舵��" fixed min-width="100px">
+ <template slot-scope="{row}">
+ <div v-if="row.isdeleted == 1" style="color: red">宸插垹闄�</div>
+ <div v-else style="color: green">
+ <span v-if="row.hkStatus == 0" style="color: #435EBE">寰呬笅鍙�</span>
+ <span v-if="row.hkStatus == 1" style="color: green">棰勭害鎴愬姛</span>
+ <span v-if="row.hkStatus == 2" style="color: red">棰勭害澶辫触</span>
+ <span v-if="row.hkStatus == 2" style="color: red">宸插彇娑�</span>
+ </div>
+ </template>
+ </el-table-column>
+ <el-table-column prop="remark" label="澶囨敞" min-width="100px">
+ <template slot-scope="{row}">
+ <span v-if="row.isdeleted != 2">{{ row.remark }}</span>
+ </template>
+ </el-table-column>
+ <el-table-column prop="createDate" label="鍒涘缓鏃堕棿" min-width="140px"></el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ <!-- 鏂板缓/淇敼 -->
+ <OperaCarsWindow ref="operaCarsWindow" @success="handlePageChange" />
+ </TableLayout>
</template>
<script>
@@ -72,7 +67,7 @@
name: 'parkBook',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCarsWindow },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -83,7 +78,12 @@
}
}
},
- created () {
+ mounted() {
+ this.$nextTick(() => {
+ this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 260
+ })
+ },
+ created() {
this.config({
module: '杞﹁締淇℃伅琛�',
api: '/business/visitPark',
@@ -93,7 +93,7 @@
this.search()
},
methods: {
- validity (startTime, endTime) {
+ validity(startTime, endTime) {
return validity(startTime, endTime)
}
}
diff --git a/h5/pages/login/login.vue b/h5/pages/login/login.vue
index cac61df..53074fa 100644
--- a/h5/pages/login/login.vue
+++ b/h5/pages/login/login.vue
@@ -41,7 +41,7 @@
export default {
data() {
return {
- code: ''
+ code: '11'
}
},
onLoad(option) {
diff --git a/h5/pages/staff/task/visitorApprove.vue b/h5/pages/staff/task/visitorApprove.vue
index e70f8d3..970f44b 100644
--- a/h5/pages/staff/task/visitorApprove.vue
+++ b/h5/pages/staff/task/visitorApprove.vue
@@ -45,7 +45,7 @@
<view class="value">{{ info.companyName }}</view>
</view>
<view class="item">
- <view class="label">鏂藉伐浜哄憳</view>
+ <view class="label">鏄惁娑夊強鏂藉伐浣滀笟</view>
<view class="value">{{ info.type == 0 ? "鍚�" : "鏄�" }}</view>
</view>
<view class="item">
diff --git a/h5/pages/visitorApplication/visitorApplication.vue b/h5/pages/visitorApplication/visitorApplication.vue
index 487dff6..c76ea05 100644
--- a/h5/pages/visitorApplication/visitorApplication.vue
+++ b/h5/pages/visitorApplication/visitorApplication.vue
@@ -67,7 +67,24 @@
<text>鏄惁鏂藉伐浣滀笟</text>
</view>
<view class="list_item_content">
- <switch color="#4e99a9" style="transform: scale(0.8)" @change="constructionChange" />
+ <!-- <switch color="#4e99a9" style="transform: scale(0.8)" @change="constructionChange" /> -->
+<!-- <u-radio-group v-model="form1.type">
+ <u-radio label="鏄�" :name="1" activeColor="#4d99a8" class="mr24" />
+ <u-radio label="鍚�" :name="0" activeColor="#4d99a8" />
+ </u-radio-group> -->
+ <view class="checkbox_wrap">
+ <view class="check_item" @click="constructionChange(1)">
+ <text>鏄�</text>
+ <image v-if="form1.type == 1" src="@/static/checkbox_sel@2x.png" mode=""></image>
+ <image v-if="form1.type == 0" src="@/static/checkbox_disable@3x.png" mode=""></image>
+ </view>
+ <view class="check_item" @click="constructionChange(0)">
+ <text>鍚�</text>
+ <image v-if="form1.type == 0" src="@/static/checkbox_sel@2x.png" mode=""></image>
+ <image v-else src="@/static/checkbox_disable@3x.png" mode=""></image>
+ </view>
+
+ </view>
</view>
</view>
<view v-if="form1.type == '1'" class="list_item">
@@ -442,10 +459,8 @@
closeInput() {
this.$refs.keyboard.close()
},
- constructionChange(e) {
- console.log(e.detail.value)
- this.form1.type = Number(e.detail.value)
- console.log(this.form1.type)
+ constructionChange(value) {
+ this.form1.type = value
},
uploadImg(file) {
this.$refs.cropper.close()
@@ -1299,6 +1314,20 @@
font-weight: 400;
color: #222222;
}
+ }
+ .checkbox_wrap{
+ display: flex;
+ align-items: center;
+ .check_item{
+ display: flex;
+ align-items: center;
+ margin-left: 20rpx;
+ }
+ image{
+ width: 42rpx;
+ height: 42rpx;
+ margin-left: 10rpx;
+ }
}
}
}
diff --git a/pda/utils/service.js b/pda/utils/service.js
index 342b331..26992f6 100644
--- a/pda/utils/service.js
+++ b/pda/utils/service.js
@@ -23,7 +23,7 @@
// 鎺у埗鍙版樉绀烘暟鎹俊鎭�
uni.hideLoading()
// 鐧诲綍杩囨湡
- if (data.code === 5112) {
+ if (data.code === 5112 || data.code === 5111) {
setTimeout(() => {
uni.showToast({
title: data.message,
--
Gitblit v1.9.3