From ae3ad906ed4b09f72fc716957c4dbbe16341b38f Mon Sep 17 00:00:00 2001 From: zhuzhuanzhuan Date: 星期二, 26 十二月 2023 11:39:37 +0800 Subject: [PATCH] Merge remote-tracking branch 'origin/master' --- src/views/eam/Daily3MaintenanceOrderList.vue | 7 ++++--- 1 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/views/eam/Daily3MaintenanceOrderList.vue b/src/views/eam/Daily3MaintenanceOrderList.vue index 2e19354..58808ee 100644 --- a/src/views/eam/Daily3MaintenanceOrderList.vue +++ b/src/views/eam/Daily3MaintenanceOrderList.vue @@ -297,16 +297,17 @@ type="vertical" /> <a - v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" + v-show="record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" @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.status === '5'&& record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" + v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" type="vertical" /> <a - v-show="record.status === '5' && record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" + v-show=" record.isNotStoveCategoryFlag == true && (record.stoveExemptStatus == '0' ||record.stoveExemptStatus == '1' ||record.stoveExemptStatus == '2')" @click="handleStoveReport(record)" v-has="'daily3MaintenanceOrder:StoveCategoryReport'" >鐐夌被鎶ュ憡</a> -- Gitblit v1.9.3