From 1b62586dae8ed6281a44a2f78dfc23093674edf8 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期一, 03 三月 2025 16:25:36 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/operation/serviceCar/apprRecord.vue | 66 ++++++++++++++++++---------------
1 files changed, 36 insertions(+), 30 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 08e9f8a..d765a20 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,5 +1,5 @@
<template>
- <TableLayout :permissions="['business:empower:query']">
+ <TableLayout :permissions="['business:carusebook:query']">
<!-- 鎼滅储琛ㄥ崟 -->
<el-form
ref="searchForm"
@@ -56,7 +56,7 @@
<el-option label="甯傚鐢ㄨ溅" value="1"></el-option>
</el-select>
</el-form-item>
- <el-form-item label="鍑哄彂鏃堕棿" prop="startTime">
+ <el-form-item label="鐢宠鏃堕棿" prop="startTime">
<el-date-picker
@change="seleTime"
v-model="time"
@@ -120,32 +120,41 @@
>
<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 label="鐢ㄨ溅鏃堕棿" min-width="170px">
<template slot-scope="{ row }">
- <span>璧�:{{ row.startTime || "" }}</span
+ <span v-if="row.startTime">璧�:{{ row.startTime.slice(0,16) }}</span
><br />
- <span>姝�:{{ row.endTime || "" }}</span>
+ <span v-if="row.endTime">姝�:{{ row.endTime.slice(0,16) }}</span>
</template>
</el-table-column>
<el-table-column
prop="planUseDate"
label="鍑哄彂鏃堕棿"
min-width="150px"
- ></el-table-column>
+ >
+ <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>
@@ -175,7 +184,7 @@
></el-table-column>
<el-table-column
label="鎿嶄綔"
- min-width="160"
+ min-width="180"
align="center"
fixed="right"
>
@@ -187,16 +196,9 @@
>鏌ョ湅璇︽儏</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
- 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" 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>
</template>
</el-table-column>
</el-table>
@@ -253,6 +255,7 @@
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
data () {
return {
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
@@ -282,7 +285,7 @@
'field.main': 'id'
})
// this.search()
- this.changeRadio('0')
+ this.changeRadio(0)
this.loadParams()
},
methods: {
@@ -312,7 +315,6 @@
this.download(response)
})
.catch(e => {
- this.$tip.apiFailed(e)
})
.finally(() => {
this.exLoading = false
@@ -321,15 +323,15 @@
},
changeRadio (e) {
this.searchForm.radio = e
- if (e === '0') {
+ if (e === 0) {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
this.time = timeForMat(0)
- } else if (e === '1') {
+ } else if (e === 1) {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
this.time = timeForMat(6)
- } else if (e === '2') {
+ } else if (e === 2) {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
this.time = timeForMat(29)
@@ -361,15 +363,19 @@
})
},
seleTime (e) {
- this.searchForm.queryStartTime = e[0]
- this.searchForm.queryEndTime = e[1]
+ this.searchForm.queryStartTime = null
+ this.searchForm.queryEndTime = null
+ if (e != null && e.length >= 2) {
+ this.searchForm.queryStartTime = e[0]
+ this.searchForm.queryEndTime = e[1]
+ }
this.searchForm.radio = null
this.search()
},
reset () {
this.$refs.searchForm.resetFields()
- this.searchForm.radio = '0'
- this.changeRadio('0')
+ this.searchForm.radio = 0
+ this.changeRadio(0)
// this.search()
}
}
--
Gitblit v1.9.3