From 43942a545271345ce26e40d82bb97138c5ea7611 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 28 六月 2024 13:54:51 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/serviceCar/apprRecord.vue | 46 ++++++++++++++++++++++++++--------------------
1 files changed, 26 insertions(+), 20 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 2ed565a..c204187 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -51,8 +51,9 @@
</el-form>
<!-- 琛ㄦ牸鍜屽垎椤� -->
<template v-slot:table-wrap>
- <ul class="toolbar" v-permissions="['business:empower:create', 'business:empower:delete']">
- <!--<li><el-button type="primary" v-permissions="['business:empower:exportExcel']" @click="exportExcel">瀵煎嚭</el-button></li> -->
+ <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></li>
+ <li><el-button type="danger" @click="deleteByIdInBatch" icon="el-icon-delete" v-permissions="['business:carusebook:exportExcel']">瀵煎嚭</el-button></li>
</ul>
<el-table
v-loading="isWorking.search"
@@ -109,6 +110,7 @@
</pagination>
</template>
<OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange"/>
+ <OperaCarUseBookParamWindow ref="OperaParamWindow" @success="search"/>
</TableLayout>
</template>
@@ -117,12 +119,13 @@
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
+import OperaCarUseBookParamWindow from '@/components/operation/OperCarUseBookParamWindow.vue'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
export default {
name: 'Empower',
extends: BaseTable,
- components: { TableLayout, Pagination ,OperaCarUseBookWindow},
+ components: { TableLayout, Pagination, OperaCarUseBookWindow, OperaCarUseBookParamWindow },
data () {
return {
// 鎼滅储
@@ -169,26 +172,29 @@
}
this.search()
},
+ handleEdit () {
+ this.$refs.OperaParamWindow.open()
+ },
loadParams () {
allList({
})
- .then(res => {
- if (res != null && res.length) {
- res.forEach(item => {
- if (item && item.type != null && item.type === 0) {
- this.areaList.push(item)
- }
- if (item && item.type != null && item.type === 1) {
- this.cateList.push(item)
- }
- })
- }
- })
- .catch(e => {
- // this.$tip.apiFailed(e)
- })
- .finally(() => {
- })
+ .then(res => {
+ if (res != null && res.length) {
+ res.forEach(item => {
+ if (item && item.type != null && item.type === 0) {
+ this.areaList.push(item)
+ }
+ if (item && item.type != null && item.type === 1) {
+ this.cateList.push(item)
+ }
+ })
+ }
+ })
+ .catch(e => {
+ // this.$tip.apiFailed(e)
+ })
+ .finally(() => {
+ })
},
seleTime (e) {
this.searchForm.queryStartTime = e[0]
--
Gitblit v1.9.3