修改调拨

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"
+                                      @afterSubmit="afterSub" @close="close" :task="task" @passTask="passTask" :actualNumber = "actualNumber"
                                       @backTask="backTask" @loadData="loadData"/>
       </a-tab-pane>
 
@@ -35,6 +35,12 @@
         default: true,
         required: false
       },
+      //表单禁用
+      actualNumber: {
+        type: Boolean,
+        default: true, //默认值
+        required: false //必传值
+      },
       /*流程数据*/
       isNew: { type: Boolean, default: false, required: false },
       task: { type: Boolean, default: false, required: false },

src/views/activiti/form/ProcessMaterialsAllotForm.vue

@@ -84,7 +84,17 @@
           :actionButton="!task"
           @valueChange="onSelect"
           @descriptionFetch="fetchMerchandiseNews"
-        />
+        >
+          <template v-slot:materialNumber="props">
+            <a-tooltip placement="top">
+              <template v-slot:title="props">
+                库存数：{{ kucun }}
+              </template>
+              <a-button @mouseenter="seeWateNumber(props)">库存</a-button>
+            </a-tooltip>
+            <!--          <a-button @click="chaKan(props)">查看</a-button>-->
+          </template>
+        </p-editable-table>
       </a-tab-pane>
     </a-tabs>
 <!--    <j-form-container >
@@ -264,6 +274,15 @@
               defaultValue: '',
               disabled: this.actualNumber
             },
+            {
+              title: '库存数量',
+              key: 'materialWateNumber',
+              type: FormTypes.slot,
+              disabled: this.disabled,
+              width: '80px',
+              slotName: 'materialNumber'
+              // scopedSlots: {customRender: 'fileSlot'}
+            },
             {
               title: '接收调拨目标',
               key: 'allotTarget',
@@ -343,6 +362,7 @@
         url: {
           queryByIdDescription: "/description/processDescription/queryById",
           queryByIdMerchandiseNews: "/merchandisenews/processMerchandiseNews/queryById",
+          wastematerialsByid: "/wastematerials/processWasteMaterials/queryById",
           getForm: '/actBusiness/getForm',
           add: '/hy/processMaterialsAllot/add',
           edit: '/hy/processMaterialsAllot/edit',
@@ -375,7 +395,8 @@
         queryParamsUntil: [],
         materialGroupId: undefined,
         materialTypeRecord: undefined,
-        qeihuan: undefined
+        qeihuan: undefined, //切换
+        kucun: 0, //切换
       }
     },
     props: {
@@ -407,6 +428,12 @@
         required: false
       },
       //表单禁用
+      actualNumber: {
+        type: Boolean,
+        // default: false, //默认值
+        required: true //必传值
+      },
+      //表单禁用
       disabled: {
         type: Boolean,
         default: false,
@@ -460,6 +487,24 @@
       }
     },
     methods: {
+      async seeWateNumber(log) {
+        //物料类型
+        //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);
+             }
+           });
+         }
+        }
+
+
+      },
       //加載項目部
       getUnit(){
         getAction(this.url.listByuntil).then((res) => {
@@ -650,7 +695,7 @@
           })
           getAction(this.url.merchandiseNewsList, par).then((res) => {
             if (res.success) {
-              console.log(res.result)
+              // console.log(res.result)
               let newList = res.result
 
               if (numberList.length > 0) {
@@ -689,37 +734,17 @@
 
       },
       descriptionFetchData(type,value) { //查询物料组
-        //查询数据
-        // let par = {
-        //   delFlag: 0,
-        //   accountingAttributes: value
-        //   // departId: this.data.departId
-        // }
-        // getAction(this.url.descriptionRake, par).then((res) => {
-        //   if (res.success) {
-        //
-        //     if (this.processMaterialsAllotListTable.columns[0].options.length > 0) {
-        //       this.processMaterialsAllotListTable.columns[0].options = []
-        //     }
-        //     res.result.forEach(item => {
-        //       this.processMaterialsAllotListTable.columns[0].options.push({
-        //         title: item.materialClassify,
-        //         value: item.descriptionId
-        //       })
-        //     })
-        //   }
-        // })
         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 => {
               let is= false;
               if(item.unit === value){
                 is = true;
               }
-              this.processMaterialsAllotListTable.columns[6].options.push({
+              this.processMaterialsAllotListTable.columns[8].options.push({
                 title: item.departName,
                 value: item.unit,
                 disabled : is
@@ -727,7 +752,6 @@
             })
           }
         })
-        this.materialGroupId = undefined
 
       },
 

src/views/regime/ProcessRegimeList.vue

@@ -66,7 +66,7 @@
       <a-table
         ref="table"
         size="middle"
-        :scroll="{x:true, y: 200}"
+        :scroll="{x:true, y: 600}"
         bordered
         rowKey="id"
         :columns="columns"