出库流程显示数据

src/views/activiti/form/ProcessMaterialsDeliveryForm.vue

@@ -281,8 +281,10 @@
           edit: '/hy/processMaterialsDelivery/edit',
           queryById: '/hy/processMaterialsDelivery/queryById',
           descriptionRake: '/suppliesstronger/processSuppliesStronger/descriptionName', //查询物料组
+          wasteMaterialsUrl: '/suppliesstronger/processSuppliesStronger/descriptionName', //查询物料组
           merchandiseNewsList: '/suppliesstronger/processSuppliesStronger/merchandiseNews',
           puwwlist: "/unitwaste/processUnitWasteWarehouseCode/queryById",
+          unitWasteWarehouseList: "/unitwaste/processUnitWasteWarehouseCode/queryById", //查询目标库
           processMaterialsDeliveryList: {
             list: '/hy/processMaterialsDelivery/queryProcessMaterialsDeliveryListByMainId'
           }
@@ -812,24 +814,58 @@
       //
       // },
       fetchData(value){ //查询物料组
-        //查询大品类数据
-        let par = {
-          delFlag: 0,
-          accountingAttributes: value,
-        }
-        getAction(this.url.descriptionRake,par).then((res)=>{
+        console.log("this.data==============>",this.data)
+        let  params={}
+        params.id=  sessionStorage.getItem('PUWWC_Id')
+        getAction(this.url.unitWasteWarehouseList,params).then((res)=>{
+          console.log(res)
           if(res.success){
-            if(this.processMaterialsDeliveryListTable.columns[0].options.length > 0){
-              this.processMaterialsDeliveryListTable.columns[0].options = [];
+          //  查询大品类数据 账外库
+
+
+            let par = {
+              delFlag: 0,
+              accountingAttributes: value,
+              sysOrgCode: this.data.sysOrgCode
             }
-            res.result.forEach( item => {
-              this.processMaterialsDeliveryListTable.columns[0].options.push({
-                title : item.descriptionName,
-                value : item.descriptionId,
-              })
-            })
+            getAction(this.url.wasteMaterialsUrl,par).then((res)=>{
+              if(res.success){
+                if(this.processMaterialsDeliveryListTable.columns[0].options.length > 0){
+                  this.processMaterialsDeliveryListTable.columns[0].options = [];
+                }
+                res.result.forEach( item => {
+                  this.processMaterialsDeliveryListTable.columns[0].options.push({
+                    title : item.descriptionName,
+                    value : item.descriptionId,
+                  })
+                })
+              }
+            });
+
+          }else{
+            //查询大品类数据 总库
+            let par = {
+              delFlag: 0,
+              accountingAttributes: value,
+            }
+            getAction(this.url.descriptionRake,par).then((res)=>{
+              if(res.success){
+                if(this.processMaterialsDeliveryListTable.columns[0].options.length > 0){
+                  this.processMaterialsDeliveryListTable.columns[0].options = [];
+                }
+                res.result.forEach( item => {
+                  this.processMaterialsDeliveryListTable.columns[0].options.push({
+                    title : item.descriptionName,
+                    value : item.descriptionId,
+                  })
+                })
+              }
+            });
           }
         });
+
+
+
       },
 
       /*回显数据*/

src/views/activiti/processInsManage.vue

@@ -148,7 +148,6 @@
 <script>
 import {activitiMixin} from "./mixins/activitiMixin";
 import {JeecgListMixin} from "../../mixins/JeecgListMixin";
-import ProcessOperationLogList from "../operationlog/ProcessOperationLogList"
 
 export default {
   mixins:[activitiMixin,JeecgListMixin],