修改入库数量判断逻辑

src/views/activiti/form/ProcessMaterialWarehousingForm.vue

@@ -124,10 +124,12 @@
     <div class="div_process">
       <div v-if="isGetOneAndLast">
         <a-form-item v-if="!disabled" :wrapperCol="{ span: 24 }" style="text-align: center">
+           <span v-if="quantityChange">
           <a-button type="primary" :disabled="disabled||btndisabled" @click="handleSubmit">保存</a-button>
           <a-button style="margin-left: 8px" type="primary" :disabled="disabled||btndisabled" @click="applySubmit">提交申请
           </a-button>
           <a-button style="margin-left: 8px" :disabled="disabled" @click="close">取消</a-button>
+           </span>
         </a-form-item>
         <a-form-item v-if="task" :wrapperCol="{ span: 24 }" style="text-align: center">
           <a-button type="primary" @click="passTask">通过</a-button>
@@ -456,7 +458,7 @@
     methods: {
       //tab 值改变触发事件
       async onSelect(record) {
-        console.log(record.row,"----------------------->>",this.processUdgetPlanIds);
+        console.log(record.row.id,"----------------------->>",this.processUdgetPlanIds);
         let warehousingQuantity=0;
         //需要查询物资采购数量入库的批次数量总和不能超过采购的数量
           //1、当前采购数量
@@ -464,25 +466,12 @@
         params.materialGroup=record.row.materialGroup;
         params.materialNumber=record.row.materialNumber;
         params.planId=this.processUdgetPlanIds;
-       await this.getAction(this.url.queryQuantityByPlanId,params).then((res) => {
-          if (res.success) {
-            if(res.result!=null){
-              this.planQuantity=res.result;
-            }
-          }
-        })
+
           //2、根据关联的入库数量
        // materialGroup
        // materialNumber
-        await  this.getAction(this.url.queryQuantityByProcessUdgetPlanId,params).then((res) => {
-          if (res.success) {
-            if(res.result!=null){
-              this.warehousingQuantity=res.result;
-            }
-          }
-        })
-        console.log('表单回显数据11', this.planQuantity)
-        console.log('表单回显数据2', this.warehousingQuantity)
+
+
         if (record.row.materialPrice !== '' && record.row.materialQuantity !== '') {
           if (record.row.id !== undefined) {
             let values = [
@@ -493,6 +482,23 @@
                 }
               }
             ]
+            await this.getAction(this.url.queryQuantityByPlanId,params).then((res) => {
+              if (res.success) {
+                if(res.result!=null){
+                  this.planQuantity=res.result;
+                }
+              }
+            })
+            params.historyId=record.row.id;
+            console.log('表单回显数据11', this.planQuantity)
+            await  this.getAction(this.url.queryQuantityByProcessUdgetPlanId,params).then((res) => {
+              if (res.success) {
+                if(res.result!=null){
+                  this.warehousingQuantity=res.result;
+                }
+              }
+            })
+            console.log('表单回显数据2', this.warehousingQuantity)
             if(this.planQuantity-this.warehousingQuantity-record.row.materialQuantity<0){
               this.$message.error('入库数量不能大于采购数量')
               this.quantityChange=false;
@@ -639,7 +645,8 @@
             if (formData.processMaterialWarehousingListList[i].materialPrice*formData.processMaterialWarehousingListList[i].materialQuantity!=formData.processMaterialWarehousingListList[i].materialAmount){
               this.$message.error('请检查入库数量');
               return;
-            }else if (e==true){
+            }
+            if (e==true){
               this.passTask()
             }
           }

src/views/activiti/form/ProcessUdgetPlanForm.vue

@@ -1214,9 +1214,9 @@
           // 这里做逻辑处理
           console.log(values) // { username: '' }
           if (val==1 && values.materialType!=6 ){
-            this.isIfInspection = true
+            this.isIfDirect = true
           }else {
-            this.isIfInspection = false
+            this.isIfDirect = false
           }
         })
 
@@ -1519,7 +1519,7 @@
         })
       },
       saveAndpassTask() {
-              this.handleSubmit(true)
+        this.handleSubmit(true)
       },
       // handler
       handleSubmit(e) {
@@ -1586,7 +1586,8 @@
                     }
                   }
                 }
-              }else if (e==true){
+              }
+              if (e==true){
                 this.passTask()
               }
               console.log(formData, '格式化的数据')