采购订单维护-货位位置调整

src/views/purchase/purchase-order/add/column.js

@@ -382,6 +382,24 @@ const PurchaseTabColumns =[
         },
       },
       {
+        key: "goodsAllocationName",
+        title: "货位",
+        inputType: "PopoverSelect",
+        valueKey: "id",
+        referName: "ALLOCATION_PARAM",
+        dataMapping: {
+          goodsAllocation: 'id',
+          goodsAllocationName: 'name',
+    
+        },
+         isShow:true,
+        queryParams: (params) => ({
+          stordocId: params.warehouse,
+          pkOrg: params.puOrg,
+        }),
+        width: 180,
+      },
+      {
         key: "rowNo",
         title: "行号",
         inputType: "Input",
@@ -411,7 +429,6 @@ const PurchaseTabColumns =[
           manufacturerName:'manufacturerIdName',
           unit:'unitId',
           unitName:'unitIdName',
-          // tax:'materialRateName',
           storageCondition:'storageCondition',
           carriageCondition:'transportationCondition',
           materialClassifyOneName:'oneClass',
@@ -495,24 +512,7 @@ const PurchaseTabColumns =[
         width: 180,
         isSummary:true,
        },
-       {
-        key: "goodsAllocationName",
-        title: "货位",
-        inputType: "PopoverSelect",
-        valueKey: "id",
-        referName: "ALLOCATION_PARAM",
-        dataMapping: {
-          goodsAllocation: 'id',
-          goodsAllocationName: 'name',
-    
-        },
-         isShow:true,
-        queryParams: (params) => ({
-          stordocId: params.warehouse,
-          pkOrg: params.puOrg,
-        }),
-        width: 180,
-      },
+       
        {
         key: "isGift",
         title: "赠品",
@@ -1167,6 +1167,24 @@ const CauseTabColumns =[
         },
       },
       {
+        key: "goodsAllocationName",
+        title: "货位",
+        inputType: "PopoverSelect",
+        valueKey: "id",
+        referName: "ALLOCATION_PARAM",
+        dataMapping: {
+          goodsAllocation: 'id',
+          goodsAllocationName: 'name',
+
+        },
+        isShow:true,
+        queryParams: (params) => ({
+          stordocId: params.warehouse,
+          pkOrg: params.puOrg,
+        }),
+        width: 180,
+      },
+      {
         key: "rowNo",
         title: "行号",
         inputType: "Input",
@@ -1186,7 +1204,6 @@ const CauseTabColumns =[
           material: "id",
           materialName: "name",
           materialCode: "code",
-          // materialClassify:'classifyIdName',
           materialManufacturersCode:'manufacturersMaterialCode',
           specification:'specification',
           model:'model',
@@ -1298,24 +1315,7 @@ const CauseTabColumns =[
         width: 180,
         isSummary:true,
        },
-       {
-        key: "goodsAllocationName",
-        title: "货位",
-        inputType: "PopoverSelect",
-        valueKey: "id",
-        referName: "ALLOCATION_PARAM",
-        dataMapping: {
-          goodsAllocation: 'id',
-          goodsAllocationName: 'name',
-
-        },
-        isShow:true,
-        queryParams: (params) => ({
-          stordocId: params.warehouse,
-          pkOrg: params.puOrg,
-        }),
-        width: 180,
-      },
+       
        {
         key: "ntaxnetprice",
         title: "含税净价",

src/views/purchase/purchase-order/column.js

@@ -814,6 +814,12 @@ const PurTabColumns = [
         },
       },
       { 
+        item:{ key: "goodsAllocationName", title: "货位",width:100,},
+        attr:{
+          isHidden:true,
+        },
+      },
+      { 
         item:{
           key: "rowNo", title: "行号",width:80,},
         attr:{
@@ -877,12 +883,7 @@ const PurTabColumns = [
           isSummary:true,
         },
       },
-      { 
-        item:{ key: "goodsAllocationName", title: "货位",width:100,},
-        attr:{
-          isHidden:true,
-        },
-      },
+     
       {
         item:{
           
@@ -1119,12 +1120,20 @@ const CommonTabColumns = [
     key: 'puOrderItemList',
     tableColumns: [
       { 
+        item:{ key: "goodsAllocationName", title: "货位",width:100,},
+        attr:{
+          isHidden:true,
+        },
+        
+      },
+      { 
         item:{
           key: "rowNo", title: "行号",width:80,},
         attr:{
           isHidden:true,
         },
       },
+      
       // { item:{key: "orderId", title: "采购订单ID" },
       { 
         item:{ key: "demandCode", title:"采购需求单号",width:150,},
@@ -1262,13 +1271,7 @@ const CommonTabColumns = [
           isSummary:true,
         },
       },
-      { 
-        item:{ key: "goodsAllocationName", title: "货位",width:100,},
-        attr:{
-          isHidden:true,
-        },
-        
-      },
+      
       { 
         item:{key: "tax", title: "税率" ,width:120, },
         attr:{