Browse Source

采购订单维护-订单类型为【ZY采购+传wms系统+退厂、普通采购+传wms系统+退厂、GH普通采购+传wms+退厂、资产采购+传OA】时WMS仓库不填,订单类型为前三类型时只能选中心仓(C10、C1、C2、C3、C4、C5)

002390 1 year ago
parent
commit
5eb981a8b8

+ 8 - 2
src/views/purchase/purchase-order/add/column.js

@@ -103,6 +103,7 @@ const PurColumns =[
     },
     },
     queryParams: (params) => ({
     queryParams: (params) => ({
       pkOrg: params.puOrg,
       pkOrg: params.puOrg,
+      isWms: ['21-Cxx-02','21-Cxx-04','21-Cxx-10'].find(item => item === params.billType) ? 'Y' : 'N',
     }),
     }),
     isShow:true,
     isShow:true,
     
     
@@ -296,7 +297,9 @@ const PurColumns =[
       puDept: 'id',
       puDept: 'id',
       puDeptName: 'name'
       puDeptName: 'name'
     },
     },
-    queryParams: () => ({}),
+    queryParams: (params) => ({
+      drpOrg: params.puOrg,
+    }),
     require: true,
     require: true,
     isShow:true,
     isShow:true,
   },
   },
@@ -845,7 +848,9 @@ const CauseColumns =[
       puDept: 'id',
       puDept: 'id',
       puDeptName: 'name'
       puDeptName: 'name'
     },
     },
-    queryParams: () => ({}),
+    queryParams: (params) => ({
+      drpOrg: params.puOrg,
+    }),
     require: true,
     require: true,
     isShow:true,
     isShow:true,
   },
   },
@@ -924,6 +929,7 @@ const CauseColumns =[
     },
     },
     queryParams: (params) => ({
     queryParams: (params) => ({
       pkOrg: params.puOrg,
       pkOrg: params.puOrg,
+      isWms: ['21-Cxx-02','21-Cxx-04','21-Cxx-10'].find(item => item === params.billType) ? 'Y' : 'N',
     }),
     }),
     isShow:true,
     isShow:true,
     
     

+ 2 - 1
src/views/purchase/purchase-order/add/index.vue

@@ -104,7 +104,8 @@ export default {
     "params.billType":{
     "params.billType":{
       handler(nVal, oVal){
       handler(nVal, oVal){
 
 
-        let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
+        // let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
+        let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10', '21-Cxx-14'];
         
         
         if(billList.find(item => item === nVal)){
         if(billList.find(item => item === nVal)){
           this.rules.warehouseName = [
           this.rules.warehouseName = [

+ 2 - 1
src/views/purchase/purchase-order/edit/index.vue

@@ -84,7 +84,8 @@ export default {
     "params.billType":{
     "params.billType":{
       handler(nVal, oVal){
       handler(nVal, oVal){
 
 
-        let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
+        // let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10','21-Cxx-14','21-Cxx-09','21-Cxx-17','21-Cxx-18'];
+        let billList = ['21-Cxx-02','21-Cxx-04','21-Cxx-10', '21-Cxx-14'];
         
         
         if(billList.find(item => item === nVal)){
         if(billList.find(item => item === nVal)){
           this.rules.warehouseName = [
           this.rules.warehouseName = [

+ 1 - 1
src/views/purchase/purchase-order/index.vue

@@ -365,7 +365,7 @@ export default {
           _this.loading = true;
           _this.loading = true;
 
 
           let { code,msg } = await orderApi.submit({ puOrderIds,checkAmount:true});
           let { code,msg } = await orderApi.submit({ puOrderIds,checkAmount:true});
-          console.log(code,'code');
+
           if (code == 200) {
           if (code == 200) {
 
 
             _this.handleRefreshList();
             _this.handleRefreshList();