From bf8d85d5f83c2036fb4239d764d33e99c1b62bd3 Mon Sep 17 00:00:00 2001
From: jiangping <jp@doumee.com>
Date: 星期五, 31 五月 2024 14:53:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
admin/src/views/operation/serviceCar/apprRecord.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/admin/src/views/operation/serviceCar/apprRecord.vue b/admin/src/views/operation/serviceCar/apprRecord.vue
index c4974cf..34fab76 100644
--- a/admin/src/views/operation/serviceCar/apprRecord.vue
+++ b/admin/src/views/operation/serviceCar/apprRecord.vue
@@ -71,13 +71,13 @@
</template>
</el-table-column>
<el-table-column prop="planUseDate" label="鍑哄彂鏃堕棿" min-width="150px"></el-table-column>
- <el-table-column label="鐩殑鍦扮被鍨�" min-width="100px">
+ <el-table-column label="鐩殑鍦�" min-width="200px">
<template slot-scope="{row}">
- <span class="status-green" v-if="row.type === 0">甯傚唴鐢ㄨ溅</span>
- <span class="status-red" v-if="row.type === 1">甯傚鐢ㄨ溅</span>
+ <span class="status-green" v-if="row.type === 0">銆愬競鍐呫��</span>
+ <span class="status-red" v-if="row.type === 1">銆愬競澶栥��</span>
+ <span >{{ row.addr }}</span>
</template>
</el-table-column>
- <el-table-column prop="addr" label="鐩殑鍦�" min-width="200px"></el-table-column>
<el-table-column label="鐘舵��" min-width="100px">
<template slot-scope="{row}">
<span class="status-blue" v-if="row.status === 0">鐢宠涓�</span>
@@ -97,7 +97,7 @@
fixed="right"
>
<template slot-scope="{row}">
- <el-button type="text" icon="el-icon-edit" @click="$refs.OperaHiddenDangerWindow.open('闅愭偅闅忔墜鎷嶈鎯�',row)" >鏌ョ湅璇︽儏</el-button>
+ <el-button type="text" icon="el-icon-edit" @click="$refs.OperaDetailsWindow.open('鍏姟杞︾敵璇疯鎯�',row)" >鏌ョ湅璇︽儏</el-button>
</template>
</el-table-column>
</el-table>
@@ -108,7 +108,7 @@
>
</pagination>
</template>
- <OperaHiddenDangerWindow ref="OperaHiddenDangerWindow" @success="handlePageChange"/>
+ <OperaCarUseBookWindow ref="OperaDetailsWindow" @success="handlePageChange"/>
</TableLayout>
</template>
@@ -116,13 +116,13 @@
import BaseTable from '@/components/base/BaseTable'
import TableLayout from '@/layouts/TableLayout'
import Pagination from '@/components/common/Pagination'
-import OperaHiddenDangerWindow from '@/components/business/OperaHiddenDangerWindow'
+import OperaCarUseBookWindow from '@/components/business/OperaCarUseBookWindow'
import { timeForMat } from '@/utils/util'
import { allList } from '@/api/business/hiddenDangerParam'
export default {
name: 'Empower',
extends: BaseTable,
- components: { TableLayout, Pagination ,OperaHiddenDangerWindow},
+ components: { TableLayout, Pagination ,OperaCarUseBookWindow},
data () {
return {
// 鎼滅储
--
Gitblit v1.9.3