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 | 172 ++++++++++++++++++++++-----------------------------------
1 files changed, 67 insertions(+), 105 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index cff731b..805cc84 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -1,90 +1,55 @@
<template>
- <TableLayout :permissions="['business:empower:query']">
+ <TableLayout :permissions="['business:carusebook: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-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>
+ <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
@@ -112,12 +77,8 @@
>
</li>
</ul>
- <el-table
- 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="carCode"
@@ -197,10 +158,8 @@
>
<!-- <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.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" @click="deleteById(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>
@@ -262,8 +221,8 @@
searchForm: {
memberName: '',
companyName: '',
- queryStartTime: '',
- queryEndTime: '',
+ startTime: '',
+ endTime: '',
type: null,
status: null,
radio: 0
@@ -323,20 +282,23 @@
})
})
},
- changeRadio (e) {
- this.searchForm.radio = e
- if (e == 0) {
+ changeRadio(e) {
+ 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)
+ } 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()
},
--
Gitblit v1.9.3