From 5a74ff63f47921f97b6c3c35751b24b085a1a78c Mon Sep 17 00:00:00 2001
From: qushaowei <qushaowei@163.com>
Date: 星期五, 26 一月 2024 10:51:14 +0800
Subject: [PATCH] Merge branch 'master' of http://117.34.109.166:18448/r/vue_mdc_430 into develop
---
src/views/eam/Daily3MaintenanceOrderList.vue | 12 ++++++------
1 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue
index 58808ee..0ab4543 100644
--- a/src/views/eam/Daily3MaintenanceOrderList.vue
+++ b/src/views/eam/Daily3MaintenanceOrderList.vue
@@ -297,22 +297,22 @@
type="vertical"
/>
<a
- v-show="record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveDetection(record)"
v-has="'daily3MaintenanceOrder:StoveCategory'"
>鐐夌被妫�娴�</a>
<!-- v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" -->
<a-divider
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
- v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show=" record.status === '5' && record.isNotStoveCategoryFlag == true "
@click="handleStoveReport(record)"
v-has="'daily3MaintenanceOrder:StoveCategoryReport'"
>鐐夌被鎶ュ憡</a>
<a-divider
- v-show="record.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')"
+ v-show="record.status === '5' && record.isNotStoveCategoryFlag == true "
type="vertical"
/>
<a
@@ -577,9 +577,9 @@
// dataIndex: 'actualWorkingHourQuota',
// },
{
- title: '鎵ц浜�',
+ title: '鎶ュ伐浜�',
align: "center",
- dataIndex: 'maintenanceUserName'
+ dataIndex: 'maintenanceUserId'
},
{
title: '闂鍙婄浉搴斿鐞嗘帾鏂芥弿杩�',
--
Gitblit v1.9.3