From 2bc4a739db642494accbf5be1fa55793f4652f44 Mon Sep 17 00:00:00 2001
From: liukangdong <898885815@qq.com>
Date: 星期一, 10 三月 2025 15:31:16 +0800
Subject: [PATCH] ll
---
admin/src/views/business/carEvent.vue | 16 +
h5/pages/staff/vehicle/shiwai.vue | 1
admin/src/views/business/blackmailPersonnel.vue | 130 +++++++--------
admin/src/views/business/freezePersonnel.vue | 109 ++++++-------
admin/src/views/platform/platform.vue | 2
admin/src/views/business/deletePersonnel.vue | 2
h5/pages/staff/vehicle/shinei.vue | 3
admin/src/views/platform/platformReason.vue | 13
admin/src/views/business/platformBroadcastLog.vue | 10 +
admin/src/views/business/platformEvent.vue | 2
admin/src/views/meeting/bookings.vue | 2
admin/src/views/operation/serviceCar/apprRecord.vue | 167 ++++++--------------
h5/pages/staff/vehicle/apply.vue | 18 +
13 files changed, 211 insertions(+), 264 deletions(-)
diff --git a/admin/src/views/business/blackmailPersonnel.vue b/admin/src/views/business/blackmailPersonnel.vue
index 5f0f848..3eabd5c 100644
--- a/admin/src/views/business/blackmailPersonnel.vue
+++ b/admin/src/views/business/blackmailPersonnel.vue
@@ -1,14 +1,14 @@
<template>
- <TableLayout :permissions="['business:member: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="companyName">
- <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="鎿嶄綔浜哄憳" prop="createrId">
+ <TableLayout :permissions="['business:member: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="companyName">
+ <el-input v-model="searchForm.companyName" placeholder="璇疯緭鍏ョ粍缁囧悕绉�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="鎿嶄綔浜哄憳" prop="createrId">
<el-select v-model="searchForm.createrId" placeholder="璇烽�夋嫨">
<el-option
v-for="item in user"
@@ -17,62 +17,50 @@
:value="item.id">
</el-option>
</el-select>
- </el-form-item>
-<!-- <el-form-item label="浜哄憳绫诲瀷" prop="type">-->
-<!-- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">-->
-<!-- <el-option label="璁垮" value="1"></el-option>-->
-<!-- <el-option label="鍔冲姟" value="0"></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" v-permissions="['business:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绉诲嚭</el-button></li>
- </ul>
- <el-table
- :height="tableHeightNew"
- 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="80px"></el-table-column>
- <el-table-column prop="phone" 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>
- <span v-if="row.type === 1">鏅�氳瀹�</span>
- <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
- </template>
- </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="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']" @click="thaw(row.id)">绉诲嚭</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </el-form-item> -->
+ <!-- <el-form-item label="浜哄憳绫诲瀷" prop="type">-->
+ <!-- <el-select v-model="searchForm.type" placeholder="璇烽�夋嫨">-->
+ <!-- <el-option label="璁垮" value="1"></el-option>-->
+ <!-- <el-option label="鍔冲姟" value="0"></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" v-permissions="['business:member:create', 'business:member:delete']">
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws">绉诲嚭</el-button></li>
+ </ul>
+ <el-table :height="tableHeightNew" 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="80px"></el-table-column>
+ <el-table-column prop="phone" 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>
+ <span v-if="row.type === 1">鏅�氳瀹�</span>
+ <span v-if="row.type === 2">鍐呴儴浜哄憳</span>
+ </template>
+ </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="鎿嶄綔"
+ min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" icon="el-icon-edit" v-permissions="['business:member:update']"
+ @click="thaw(row.id)">绉诲嚭</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -85,7 +73,7 @@
name: 'blackmailPersonnel',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -97,7 +85,7 @@
user: []
}
},
- created () {
+ created() {
this.config({
module: '浜哄憳淇℃伅琛�',
api: '/business/block',
@@ -108,7 +96,7 @@
this.getUser()
},
methods: {
- thaws () {
+ thaws() {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
return item.id
@@ -119,7 +107,7 @@
this.search()
})
},
- thaw (ids) {
+ thaw(ids) {
this.$confirm('纭畾绉诲嚭姝ょ敤鎴峰悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -134,7 +122,7 @@
})
},
- getUser () {
+ getUser() {
findAllList({})
.then(res => {
this.user = res.map(item => {
diff --git a/admin/src/views/business/carEvent.vue b/admin/src/views/business/carEvent.vue
index ed79f61..12a2af9 100644
--- a/admin/src/views/business/carEvent.vue
+++ b/admin/src/views/business/carEvent.vue
@@ -80,7 +80,7 @@
<span v-if="row.inoutType === 1">绂诲洯</span>
</template>
</el-table-column>
-<!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
+ <!-- <el-table-column label="杞︾墝鎶撴媿鍥�" min-width="100px">
<template slot-scope="{ row }">
<div v-if="row.platePicUrl != null">
<el-image style="width: 80px; height: 80px" :src="row.platePicUrl" :preview-src-list="[row.platePicUrl]">
@@ -128,7 +128,7 @@
companyName: '',
startTime: '',
endTime: '',
- radio: '0'
+ radio: ''
},
time: []
}
@@ -151,8 +151,16 @@
methods: {
reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = ''
- // this.changeRadio('0')
+ this.searchForm = {
+ eventType: '',
+ keyWords: '',
+ plateNos: '',
+ memberType: '',
+ companyName: '',
+ startTime: '',
+ endTime: '',
+ radio: ''
+ }
this.time = []
this.search()
},
diff --git a/admin/src/views/business/deletePersonnel.vue b/admin/src/views/business/deletePersonnel.vue
index f21317f..d4e1e42 100644
--- a/admin/src/views/business/deletePersonnel.vue
+++ b/admin/src/views/business/deletePersonnel.vue
@@ -8,7 +8,7 @@
<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="sendStatus">
+ <el-form-item label="涓嬪彂鐘舵��" prop="hkStatus">
<el-select v-model="searchForm.hkStatus" placeholder="璇烽�夋嫨" clearable @change="search">
<el-option label="寰呬笅鍙�" value="0"></el-option>
<el-option label="宸插悓姝�" value="1"></el-option>
diff --git a/admin/src/views/business/freezePersonnel.vue b/admin/src/views/business/freezePersonnel.vue
index 9b786bb..9c29ea6 100644
--- a/admin/src/views/business/freezePersonnel.vue
+++ b/admin/src/views/business/freezePersonnel.vue
@@ -1,14 +1,14 @@
<template>
- <TableLayout :permissions="['business:member: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="code">
- <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
- </el-form-item>
- <el-form-item label="閮ㄩ棬" prop="companyId">
+ <TableLayout :permissions="['business:member: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="code">
+ <el-input v-model="searchForm.code" placeholder="璇疯緭鍏ュ伐鍙�" @keypress.enter.native="search"></el-input>
+ </el-form-item>
+ <!-- <el-form-item label="閮ㄩ棬" prop="companyId">
<el-cascader
:options="options"
v-model="searchForm.companyId"
@@ -17,50 +17,39 @@
@keypress.enter.native="search"
:props="{ checkStrictly: true, value: 'id', label: 'name', children: 'companyDTOList' }"
></el-cascader>
- </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:member:create', 'business:member:delete']">
- <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">瑙ｅ喕</el-button></li>
- <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li>
- </ul>
- <el-table
- :height="tableHeightNew"
- 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="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>
- <el-table-column
- v-if="containPermissions(['business:member:update', 'business:member:delete'])"
- label="鎿嶄綔"
- min-width="120"
- fixed="right"
- >
- <template slot-scope="{row}">
- <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit" v-permissions="['business:member:update']">瑙ｅ喕</el-button>
- </template>
- </el-table-column>
- </el-table>
- <pagination
- @size-change="handleSizeChange"
- @current-change="handlePageChange"
- :pagination="tableData.pagination"
- >
- </pagination>
- </template>
- </TableLayout>
+ </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:member:create', 'business:member:delete']">
+ <li><el-button type="primary" v-permissions="['business:member:create']" @click="thaws()">瑙ｅ喕</el-button></li>
+ <li><el-button type="primary" :loading="isWorking.export" v-permissions="['business:member:exportExcel']"
+ @click="exportExcel">瀵煎嚭</el-button></li>
+ </ul>
+ <el-table :height="tableHeightNew" 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="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>
+ <el-table-column v-if="containPermissions(['business:member:update', 'business:member:delete'])" label="鎿嶄綔"
+ min-width="120" fixed="right">
+ <template slot-scope="{row}">
+ <el-button type="text" @click="thaw(row.id)" icon="el-icon-edit"
+ v-permissions="['business:member:update']">瑙ｅ喕</el-button>
+ </template>
+ </el-table-column>
+ </el-table>
+ <pagination @size-change="handleSizeChange" @current-change="handlePageChange" :pagination="tableData.pagination">
+ </pagination>
+ </template>
+ </TableLayout>
</template>
<script>
@@ -73,7 +62,7 @@
name: 'freezePersonnel',
extends: BaseTable,
components: { TableLayout, Pagination },
- data () {
+ data() {
return {
// 鎼滅储
searchForm: {
@@ -85,7 +74,7 @@
options: []
}
},
- created () {
+ created() {
this.config({
module: '鍐荤粨浜哄憳',
api: '/business/block',
@@ -96,7 +85,7 @@
this.getfindCompanyTreePage()
},
methods: {
- thaws () {
+ thaws() {
if (this.tableData.selectedRows.length === 0) return this.$message.warning('鑷冲皯閫夋嫨涓�椤瑰唴瀹�')
const ids = this.tableData.selectedRows.map(item => {
// return { id: item.id }
@@ -104,7 +93,7 @@
})
this.thaw(ids.join(','))
},
- thaw (ids) {
+ thaw(ids) {
this.$confirm('纭畾瑙ｅ喕姝ょ敤鎴峰悧?', '鎻愮ず', {
confirmButtonText: '纭畾',
cancelButtonText: '鍙栨秷',
@@ -119,11 +108,11 @@
})
},
- changeCompanyId (e) {
+ changeCompanyId(e) {
this.searchForm.companyId = e[e.length - 1]
},
// 鑾峰彇缁勭粐鏍�
- getfindCompanyTreePage () {
+ getfindCompanyTreePage() {
findCompanyTreePage(1)
.then(res => {
this.options = res
diff --git a/admin/src/views/business/platformBroadcastLog.vue b/admin/src/views/business/platformBroadcastLog.vue
index 9a3b37a..e0312ff 100644
--- a/admin/src/views/business/platformBroadcastLog.vue
+++ b/admin/src/views/business/platformBroadcastLog.vue
@@ -123,7 +123,7 @@
this.searchForm.endTime = timeForMat(6)[1]
this.time = timeForMat(6)
} else if (e === '2') {
- this.searchForm.startDate= timeForMat(29)[0]
+ this.searchForm.startDate = timeForMat(29)[0]
this.searchForm.endTime = timeForMat(29)[1]
this.time = timeForMat(29)
}
@@ -138,6 +138,14 @@
reset() {
this.$refs.searchForm.resetFields()
this.time = []
+ this.searchForm = {
+ name: '',
+ info: '',
+ deviceType: '',
+ hkStatus: '',
+ startDate: '',
+ endDate: '',
+ }
this.searchForm.radio = ''
// this.changeRadio('0')
this.search()
diff --git a/admin/src/views/business/platformEvent.vue b/admin/src/views/business/platformEvent.vue
index 97f2557..c4ac24f 100644
--- a/admin/src/views/business/platformEvent.vue
+++ b/admin/src/views/business/platformEvent.vue
@@ -12,7 +12,7 @@
<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-form-item label="" prop="motionStatus">
<el-select v-model="searchForm.motionStatus" placeholder="璇烽�夋嫨杩涘嚭绫诲瀷">
<el-option label="绂诲紑" value="leave"></el-option>
<el-option label="杩涘叆" value="enter"></el-option>
diff --git a/admin/src/views/meeting/bookings.vue b/admin/src/views/meeting/bookings.vue
index 674d968..b523871 100644
--- a/admin/src/views/meeting/bookings.vue
+++ b/admin/src/views/meeting/bookings.vue
@@ -26,7 +26,7 @@
<el-form-item label="棰勭害浜�" prop="realName">
<el-input v-model="searchForm.realName" placeholder="璇疯緭鍏ラ绾︿汉" @keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="浼氳鐘舵��" prop="status">
+ <el-form-item label="浼氳鐘舵��" prop="meetingStatus">
<el-select v-model="searchForm.meetingStatus" filterable clearable placeholder="璇烽�夋嫨鐘舵��">
<el-option v-for="item in status" :key="item.id" :value="item.id" :label="item.name" />
</el-select>
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 805cc84..4d79f02 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -52,70 +52,36 @@
</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 :height="tableHeightNew" 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>
@@ -133,59 +99,29 @@
</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="180"
- 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="180" 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.hasRole ==1" type="text" icon="el-icon-delete" @click="rowRevokeClick(row)" >鎾ら攢</el-button>
+ <el-button style="color: red" v-if="row.hasRole == 1" type="text" icon="el-icon-delete"
+ @click="rowRevokeClick(row)">鎾ら攢</el-button>
<!-- <el-button style="color: red" v-if="(row.status === 0 && row.creator == userInfo.id)||((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" v-permissions="['business:carusebook:delete']" @click="deleteById(row)" >鍒犻櫎</el-button>
+ <el-button style="color: red" type="text" icon="el-icon-delete"
+ v-permissions="['business:carusebook: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">
@@ -193,10 +129,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>
@@ -214,15 +147,15 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
- data () {
+ data() {
return {
// userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
companyName: '',
- startTime: '',
- endTime: '',
+ queryStartTime: '',
+ queryEndTime: '',
type: null,
status: null,
radio: 0
@@ -238,7 +171,7 @@
}
}
},
- created () {
+ created() {
this.config({
module: '鐢ㄨ溅鐢宠绠＄悊',
api: '/business/carUseBook',
@@ -246,11 +179,11 @@
'field.main': 'id'
})
// this.search()
- this.changeRadio(0)
+ this.changeRadio('0')
this.loadParams()
},
methods: {
- rowRevokeClick (row) {
+ rowRevokeClick(row) {
this.isShowBack = true
this.backParam = {}
this.$set(this.backParam, 'id', row.id)
@@ -258,14 +191,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
@@ -302,10 +235,10 @@
}
this.search()
},
- handleEdit () {
+ handleEdit() {
this.$refs.OperaParamWindow.open()
},
- loadParams () {
+ loadParams() {
allList({
})
.then(res => {
@@ -326,7 +259,7 @@
.finally(() => {
})
},
- seleTime (e) {
+ seleTime(e) {
this.searchForm.queryStartTime = null
this.searchForm.queryEndTime = null
if (e != null && e.length >= 2) {
@@ -336,11 +269,19 @@
this.searchForm.radio = null
this.search()
},
- reset () {
+ reset() {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = 0
- this.changeRadio(0)
- // this.search()
+ this.searchForm = {
+ memberName: '',
+ companyName: '',
+ queryStartTime: '',
+ queryEndTime: '',
+ type: null,
+ status: null,
+ radio: ''
+ }
+ // this.changeRadio(0)
+ this.search()
}
}
}
diff --git a/admin/src/views/platform/platform.vue b/admin/src/views/platform/platform.vue
index d4fccea..23f162c 100644
--- a/admin/src/views/platform/platform.vue
+++ b/admin/src/views/platform/platform.vue
@@ -8,7 +8,7 @@
<el-input v-model="searchForm.name" clearable placeholder="璇疯緭鍏ユ湀鍙板悕绉�"
@keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="">
+ <el-form-item label="" prop="groupId">
<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>
diff --git a/admin/src/views/platform/platformReason.vue b/admin/src/views/platform/platformReason.vue
index 1cecfb4..88b7836 100644
--- a/admin/src/views/platform/platformReason.vue
+++ b/admin/src/views/platform/platformReason.vue
@@ -7,16 +7,16 @@
<el-input v-model="searchForm.reason" clearable placeholder="璇疯緭鍏ュ叆鍥師鍥�"
@keypress.enter.native="search"></el-input>
</el-form-item>
- <el-form-item label="">
+ <el-form-item label="" prop="groupId">
<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>
+ <!-- <section> -->
+ <el-button type="primary" @click="search">鎼滅储</el-button>
+ <el-button @click="reset">閲嶇疆</el-button>
+ <!-- </section> -->
</el-form>
</SearchFormCollapse>
<!-- 琛ㄦ牸鍜屽垎椤� -->
@@ -27,7 +27,8 @@
<li><el-button @click="deleteByIdInBatch" icon="el-icon-delete"
v-permissions="['business:platformreason:delete']">鍒犻櫎</el-button></li>
</ul>
- <el-table :height="tableHeightNew" v-loading="isWorking.search" :data="tableData.list" stripe @selection-change="handleSelectionChange">
+ <el-table :height="tableHeightNew" 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="reason" label="鍏ュ洯鍘熷洜" fixed min-width="100px"></el-table-column>
<el-table-column prop="groupName" label="瀵瑰簲浣滀笟鏈堝彴缁�" fixed min-width="150px"></el-table-column>
diff --git a/h5/pages/staff/vehicle/apply.vue b/h5/pages/staff/vehicle/apply.vue
index 93b9bca..d5c0fbf 100644
--- a/h5/pages/staff/vehicle/apply.vue
+++ b/h5/pages/staff/vehicle/apply.vue
@@ -7,7 +7,7 @@
<text>*</text>
<text>棰勮鐢ㄨ溅鏃舵</text>
</view>
- <view class="value" @click="$goBack()">
+ <view class="value" @click="goBack">
<text class="mr6" :style="{ color: param.startTime ? '#000000' : '#999999' }">
<text v-if="param.startTime">
{{ param.startTime.slice(5, 16) }}鑷硔{
@@ -24,7 +24,7 @@
<text>*</text>
<text>鐢宠杞﹁締</text>
</view>
- <view class="value" @click="$goBack()">
+ <view class="value" @click="goBack">
<input type="text" disabled placeholder="璇疯緭鍏ョ敵璇疯溅杈�" v-model="param.carCode"
placeholder-style="color: #999999;" />
</view>
@@ -130,9 +130,14 @@
this.$set(this.param, 'memberNames', res.map(i => i.realname).join(','))
})
},
+ destroyed() {
+ console.log('椤甸潰閿�姣�');
+ // uni.setStorageSync('vehicleAppForm', {})
+ },
onLoad(option) {
- console.log(option)
- this.param = { ...this.param, ...option }
+ const param = uni.getStorageSync('vehicleAppForm') || {}
+ this.param = { ...param, ...option }
+ console.log(this.param);
this.minDate = new Date().getTime()
this.param.planUseDate = dayjs(this.param.startTime).format('YYYY-MM-DD HH:mm')
},
@@ -160,6 +165,7 @@
...param,
}).then(res => {
if (res.code === 200) {
+ uni.setStorageSync('vehicleAppForm', {})
setTimeout(() => {
uni.showToast({
title: '鎻愪氦鎴愬姛',
@@ -180,6 +186,10 @@
}
this.$jump('/pages/staff/vehicle/applePeo')
},
+ goBack() {
+ uni.setStorageSync('vehicleAppForm', this.param)
+ this.$goBack()
+ },
confirmDate(e) {
this.param.planUseDate = dayjs(e.value).format('YYYY-MM-DD HH:mm')
this.isShowDatetime = false
diff --git a/h5/pages/staff/vehicle/shinei.vue b/h5/pages/staff/vehicle/shinei.vue
index 4704e57..f7b0310 100644
--- a/h5/pages/staff/vehicle/shinei.vue
+++ b/h5/pages/staff/vehicle/shinei.vue
@@ -129,7 +129,8 @@
},
onLoad() {
this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
- this.initData()
+ this.initData();
+ uni.setStorageSync('vehicleAppForm', {})
},
methods: {
formatter(type, value) {
diff --git a/h5/pages/staff/vehicle/shiwai.vue b/h5/pages/staff/vehicle/shiwai.vue
index 531e6b3..a042bd0 100644
--- a/h5/pages/staff/vehicle/shiwai.vue
+++ b/h5/pages/staff/vehicle/shiwai.vue
@@ -144,6 +144,7 @@
// this.minDate = new Date(dayjs().format('YYYY-MM-DD HH:mm') + ':00').getTime()
this.minDate = new Date().getTime() - (6 * 24 * 60 * 60 * 1000)
this.initData()
+ uni.setStorageSync('vehicleAppForm', {})
},
methods: {
formatter(type, value) {
--
Gitblit v1.9.3