From 97e1b9d6c8d7da0891aa7a1e00116b4b14e1b942 Mon Sep 17 00:00:00 2001
From: k94314517 <8417338+k94314517@user.noreply.gitee.com>
Date: 星期五, 05 七月 2024 18:22:49 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/serviceCar/apprRecord.vue | 14 +++++++++-----
1 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index 6c8f7d5..85828a2 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -17,7 +17,7 @@
<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-option label="宸叉挙閿�" value="4"></el-option>
</el-select>
</el-form-item>
<el-form-item label="鐩殑鍦扮被鍨�" prop="type">
@@ -83,10 +83,10 @@
<el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span class="status-blue" v-if="row.status === 0">鐢宠涓�</span>
- <span class="status-blue" v-if="row.status === 1">寰呭鎵�</span>
+ <span class="status-blue" v-if="row.status === 1">瀹℃牳涓�</span>
<span class="status-green" v-if="row.status === 2">瀹℃壒閫氳繃</span>
<span class="status-red" v-if="row.status === 3">瀹℃壒涓嶉�氳繃</span>
- <span class="status-red" v-if="row.status === 4">宸插彇娑�</span>
+ <span class="status-red" v-if="row.status === 4">宸叉挙閿�</span>
</template>
</el-table-column>
@@ -94,12 +94,13 @@
<el-table-column prop="editDate" label="鎿嶄綔鏃堕棿" min-width="150px"></el-table-column>
<el-table-column
label="鎿嶄綔"
- min-width="100"
+ min-width="140"
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>
</template>
</el-table-column>
</el-table>
@@ -123,7 +124,7 @@
import OperaCarUseBookParamWindow from '@/components/operation/OperCarUseBookParamWindow.vue'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
-import { carUseBookRecordEx } from '@/api/business/carUseBook'
+import { carUseBookRecordEx, revokeById } from '@/api/business/carUseBook'
export default {
name: 'Empower',
extends: BaseTable,
@@ -157,6 +158,9 @@
this.loadParams()
},
methods: {
+ rowRevokeClick (row) {
+ revokeById(row.id)
+ },
handleEx () {
this.$dialog.exportConfirm('纭瀵煎嚭鍚楋紵')
.then(() => {
--
Gitblit v1.9.3