wangggziwen vor 2 Jahren
Ursprung
Commit
6c8dc5e603

+ 45 - 22
ui/src/views/approve/approveDetail/sai-apply-detail.vue

@@ -772,7 +772,7 @@ export default {
             this.inspectDisabled = true;
             break;
           case 5:
-            this.showAssess = true;
+            this.showAssess = false;
             this.assessDisabled = true;
             break;
         }
@@ -1193,30 +1193,53 @@ export default {
      * 处理流程操作按钮点击事件
      */
     dataFormSubmit(condition) {
-      this.$refs["form"].validate(valid => {
-        if (valid) {
-          // 验证人字符串拼接
-          this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
-          // VE验证条款字符串拼接
-          if (this.veItemsList.length != 0) {
-            this.dataForm.veItems = "";
-            for (let i = 0; i < this.veItemsList.length; i++) {
-              this.dataForm.veItems += this.veItemsList[i];
-              if (i != this.veItemsList.length - 1) {
-                this.dataForm.veItems += ",";
-              }
+      if (condition == 0) {
+        // 验证人字符串拼接
+        this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
+        // VE验证条款字符串拼接
+        if (this.veItemsList.length != 0) {
+          this.dataForm.veItems = "";
+          for (let i = 0; i < this.veItemsList.length; i++) {
+            this.dataForm.veItems += this.veItemsList[i];
+            if (i != this.veItemsList.length - 1) {
+              this.dataForm.veItems += ",";
             }
           }
-          this.taskForm.saiApply = this.dataForm;
-          this.taskForm.condition = condition;
-          handleApply(this.taskForm).then(response =>{
-            this.msgSuccess("提交成功");
-            this.visible = false;
-            // refreshDataList事件:调用父组件getList方法刷新页面
-            this.$emit('refreshDataList');
-          });
         }
-      })
+        this.taskForm.saiApply = this.dataForm;
+        this.taskForm.condition = condition;
+        handleApply(this.taskForm).then(response =>{
+          this.msgSuccess("提交成功");
+          this.visible = false;
+          // refreshDataList事件:调用父组件getList方法刷新页面
+          this.$emit('refreshDataList');
+        });
+      } else {
+        this.$refs["form"].validate(valid => {
+          if (valid) {
+            // 验证人字符串拼接
+            this.dataForm.inspectors = this.inspector1 + "," + this.inspector2;
+            // VE验证条款字符串拼接
+            if (this.veItemsList.length != 0) {
+              this.dataForm.veItems = "";
+              for (let i = 0; i < this.veItemsList.length; i++) {
+                this.dataForm.veItems += this.veItemsList[i];
+                if (i != this.veItemsList.length - 1) {
+                  this.dataForm.veItems += ",";
+                }
+              }
+            }
+            this.taskForm.saiApply = this.dataForm;
+            this.taskForm.condition = condition;
+            handleApply(this.taskForm).then(response =>{
+              this.msgSuccess("提交成功");
+              this.visible = false;
+              // refreshDataList事件:调用父组件getList方法刷新页面
+              this.$emit('refreshDataList');
+            });
+          }
+        })
+      }
     },
     /**
      * 保存按钮点击事件

+ 1 - 0
ui/src/views/production/apply/all/index.vue

@@ -1178,6 +1178,7 @@ export default {
      },
     // 取消按钮
     cancel() {
+      this.delayOpen = false;
       this.saiOpen = false;
       this.open = false;
       this.reset();

+ 1 - 0
ui/src/views/production/apply/mine/index.vue

@@ -1194,6 +1194,7 @@
       },
       // 取消按钮
       cancel() {
+        this.delayOpen = false;
         this.saiOpen = false;
         this.open = false;
         this.reset();

+ 1 - 0
ui/src/views/production/apply/pending/index.vue

@@ -1191,6 +1191,7 @@
       },
       // 取消按钮
       cancel() {
+        this.delayOpen = false;
         this.saiOpen = false;
         this.open = false;
         this.reset();