From 7298d5354963a88643a543b51b90192dc9fc934c Mon Sep 17 00:00:00 2001
From: doum <doum>
Date: 星期四, 11 九月 2025 18:43:14 +0800
Subject: [PATCH] 最新版本541200007
---
admin/src/views/operation/serviceCar/apprRecord.vue | 64 +++++++++++++++++++------------
1 files changed, 39 insertions(+), 25 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 62e2630..01da365 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']">
<!-- 鎼滅储琛ㄥ崟 -->
<div ref="QueryFormRef" slot="search-form">
<el-form ref="searchForm" :model="searchForm" label-width="100px" inline>
@@ -29,11 +29,15 @@
<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"
+ <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-date-picker> -->
+ <el-date-picker type="datetime" v-model="searchForm.queryStartTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨寮�濮嬫椂闂�" @change="changeRadio" />
+ <el-date-picker type="datetime" v-model="searchForm.queryEndTime" value-format="yyyy-MM-dd HH:mm:ss"
+ placeholder="璇烽�夋嫨缁撴潫鏃堕棿" @change="changeRadio" />
</el-form-item>
<el-radio-group v-model="searchForm.radio" size="small" @input="changeRadio">
<el-radio-button label="0">褰撳ぉ</el-radio-button>
@@ -60,7 +64,7 @@
<el-button type="primary" @click="handleEx" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button>
</li>
</ul>
- <el-table :max-height="tableHeight" v-loading="isWorking.search" :data="tableData.list" stripe
+ <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>
@@ -97,15 +101,16 @@
<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 label="鎿嶄綔" min-width="240" 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 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.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>
@@ -144,6 +149,7 @@
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
data() {
return {
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
@@ -175,11 +181,6 @@
// this.search()
this.changeRadio('0')
this.loadParams()
- },
- mounted() {
- this.$nextTick(() => {
- this.tableHeight = document.body.scrollHeight - this.$refs.QueryFormRef.offsetHeight - 300
- })
},
methods: {
rowRevokeClick(row) {
@@ -215,19 +216,22 @@
})
},
changeRadio(e) {
- this.searchForm.radio = e
if (e === '0') {
this.searchForm.queryStartTime = timeForMat(0)[0]
this.searchForm.queryEndTime = timeForMat(0)[1]
- this.time = timeForMat(0)
} else if (e === '1') {
this.searchForm.queryStartTime = timeForMat(6)[0]
this.searchForm.queryEndTime = timeForMat(6)[1]
- this.time = timeForMat(6)
} else if (e === '2') {
this.searchForm.queryStartTime = timeForMat(29)[0]
this.searchForm.queryEndTime = timeForMat(29)[1]
- this.time = timeForMat(29)
+ } else {
+ this.searchForm.radio = ''
+ }
+ if (this.searchForm.queryStartTime && this.searchForm.queryEndTime && new Date(this.searchForm.queryStartTime).getTime() > new Date(this.searchForm.queryEndTime).getTime()) {
+ this.$message.error('寮�濮嬫椂闂翠笉鑳藉ぇ浜庣粨鏉熸椂闂�')
+ this.searchForm.queryStartTime = ''
+ return
}
this.search()
},
@@ -256,17 +260,27 @@
})
},
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 = {}
- this.time = []
- // this.searchForm.radio = '0'
- // this.changeRadio('0')
+ this.searchForm = {
+ memberName: '',
+ companyName: '',
+ queryStartTime: '',
+ queryEndTime: '',
+ type: null,
+ status: null,
+ radio: ''
+ }
+ // this.changeRadio(0)
this.search()
}
}
--
Gitblit v1.9.3