修改调拨实际数量部分

src/views/activiti/form/ProcessMaterialsAllot.vue

@@ -4,7 +4,7 @@
     <a-tabs>
       <a-tab-pane tab="流程正文" key="1" forceRender>
         <process-materials-allot-form :isNew="isNew" :processData="processData" :disabled="disabled" :hieg="hieg"
-                                      @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" :actualNumber = "actualNumber"
+                                      @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" :allotShuNumber = "allotShuNumber"
                                       @backTask="backTask" @loadData="loadData"/>
       </a-tab-pane>
 
@@ -36,7 +36,7 @@
         required: false
       },
       //表单禁用
-      actualNumber: {
+      allotShuNumber: {
         type: Boolean,
         default: true, //默认值
         required: false //必传值
@@ -67,6 +67,9 @@
         required: false
       }
     },
+    created() {
+      console.log("=323-3=",this.allotShuNumber);
+    },
     methods: {
       afterSub(formData) {
         this.$emit('afterSubmit', formData)

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -74,7 +74,6 @@
           :columns="processMaterialsAllotListTable.columns"
           :dataSource="processMaterialsAllotListTable.dataSource"
           :maxHeight="300"
-          :disabled="this.heid"
           :isabled="isabled"
           :rowNumber="true"
           :rowSelection="true"
@@ -267,12 +266,12 @@
             // },
             {
               title: '实发数',
-              key: 'actualSendNumber',
+              key: 'allotSendNumber',
               type: FormTypes.inputNumber,
               width: '130px',
               placeholder: '请输入${title}',
               defaultValue: '',
-              disabled: this.actualNumber
+              disabled: this.allotShuNumber
             },
             {
               title: '库存数量',
@@ -362,6 +361,7 @@
         url: {
           queryByIdDescription: "/description/processDescription/queryById",
           queryByIdMerchandiseNews: "/merchandisenews/processMerchandiseNews/queryById",
+          wastematerialsList: "/wastematerials/processWasteMaterials/list",
           wastematerialsByid: "/wastematerials/processWasteMaterials/queryById",
           getForm: '/actBusiness/getForm',
           add: '/hy/processMaterialsAllot/add',
@@ -397,6 +397,7 @@
         materialTypeRecord: undefined,
         qeihuan: undefined, //切换
         kucun: 0, //切换
+        hiegkucun: [], //切换
       }
     },
     props: {
@@ -428,7 +429,7 @@
         required: false
       },
       //表单禁用
-      actualNumber: {
+      allotShuNumber: {
         type: Boolean,
         // default: false, //默认值
         required: true //必传值
@@ -459,7 +460,7 @@
         // console.log("this.disabled",this.disabled);
         // console.log("this.heid",this.heid);
         this.heid = this.hieg;
-        // console.log("this.disabled",this.disabled);
+        console.log("this.allotNumber====",this.allotShuNumber);
         return this.disabled
       },
       showFlowSubmitButton() {
@@ -488,22 +489,34 @@
     },
     methods: {
       async seeWateNumber(log) {
+        // console.log(this.allotShuNumber,"asdfasd===")
         //物料类型
         //this.assigneesText
         let pas = await log.target.getValuesPromise(log.rowIds);
         // console.log(pas,log);
-        if(!!pas[log.index].equipment){
-          // console.log(pas);
-         if(this.bigIdMerchandiseNewsList.length >0 ){
-           this.bigIdMerchandiseNewsList.forEach(item => {
-             if(item.merchandiseNewsId == pas[log.index].equipment){
-               console.log("asdfaSD",item);
-             }
-           });
-         }
-        }
-
+        if(!!pas[log.index].equipment && !this.allotShuNumber) {
+          console.log(pas);
+          let did = '';
+          this.form.validateFields((err, values) => {
+            // 这里做逻辑处理
+            console.log(values.beAllotDepartment) // { username: '' }
+            if(!!values.beAllotDepartmen){
+              did = values.beAllotDepartmen;
+            }
+          });
+          let param = {merchandiseNewsId : pas[log.index].equipment,
+            departId : did
+          }
+          getAction(this.url.wastematerialsList,param).then(res =>{
+              if(res.success){
+                // console.log(res.result.records[0].materialQuantity,"edsrtg");
+                this.kucun = res.result.records[0].materialQuantity;
+              }
+          }).catch(()=>{
+            this.kucun = 0;
+          });
 
+        }
       },
       //加載項目部
       getUnit(){
@@ -549,7 +562,7 @@
 
         // }
         if (!!record.row.equipment  && !record.row.allotNumber  && isDB && this.materialGroupId !== record.row.materialGroup) {
-          console.log("执行materialNumber")
+          // console.log("执行materialNumber")
 
           await this.$refs.processMaterialsAllotList.getValues((a, b, c) => {
             // console.log("bbbbbbbbbbbbbb",b)
@@ -791,11 +804,11 @@
               //   this.heid = false
                 getAction(this.url.unitWasteNameUrl, null).then((res) => {
                   if (res.success) {
-                    if (this.processMaterialsAllotListTable.columns[6].options.length > 0) {
-                      this.processMaterialsAllotListTable.columns[6].options = []
+                    if (this.processMaterialsAllotListTable.columns[8].options.length > 0) {
+                      this.processMaterialsAllotListTable.columns[8].options = []
                     }
                     res.result.forEach(item => {
-                      this.processMaterialsAllotListTable.columns[6].options.push({
+                      this.processMaterialsAllotListTable.columns[8].options.push({
                         title: item.departName,
                         value: item.unit
                       })
@@ -1075,7 +1088,7 @@
               dataSource = result.records
             }
           }
-
+          this.hiegkucun = [];
           // console.log("tab.dataSource",dataSource)
           dataSource.forEach(item =>{
             let par = { id : item.materialGroup,}
@@ -1090,13 +1103,14 @@
               }
             })
             getAction(this.url.queryByIdMerchandiseNews,param).then( res=>{
-              console.log(res);
+              // console.log(res);
               if(res.success){
                 this.processMaterialsAllotListTable.columns[1].options= [{
                   title : res.result.materialsNumber,
                   value :  item.equipment,
                   disabled : true }];
               }
+              this.hiegkucun.push(res.result);
             })
 
           })

src/views/activiti/form/ProcessMaterialsDelivery.vue

@@ -93,7 +93,7 @@
           id: this.itemId
         }).then((res) => {
           if (res.success) {
-            console.log(res.result,"***********************************************************")
+            // console.log(res.result,"***********************************************************")
             if (res.result.isOffice==2){
               this.isIfShow=true
             }

src/views/activiti/todoManage.vue

@@ -157,6 +157,7 @@
                  :isTable="lcModa.isTable"
                  :itemId="lcModa.itemId"
                  :actualNumber = "lcModa.actualNumber"
+                 :allotShuNumber = "lcModa.allotShuNumber"
                  @afterSubmit="afterSub"
                  @passTask="()=>passTask(lcModa.processData)"
                  @backTask="()=>backTask(lcModa.processData)" :procInstId="lcModa.procInstId"
@@ -292,6 +293,7 @@
           title: '',
           disabled: false,
           actualNumber: true,
+          allotShuNumber: true,
           visible: false,
           formComponent: null,
           isNew: false,
@@ -493,6 +495,15 @@
         }else{
           this.lcModa.actualNumber = true;
         }
+
+        if(r.name === '生产供应站' && r.processName === '物资调拨流程'){
+          console.log("生产供应站 物资调拨流程 =======")
+          this.lcModa.allotShuNumber = false;
+        }else{
+          console.log("生产供应站 物资调拨流程 1111111111111")
+          this.lcModa.allotShuNumber = true;
+        }
+
         if (!r.routeName) {
           this.$message.warning(
             '该流程信息未配置表单，请联系开发人员！'