lxf il y a 1 an
Parent
commit
b4d8f1f522
1 fichiers modifiés avec 3 ajouts et 11 suppressions
  1. 3 11
      src/views/process/processApproval/index.vue

+ 3 - 11
src/views/process/processApproval/index.vue

@@ -15,15 +15,7 @@
             type="primary"
             size="small"
             @click="clickViewPackaging()"
-            v-if="queryData.query.processType && queryData.query.processType == '20' && queryData.query.flowKey == 'order'"
-            v-preReClick>
-            包装配置
-          </el-button>
-          <el-button
-            type="primary"
-            size="small"
-            @click="handlePackagingConfiguration()"
-            v-if="queryData.query.processType && queryData.query.processType == '10' && queryData.query.flowKey == 'order'"
+            v-if="queryData.query.processType && ['10' , '20'].includes(queryData.query.processType) && queryData.query.flowKey == 'order'"
             v-preReClick>
             包装配置
           </el-button>
@@ -365,8 +357,8 @@ const handleSubmit = async (_type) => {
         if (valid) {
           if (queryData.query.flowKey == "order") {
             ElMessageBox.confirm("请确认包装配置", "提示", {
-              confirmButtonText: "确定",
-              cancelButtonText: "取消",
+              confirmButtonText: "确定",
+              cancelButtonText: "未确认",
               type: "warning",
             })
               .then(() => {