From 6ded2ee6a9d9097d45f8f79a7e6429cf55ed7cc3 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 07 三月 2025 16:59:30 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/serviceCar/apprRecord.vue | 201 ++++++++++++++++++++++++++++++++++----------------
1 files changed, 137 insertions(+), 64 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 62e2630..805cc84 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>
@@ -48,36 +52,70 @@
</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 :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>
- <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>
@@ -95,28 +133,59 @@
</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="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.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>
- <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">
@@ -124,7 +193,10 @@
<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>
@@ -142,14 +214,15 @@
name: 'Empower',
extends: BaseTable,
components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
- data() {
+ data () {
return {
+ // userInfo: this.$store.state.userInfo,
// 鎼滅储
searchForm: {
memberName: '',
companyName: '',
- queryStartTime: '',
- queryEndTime: '',
+ startTime: '',
+ endTime: '',
type: null,
status: null,
radio: 0
@@ -165,7 +238,7 @@
}
}
},
- created() {
+ created () {
this.config({
module: '鐢ㄨ溅鐢宠绠＄悊',
api: '/business/carUseBook',
@@ -173,16 +246,11 @@
'field.main': 'id'
})
// this.search()
- this.changeRadio('0')
+ 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)
@@ -190,14 +258,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
@@ -215,26 +283,29 @@
})
},
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()
},
- handleEdit() {
+ handleEdit () {
this.$refs.OperaParamWindow.open()
},
- loadParams() {
+ loadParams () {
allList({
})
.then(res => {
@@ -255,19 +326,21 @@
.finally(() => {
})
},
- seleTime(e) {
- this.searchForm.queryStartTime = e[0]
- this.searchForm.queryEndTime = e[1]
+ seleTime (e) {
+ 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() {
+ reset () {
this.$refs.searchForm.resetFields()
- this.searchForm = {}
- this.time = []
- // this.searchForm.radio = '0'
- // this.changeRadio('0')
- this.search()
+ this.searchForm.radio = 0
+ this.changeRadio(0)
+ // this.search()
}
}
}
--
Gitblit v1.9.3