From 47a9d0b2711203995fd5eeb00df1bebda7d63ad8 Mon Sep 17 00:00:00 2001
From: xiangpei <xiangpei@timesnew.cn>
Date: 星期四, 21 三月 2024 10:27:12 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
src/views/system/work-order/index.vue | 13 +++++++------
1 files changed, 7 insertions(+), 6 deletions(-)
diff --git a/src/views/system/work-order/index.vue b/src/views/system/work-order/index.vue
index f04eb76..a40125e 100644
--- a/src/views/system/work-order/index.vue
+++ b/src/views/system/work-order/index.vue
@@ -107,15 +107,16 @@
type="text"
@click="handleYwCondition(scope.row)"
>杩愮淮鎯呭喌</el-button>
- <el-button
- size="mini"
- type="text"
- @click="handleYwResult(scope.row)"
- >杩愮淮缁撴灉</el-button>
+<!-- <el-button-->
+<!-- size="mini"-->
+<!-- type="text"-->
+<!-- @click="handleYwResult(scope.row)"-->
+<!-- >杩愮淮缁撴灉</el-button>-->
<el-button
size="mini"
type="text"
@click="handleCheckResult(scope.row)"
+ v-hasPermi="['work:order:result']"
>妫�娴嬬粨鏋�</el-button>
<el-button
size="mini"
@@ -281,7 +282,7 @@
</el-form>
<div slot="footer" class="dialog-footer">
<el-button type="primary" @click="submitYwResult">纭� 瀹�</el-button>
- <el-button @click="cancelYwResult">鍙� 娑�</el-button>
+ <el-button @click="cancelCheckResult">鍙� 娑�</el-button>
</div>
</el-dialog>
--
Gitblit v1.8.0