From fe8e3c47fb82bff3421e3fc350769ce783d4f947 Mon Sep 17 00:00:00 2001
From: caoyizhong <1270296080@qq.com>
Date: Wed, 2 Nov 2022 18:12:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=87=BA=E5=BA=93=E6=B5=81=E7=A8=8B=E6=98=BE?=
 =?UTF-8?q?=E7=A4=BA=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../form/ProcessMaterialsDeliveryForm.vue     | 64 +++++++++++++++----
 src/views/activiti/processInsManage.vue       |  1 -
 2 files changed, 50 insertions(+), 15 deletions(-)

diff --git a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue b/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
index 870d6e2..aa3399a 100644
--- a/src/views/activiti/form/ProcessMaterialsDeliveryForm.vue
+++ b/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,
+                  })
+                })
+              }
+            });
           }
         });
+
+
+
       },
 
       /*回显数据*/
diff --git a/src/views/activiti/processInsManage.vue b/src/views/activiti/processInsManage.vue
index cedca44..11f463f 100644
--- a/src/views/activiti/processInsManage.vue
+++ b/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],