yusheng il y a 1 an
Parent
commit
00fd39f684

+ 4 - 4
src/views/bpm/handleTask/components/purchaseOrder/accountstatement/submit.vue

@@ -5,7 +5,7 @@
         label="审批建议"
         style="margin-bottom: 20px"
         :rules="{
-          required: true,
+          required: false,
           message: '请选择',
           trigger: 'change'
         }"
@@ -121,8 +121,8 @@ export default {
     //保存表格数据
     async handleAudit(pass) {
       let data = await this.getTableValue()
-      this.$refs.formRef.validate(async validate => {
-        if ((!validate || !data) && !!pass) return this.$message.warning('有必填项未填,请检查')
+      // this.$refs.formRef.validate(async validate => {
+        if ((!data) && !!pass) return this.$message.warning('有必填项未填,请检查')
         switch (this.taskDefinitionKey) {
           case 'starter':
             await updateAccountStatementAPI(data);
@@ -149,7 +149,7 @@ export default {
             });
           }
         });
-      })
+      // })
 
     },
     getTableValue() {

+ 1 - 1
src/views/bpm/handleTask/components/saleOrder/accountstatement/inventoryTable.vue

@@ -108,7 +108,7 @@ export default {
             align: 'center',
             show:j.subType==11,
             showOverflowTooltip: true,formatter(_row, _column, cellValue){
-              return cellValue==11?'原货':'实物赔偿'
+              return cellValue==12?'实物赔偿':'原货'
             }
           },
           {

+ 4 - 4
src/views/bpm/handleTask/components/saleOrder/accountstatement/submit.vue

@@ -5,7 +5,7 @@
         label="审批建议"
         style="margin-bottom: 20px"
         :rules="{
-          required: true,
+          required: false,
           message: '请选择',
           trigger: 'change'
         }"
@@ -120,8 +120,8 @@ export default {
     //保存表格数据
     async handleAudit(pass) {
       let data = await this.getTableValue()
-      this.$refs.formRef.validate(async validate => {
-        if ((!validate || !data) && !!pass) return this.$message.warning('有必填项未填,请检查')
+      // this.$refs.formRef.validate(async validate => {
+        if ((!data) && !!pass) return this.$message.warning('有必填项未填,请检查')
         switch (this.taskDefinitionKey) {
           case 'starter':
             await updateAccountStatementAPI(data);
@@ -148,7 +148,7 @@ export default {
             });
           }
         });
-      })
+      // })
 
     },
     getTableValue() {