From 3a8223b71d18205d40b894fd0b4c0fa1ca773e86 Mon Sep 17 00:00:00 2001
From: Lius <Lius2225@163.com>
Date: 星期一, 13 十一月 2023 10:44:11 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/mdc-test' into mdc-test
---
src/views/eam/DailyMaintenanceOrderList.vue | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/src/views/eam/DailyMaintenanceOrderList.vue b/src/views/eam/DailyMaintenanceOrderList.vue
index 8812cc1..3d0edaf 100644
--- a/src/views/eam/DailyMaintenanceOrderList.vue
+++ b/src/views/eam/DailyMaintenanceOrderList.vue
@@ -1,7 +1,7 @@
<template>
<a-card
:bordered="false"
- title="浜岀骇淇濆吇宸ュ崟"
+ title="浜岀骇淇濆吇"
>
<!-- 鏌ヨ鍖哄煙 -->
<div class="table-page-search-wrapper">
@@ -142,11 +142,11 @@
slot-scope="text, record"
>
<a-popconfirm
- title="纭畾涓嬪彂宸ュ崟鍚�?"
+ title="纭畾鎺ユ敹宸ュ崟鍚�?"
@confirm="() => handleOrderIssue(record)"
v-has="'dailyMaintenanceOrder:issue'"
>
- <a v-if="record.status == '1'">涓嬪彂</a>
+ <a v-if="record.status == '1'">鎺ユ敹</a>
</a-popconfirm>
<a-divider
v-if="record.status == '1'"
@@ -233,11 +233,11 @@
type="vertical"
/>
<a
- v-if="record.status === '5'"
+ v-if="record.status === '5' || record.status === '8'"
@click="handleFinish(record)"
- >纭</a>
+ >瀹屽伐绉讳氦鍗�</a>
<a-divider
- v-if="record.status === '5'"
+ v-if="record.status === '5' || record.status === '8'"
type="vertical"
/>
<a-dropdown>
@@ -356,7 +356,7 @@
dataIndex: 'assignModeName'
},
{
- title: '璁惧缂栫爜',
+ title: '缁熶竴缂栫爜',
align: "center",
dataIndex: 'equipmentNum',
},
@@ -503,7 +503,7 @@
handleOrderExe(record) {
this.$refs.DailyMaintenanceOrderExeDrawer.visible = true
- this.$refs.DailyMaintenanceOrderExeDrawer.title = '鏃ュ父淇濆吇宸ュ崟鎵ц'
+ this.$refs.DailyMaintenanceOrderExeDrawer.title = '浜岀骇淇濆吇宸ュ崟鎵ц'
this.$refs.DailyMaintenanceOrderExeDrawer.handleShow(record)
if (record.status === '3') {
this.$refs.DailyMaintenanceOrderExeDrawer.buttonDistable = true//淇濆瓨銆佹殏瀛樸�佹姤宸�
--
Gitblit v1.9.3