From 5ecb7958c96d3f0b6d47b79aff7eb306c2cf690f Mon Sep 17 00:00:00 2001
From: charles <981744753@qq.com>
Date: 星期二, 06 八月 2024 11:16:58 +0800
Subject: [PATCH] gitlab上面的wms转移到公司git

---
 src/components/makepager/StatusCommonView.vue |   19 ++++++++++++++++---
 1 files changed, 16 insertions(+), 3 deletions(-)

diff --git a/src/components/makepager/StatusCommonView.vue b/src/components/makepager/StatusCommonView.vue
index 9361001..358bf7c 100644
--- a/src/components/makepager/StatusCommonView.vue
+++ b/src/components/makepager/StatusCommonView.vue
@@ -1,9 +1,10 @@
 <template>
   <div class="common-status">
     <div v-if="showButton" style="margin-left: 30px">
-      <el-button v-if="isValidateClick" plain size="mini" @click="validateClick">楠岃瘉</el-button>
+      <el-button v-if="isValidateClick" plain size="mini" @click="validateClick" :disabled="isCancel">楠岃瘉</el-button>
       <el-button v-if="showOther" plain size="mini" @click="delClick" :disabled="isDelClick">鍒犻櫎</el-button>
-      <el-button v-if="showOther" plain size="mini" disabled>鎵撳嵃</el-button>
+      <el-button v-if="showCancel" plain size="mini" @click="btnCancel">鍙栨秷</el-button>
+      <!-- <el-button v-if="showOther" plain size="mini" disabled>鎵撳嵃</el-button> -->
     </div>
     <div class="arrowsBox">
       <div
@@ -59,6 +60,10 @@
       type: Boolean,
       default: false
     },
+    isCancel:{
+      type:Boolean,
+      default:false,
+    },
     isValidateClick: {
       type: Boolean,
       default: false
@@ -66,7 +71,11 @@
     showOther: {
       type: Boolean,
       default: true
-    }
+    },
+    showCancel: {
+      type: Boolean,
+      default:false
+    },
   },
   data() {
     return {}
@@ -79,6 +88,10 @@
     // 鍒犻櫎
     delClick() {
       this.$emit("delClick")
+    },
+    // 鍙栨秷
+    btnCancel(){
+      this.$emit("btnCancel")
     }
   }
 }

--
Gitblit v1.8.0