线边仓报废字段调整

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

@@ -2363,24 +2363,33 @@ export const lineSideWarehousePaymentNote =  [
   { label: "status", prop: 'status' },
   // -----------------------------------------------------------------------
 ]
-//  线边仓报废申请 已调整
+//  线边仓报废申请 20230412
 export const lineSideWarehouseScrappingRequest =  [
   { label: "物品代码", prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
-  { label: "物品描述", prop: "itemDesc1" },
+  { label: "物品描述1", prop: "itemDesc1" },
+  { label: "物品描述2", prop: "itemDesc2" },
   { label: "数量", prop: "qty" },
   { label: "单位", prop: "uom" },
   { label: "库区", prop:"locationArea" },
   { label: "库位", prop:"locationCode" },
+  { label: "Erp库位", prop: 'locationErpCode' },
+  { label: "库位组", prop: 'locationGroup' },
   { label: "报废原因代码", prop:"reasonCode" },
   { label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
   { label: "创建时间", prop: 'creationTime', type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   // -----------------------------------------------------------------------
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
+  { label: "上次修改者ID", prop: 'lastModifierId' },
   { label: "记录编号", prop: 'number' },
   { label: "备注", prop: 'remark' },
-  { label: "标包计量单位", prop: 'stdPackUom' },
   { label: "标包数量", prop: 'stdPackQty' },
+  { label: "仓库代码", prop: "warehouseCode" },
+  { label: "主表ID", prop: "masterID" },
+  { label: "事务ID", prop: "tenantId" },
+  { label: "ID", prop: 'id' },
+  // { label: "标包计量单位", prop: 'stdPackUom' },
   // -----------------------------------------------------------------------
 ]
 //  线边仓报废记录 已调整

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

@@ -2519,7 +2519,7 @@ export const lineSideWarehousePaymentNote =  [
    { label: "receiptType", prop: 'receiptType' },
    // -----------------------------------------------------------------------
 ]
-// 线边仓报废申请 已调整
+// 线边仓报废申请 20230412
 export const lineSideWarehouseScrappingRequest =  [
   {
     label: "报废申请单号",
@@ -2529,19 +2529,23 @@ export const lineSideWarehouseScrappingRequest =  [
     width: orderWidth
   },
   { label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
+  { label: "创建者ID", prop: 'creatorId' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "公司", prop: 'company' },
+  { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
   { label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "报废类型", prop: 'type' },
+  { label: "备注", prop: 'remark' },
+  { label: "事务ID", prop: "tenantId" },
+  // { label: "仓库", prop: 'warehouseCode' },
+  // { label: "公司", prop: 'company' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓报废记录 已调整

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

@@ -2621,11 +2621,10 @@ export const lineSideWarehousePaymentNote = [
   { label: "ID", prop: 'id' },
   // -----------------------------------------------------------------------
 ]
-// 线边仓报废申请 已调整 1
+// 线边仓报废申请 20230412
 export const lineSideWarehouseScrappingRequest = [
   { label: "报废申请单号", prop: 'number' },
   { label: "状态", prop: "requestStatus",type: "filter", filters: "requestStatus" },
-  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "操作员", prop: 'worker' },
   { label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
   { label: "自动审批通过", prop: 'autoAgree', type: "filter", filters: "whetherOrNot" },
@@ -2633,16 +2632,17 @@ export const lineSideWarehouseScrappingRequest = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   // -----------------------------------------------------------------------
+  { label: "创建时间", prop: "creationTime",type: "dateTime" },
   { label: "创建者ID", prop: "creatorId" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
   { label: "上次修改者ID", prop: "lastModifierId" },
   { label: "备注", prop: 'remark' },
   { label: "生效日期", prop: 'activeDate', type: "dateTime" },
-  { label: "公司", prop: 'company' },
   { label: "事务ID", prop: "tenantId" },
-  { label: "仓库", prop: 'warehouseCode' },
   { label: "报废类型", prop: 'type' },
   { label: "ID", prop: 'id' },
+  // { label: "公司", prop: 'company' },
+  // { label: "仓库", prop: 'warehouseCode' },
   // -----------------------------------------------------------------------
 ]
 // 线边仓报废记录 已调整 1