客户储位调拨申请

fe/PC/src/utils/detailsTableColumns/index.js

@@ -1955,35 +1955,36 @@ export const interStorageAllocationNote =  [
   { label: "原因", prop: 'reason' },
   // -----------------------------------------------------------------------
 ]
-// 客户储位调拨申请 已调整
+// 客户储位调拨申请 20230410
 export const customerStorageAllocationRequest =  [
   { label: "物品代码", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "调拨数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "批次", prop: "fromLot" },
   { label: "箱码", prop: "fromPackingCode" },
   { label: "调出库位", prop: "fromLocationCode" },
   { label: "调入库位", prop: "toLocationCode" },
-  { label: "在途库位", prop: "inTransitLocation" },
+  // { label: "在途库位", prop: "inTransitLocation" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
   // -----------------------------------------------------------------------
-  { label: "正厂编码", prop: "supllierItemCode" },
-  { label: "部门代号", prop: "departmentCode" },
-  { label: "交易码", prop: "transactioncode" },
-  { label: "次交易码", prop: "secondaryTransactioncode" },
+  { label: "创建者ID", prop: "creatorId" },
+  // { label: "正厂编码", prop: "supllierItemCode" },
+  // { label: "部门代号", prop: "departmentCode" },
+  // { label: "交易码", prop: "transactioncode" },
+  // { label: "次交易码", prop: "secondaryTransactioncode" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "任务编号", prop: 'number' },
   { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
-  { label: "来源箱码", prop: 'fromPackingCode' },
   { label: "目标箱码", prop: 'toPackingCode' },
-  { label: "来源批次", prop: 'fromLot' },
   { label: "目标批次", prop: 'toLot' },
   { label: "供应商批次", prop: 'supplierBatch' },
-  { label: "生效时间", prop: 'arriveDate', type: "dateTime" },
+  { label: "到货时间", prop: 'arriveDate', type: "dateTime" },
   { label: "生产时间", prop: 'produceDate', type: "dateTime" },
   { label: "过期时间", prop: 'expireDate', type: "dateTime" },
   { label: "来源库位组", prop: 'fromLocationGroup' },
@@ -1992,12 +1993,15 @@ export const customerStorageAllocationRequest =  [
   { label: "目标库区", prop: 'toLocationArea' },
   { label: "来源ERP库位", prop: 'fromLocationErpCode' },
   { label: "目标ERP库位", prop: 'toLocationErpCode' },
-  { label: "仓库", prop: 'warehouseCode' },
+  // { label: "仓库", prop: 'warehouseCode' },
   { label: "来源仓库", prop: 'fromWarehouseCode' },
   { label: "目标仓库", prop: 'toWarehouseCode' },
-  { label: "fromStatus", prop: 'fromStatus' },
-  { label: "toStatus", prop: 'toStatus' },
+  { label: "从状态", prop: "fromStatus",type: "filter", filters: "requestStatus" },
+  { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
   { label: "原因", prop: 'reason' },
+  { label: "ID", prop: 'id' },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
   // -----------------------------------------------------------------------
 ]
 // 客户储位调拨确认 20230410

fe/PC/src/utils/tableColumns/index.js

@@ -3102,7 +3102,7 @@ export const interStorageAllocationNote =  [
   { label: "任务ID", prop: "jobNumber" },
   // -----------------------------------------------------------------------
 ]
-// 客户储位调拨申请 已调整
+// 客户储位调拨申请 20230410
 export const customerStorageAllocationRequest =  [
   {
     label: "调拨申请单号",
@@ -3112,12 +3112,13 @@ export const customerStorageAllocationRequest =  [
     width: orderWidth
   },
   { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
-  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "生效日期", prop: "activeDate",type:"dateTime" },
   { label: "操作员", prop: "worker" },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type:"dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "仓库", prop: "warehouseCode" },
-  { label: "公司", prop: 'company',},
+  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "公司", prop: 'company',},
   { label: "备注", prop: 'remark' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot"},
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot"},

fe/PC/src/utils/tabsDesTions/index.js

@@ -2473,11 +2473,11 @@ export const interStorageAllocationNote =  [
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
-// 客户储位调拨申请 已调整 1
+// 客户储位调拨申请 已调整 20230410
 export const customerStorageAllocationRequest =  [
   { label: "调拨申请单号", prop: "number" },
   { label: "状态", type: "filter", filters: "requestStatus", prop: "requestStatus" },
-  { label: "申请日期", prop: "activeDate",type:"dateTime" },
+  { label: "生效日期", prop: "activeDate",type:"dateTime" },
   { label: "操作员", prop: "worker" },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
@@ -2491,8 +2491,8 @@ export const customerStorageAllocationRequest =  [
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: "warehouseCode" },
-  { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: "warehouseCode" },
+  // { label: "公司", prop: 'company' },
   { label: "备注", prop: 'remark' },
   { label: "调拨类型", prop: 'type' },
   { label: "ID", prop: 'id' },