From 456485e640c4d5e2acd15fee703803eed37e5547 Mon Sep 17 00:00:00 2001
From: long <18782126717@163.com>
Date: Tue, 14 Feb 2023 17:31:30 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E5=85=A5=E5=BA=93=E6=95=B0?=
 =?UTF-8?q?=E9=87=8F=E5=88=A4=E6=96=AD=E9=80=BB=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/activiti/applyList.vue              |  5 ++
 .../form/ProcessMaterialWarehousingForm.vue   | 71 +++++++++++++++++--
 2 files changed, 70 insertions(+), 6 deletions(-)

diff --git a/src/views/activiti/applyList.vue b/src/views/activiti/applyList.vue
index d0fed1c..5038f1b 100644
--- a/src/views/activiti/applyList.vue
+++ b/src/views/activiti/applyList.vue
@@ -245,6 +245,7 @@
             // align:"left",
             dataIndex: 'title',
             align:"center",
+            width: '150px',
             scopedSlots: { customRender: 'logContent' },
             sorter: true
           },
@@ -252,18 +253,21 @@
             title: '所属流程',
             dataIndex: 'processName',
             align:"center",
+            width: '150px',
             sorter: true
           },
           {
             title: '当前环节',
             dataIndex: 'currTaskName',
             align:"center",
+            width: '180px',
             sorter: true
           },
           {
             title: '状态',
             dataIndex: 'status_dictText',
             align:"center",
+            width: '120px',
             scopedSlots: {customRender: 'status'},
             sorter: true
 
@@ -271,6 +275,7 @@
           {
             title: '结果',
             dataIndex: 'result_dictText',
+            width: '120px',
             scopedSlots: {customRender: 'result'},
             align:"center",
             sorter: true
diff --git a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
index 33031f6..b730635 100644
--- a/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
+++ b/src/views/activiti/form/ProcessMaterialWarehousingForm.vue
@@ -549,10 +549,10 @@
         this.$emit('backTask')
       },
       /*提交申请*/
-      applySubmit(e) {
+       applySubmit(e) {
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
-        }).then(allValues => {
+        }).then(async allValues => {
           if (typeof this.classifyIntoFormData !== 'function') {
             throw this.throwNotFunction('classifyIntoFormData')
           }
@@ -564,6 +564,35 @@
             } else {
               this.describes = this.describes + '---' + formData.processMaterialWarehousingListList[i].materialName
             }
+            //查询
+            let params={};
+            params.materialGroup=formData.processMaterialWarehousingListList[i].materialGroup;
+            params.materialNumber=formData.processMaterialWarehousingListList[i].materialNumber;
+            params.planId=this.processUdgetPlanIds;
+             this.getAction(this.url.queryQuantityByPlanId,params).then((res) => {
+              if (res.success) {
+                if(res.result!=null){
+                  this.planQuantity=res.result;
+                }
+              }
+            })
+            params.historyId=formData.processMaterialWarehousingListList[i].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('表单回显数据21', this.warehousingQuantity)
+            if(this.planQuantity-this.warehousingQuantity-formData.processMaterialWarehousingListList[i].materialQuantity<0){
+              this.$message.error('入库数量不能大于采购数量')
+              this.quantityChange=false;
+              return;
+            }else {
+              this.quantityChange=true;
+            }
             if (formData.processMaterialWarehousingListList[i].materialPrice*formData.processMaterialWarehousingListList[i].materialQuantity!=formData.processMaterialWarehousingListList[i].materialAmount){
               this.$message.error('请检查入库数量');
               return;
@@ -622,7 +651,7 @@
       handleSubmit(e) {
         this.getAllTable().then(tables => {
           return validateFormAndTables(this.form, tables)
-        }).then(allValues => {
+        }).then(async allValues => {
           if (typeof this.classifyIntoFormData !== 'function') {
             throw this.throwNotFunction('classifyIntoFormData')
           }
@@ -642,13 +671,43 @@
             } else {
               this.describes = this.describes + '---' + formData.processMaterialWarehousingListList[i].materialName
             }
+            //查询
+            let params={};
+            params.materialGroup=formData.processMaterialWarehousingListList[i].materialGroup;
+            params.materialNumber=formData.processMaterialWarehousingListList[i].materialNumber;
+            params.planId=this.processUdgetPlanIds;
+            this.getAction(this.url.queryQuantityByPlanId,params).then((res) => {
+              if (res.success) {
+                if(res.result!=null){
+                  this.planQuantity=res.result;
+                }
+              }
+            })
+            params.historyId=formData.processMaterialWarehousingListList[i].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('表单回显数据21', this.warehousingQuantity)
+            if(this.planQuantity-this.warehousingQuantity-formData.processMaterialWarehousingListList[i].materialQuantity<0){
+              this.$message.error('入库数量不能大于采购数量')
+              this.quantityChange=false;
+              return;
+            }else {
+              this.quantityChange=true;
+            }
             if (formData.processMaterialWarehousingListList[i].materialPrice*formData.processMaterialWarehousingListList[i].materialQuantity!=formData.processMaterialWarehousingListList[i].materialAmount){
               this.$message.error('请检查入库数量');
+              e=false;
               return;
             }
-            if (e==true){
-              this.passTask()
-            }
+          }
+          if (e==true){
+            this.passTask()
           }
           formData.describes = this.describes
           console.log('格式化后的数据', formData)