采购订单维护-事业发展部、集采中心调整表体中货位位置

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

@@ -496,6 +496,24 @@ const PurchaseTabColumns =[
         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: "赠品",
         inputType: "Checkbox",
@@ -607,24 +625,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: "closeReason",
         title: "行关闭/打开原因",
@@ -1298,6 +1299,24 @@ const CauseTabColumns =[
         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: "含税净价",
         inputType: "Input",
@@ -1413,24 +1432,7 @@ const CauseTabColumns =[
       { key: "discountRule", title: "折扣规则编码", inputType: "Input", width: 180 },
       { key: "demandCode", title: "采购需求单号", inputType: "Input", width: 180 },
       { key: "remark", title: "备注", inputType: "Input", width: 200 },
-      {
-        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: "closeReason",
         title: "关闭原因",

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

@@ -877,6 +877,12 @@ const PurTabColumns = [
           isSummary:true,
         },
       },
+      { 
+        item:{ key: "goodsAllocationName", title: "货位",width:100,},
+        attr:{
+          isHidden:true,
+        },
+      },
       {
         item:{
           
@@ -1082,13 +1088,7 @@ const PurTabColumns = [
           isSummary:true,
         },
       },
-      { 
-        item:{ key: "goodsAllocationName", title: "货位",width:100,},
-        attr:{
-          isHidden:true,
-        },
-        
-      },
+      
       { 
         item:{ key: "closeReason", title: "行关闭/打开原因",width:100,},
         attr:{
@@ -1260,28 +1260,23 @@ const CommonTabColumns = [
         item:{key: "money", title: "价税合计" ,width:120, },
         attr:{
           isSummary:true,
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
         },
       },
       { 
+        item:{ key: "goodsAllocationName", title: "货位",width:100,},
+        attr:{
+          isHidden:true,
+        },
+        
+      },
+      { 
         item:{key: "tax", title: "税率" ,width:120, },
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
         },
       },
       { 
         item:{key: "taxDeductMoneya", title: "折扣金额", width:80,  },
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
           isSummary:true,
         },
       },
@@ -1305,39 +1300,23 @@ const CommonTabColumns = [
       { 
         item:{key: "arrivalQty", title: "已到货数量" , width:80,},
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
           isSummary:true,
         },
       },
       { 
         item:{key: "unarrivedQty", title: "未到货数量" , width:80,},
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
           isSummary:true,
         },
       },
       { 
         item:{key: "price", title: "无税单价" , width:120, },
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
         },
       },
       { 
         item:{key: "notaxMoney", title: "无税金额" , width:120, },
         attr:{
-          // is: "el-computed-input-v2",
-          // formatter: (prop) => {
-          //   return prop ? (prop * 1).toFixed(2) : prop;
-          // },
           isSummary:true,
         },
       },
@@ -1670,13 +1649,7 @@ const CommonTabColumns = [
           isHidden:true,
         },
       },
-      { 
-        item:{ key: "goodsAllocationName", title: "货位",width:100,},
-        attr:{
-          isHidden:true,
-        },
-        
-      },
+      
       { 
         item:{ key: "closeReason", title: "行关闭/打开原因",width:100,},
         attr:{