zhibinlv
/
WZC2
3
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

完工收货报废申请和记录字段调整

dev_web_online
陈薪名 2 years ago
parent
d61a29cd03
commit
e27f0e4c3d
3 changed files with 116 additions and 81 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 94
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 57
      fe/PC/src/utils/tableColumns/index.js
  3. 46
      fe/PC/src/utils/tabsDesTions/index.js

94
fe/PC/src/utils/detailsTableColumns/index.js
View File

@ -1295,65 +1295,80 @@ export const ProductReceiptNote = [
{ label: "status", prop: 'status' },
// -----------------------------------------------------------------------
]
// 完工收货报废申请
// 完工收货报废申请 20230412
export const ProductReceiptScrapRequest = [
{ 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:"areaCode" },
{ 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: "备注", prop: 'remark' },
{ label: "创建者ID", prop: 'creatorId' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "记录编号", prop: 'number' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "备注", prop: 'remark' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 完工收货报废记录 已调整
// 完工收货报废记录 20230412
export const ProductReceiptScrapNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ 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:"fromLocationArea" },
{ label: "报废库位代码", prop: 'fromLocationArea' },
{ label: "ERP库位", prop:"fromLocationErpCode" },
{ label: "报废原因代码", prop: 'reasonCode' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
{ label: "备注", prop: 'remark' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" },
{ label: "报废库位", prop: "fromLocationCode" },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
// -----------------------------------------------------------------------
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate" ,type:"dateTime" },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "备注", prop: 'remark' },
{ 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: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' },
{ label: "事务ID", prop: "tenantId" },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: 'id' },
// { label: "来源库位", prop: 'fromLocationCode' },
// { label: "目标ERP库位", prop: 'toLocationErpCode' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 半成品上架记录 已调整
@ -2469,26 +2484,25 @@ export const lineSideWarehouseScrappingRequest = [
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 线边仓报废记录 已调整
// 线边仓报废记录 20230412
export const lineSideWarehouseScrappingNote = [
{ label: "物品代码", prop: "itemCode", fixed: "left" },
{ label: "物品代码", prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" },
{ label: "数量", prop: "qty" },
{ label: "物品描述1", prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" },
{ label: "报废数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"toLocationArea" },
{ label: "库位", prop:"toLocationCode" },
{ label: "ERP库位", prop:"toLocationErpCode" },
{ label: "报废原因代码", prop:"reasonCode" },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"Reason" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "报废原因代码", prop: 'reasonCode' },
{ label: "报废原因说明", prop: 'reasonCode', type: "filter", filters: "getDict" , dictType:"ScrapReason" },
{ label: "报废库位", prop: "fromLocationCode" },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
// -----------------------------------------------------------------------
{ label: "生产时间", prop: "produceDate",type:"dateTime" },
{ label: "过期时间", prop: "expireDate" ,type:"dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "备注", prop: 'remark' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "来源箱码", prop: 'fromPackingCode' },
{ label: "目标箱码", prop: 'toPackingCode' },
@ -2496,19 +2510,25 @@ export const lineSideWarehouseScrappingNote = [
{ label: "目标批次", prop: 'toLot' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "生效时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "来源库位组", prop: 'fromLocationGroup' },
{ label: "目标库位组", prop: 'toLocationGroup' },
{ label: "来源库位", prop: 'fromLocationCode' },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: "来源库区", prop: 'fromLocationArea' },
{ label: "目标库区", prop: 'toLocationArea' },
{ label: "来源ERP库位", prop: 'fromLocationErpCode' },
{ label: "目标ERP库位", prop: 'toLocationErpCode' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "来源仓库", prop: 'fromWarehouseCode' },
{ label: "目标仓库", prop: 'toWarehouseCode' },
{ label: "fromStatus", prop: 'fromStatus' },
{ label: "toStatus", prop: 'toStatus' },
{ label: "事务ID", prop: "tenantId" },
{ label: "主表ID", prop: "masterID" },
{ label: "ID", prop: 'id' },
// { label: "来源库位", prop: 'fromLocationCode' },
// { label: "目标ERP库位", prop: 'toLocationErpCode' },
// { label: "仓库", prop: 'warehouseCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 线边仓调整申请 已调整

57
fe/PC/src/utils/tableColumns/index.js
View File

@ -2104,7 +2104,7 @@ export const ProductReceiptNote = [
{ label: "receiptType", prop: 'receiptType' },
// -----------------------------------------------------------------------
]
// 完工收货报废申请
// 完工收货报废申请 20230412
export const ProductReceiptScrapRequest = [
{
label: "报废申请单号",
@ -2113,23 +2113,28 @@ export const ProductReceiptScrapRequest = [
type: "name",
width: orderWidth
},
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus" },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "状态", prop: "requestStatus",type: "tagFilter", filters: "requestStatus", },
{ 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: 'worker' },
{ 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' },
// -----------------------------------------------------------------------
]
// 完工收货报废记录 已调整
// 完工收货报废记录 20230412
export const ProductReceiptScrapNote = [
{
label: "报废记录单号",
@ -2138,16 +2143,21 @@ export const ProductReceiptScrapNote = [
type: "name",
width: orderWidth
},
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "任务ID", prop: 'jobNumber', width: orderWidth },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
{ label: "事务ID", prop: "tenantId" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 半成品上架记录 已调整
@ -2562,7 +2572,7 @@ export const lineSideWarehouseScrappingRequest = [
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 线边仓报废记录 已调整
// 线边仓报废记录 20230412
export const lineSideWarehouseScrappingNote = [
{
label: "报废记录单号",
@ -2571,16 +2581,21 @@ export const lineSideWarehouseScrappingNote = [
type: "name",
width: orderWidth
},
{ label: "报废申请单号", prop: 'scrapRequestNumber',width: orderWidth },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber',width: orderWidth },
{ label: "事务ID", prop: "tenantId" },
// { label: "生效日期", prop: 'activeDate', type: "dateTime" },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]

46
fe/PC/src/utils/tabsDesTions/index.js
View File

@ -1523,11 +1523,10 @@ export const ProductReceiptNote = [
{ label: "ID", prop: 'id' },
// -----------------------------------------------------------------------
]
// 完工收货报废申请 1
// 完工收货报废申请 20230412
export const ProductReceiptScrapRequest = [
{ 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" },
@ -1535,36 +1534,37 @@ export const ProductReceiptScrapRequest = [
{ 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: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "备注", prop: 'remark' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "报废类型", prop: 'type' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 完工收货报废记录 已调整 1
// 完工收货报废记录 20230412
export const ProductReceiptScrapNote = [
{ label: "报废记录单号", prop: 'number' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "报废记录单号", prop: "number" },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "公司", prop: 'company' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 半成品上架记录 已调整 1
@ -2645,24 +2645,24 @@ export const lineSideWarehouseScrappingRequest = [
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓报废记录 已调整 1
// 线边仓报废记录 20230412
export const lineSideWarehouseScrappingNote = [
{ label: "报废记录单号", prop: 'number' },
{ label: "报废申请单号", prop: 'scrapRequestNumber' },
{ label: "创建时间", prop: "creationTime",type: "dateTime" },
{ label: "操作员", prop: 'worker' },
{ label: "报废记录单号", prop: "number" },
{ label: "报废日期", prop: "activeDate",type: "dateTime" },
{ label: "操作员", prop: "worker" },
// -----------------------------------------------------------------------
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ label: "仓库", prop: 'warehouseCode' },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "任务ID", prop: 'jobNumber' },
{ label: "报废类型", prop: 'type' },
{ label: "报废请求单号", prop: 'scrapRequestNumber' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 线边仓调整申请 已调整 1

Write Preview
Loading…
Cancel
Save