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

非生成退料领料字段调整

dev_web_online
陈薪名 2 years ago
parent
08a61ac3c5
commit
376759774d
3 changed files with 249 additions and 134 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. 232
      fe/PC/src/utils/detailsTableColumns/index.js
  2. 80
      fe/PC/src/utils/tableColumns/index.js
  3. 71
      fe/PC/src/utils/tabsDesTions/index.js

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

@ -2009,211 +2009,299 @@ export const productionReturnNote = [
// 库存管理
/**/
// 非生产领料申请 已调整
// 非生产领料申请 20230417
export const pickingRequest = [
{ 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: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
{ label: "调出ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
{ label: "说明", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "status", prop: 'status' },
{ label: "ID", prop: 'id' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 非生产领料审批 已调整
// 非生产领料审批 20230417
export const pickingApproval = [
{ 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: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调出库位", prop: "locationCode" },
{ label: "调出ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
{ label: "说明", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "status", prop: 'status' },
{ label: "ID", prop: 'id' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 非生产领料记录 已调整
// 非生产领料记录 20230417
export const pickingNote = [
{ 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: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "调出库位", prop: "locationCode" },
{ label: "调出ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
{ label: "说明", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "原因代码", prop: 'reasonCode' },//无
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际供应商批次", prop: "handledSupplierBatch" },
{ label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
{ label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
{ label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
{ label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
{ label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
{ label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐库位", prop: 'recommendFromLocationCode' },
{ label: "推荐区域", prop: 'recommendFromLocationArea' },
{ label: "推荐分组", prop: 'recommendFromLocationGroup' },
{ label: "推荐ERP库位", prop: 'recommendFromLocationErpCode' },
{ label: "推荐仓库", prop: 'recommendFromWarehouseCode' },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: "实际区域", prop: 'handledFromLocationArea' },
{ label: "实际分组", prop: 'handledFromLocationGroup' },
{ label: "实际ERP库位", prop: 'handledFromLocationErpCode' },
{ label: "实际仓库", prop: 'handledFromWarehouseCode' },
{ label: "status", prop: 'status' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "库位代码", prop: 'locationCode' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// -----------------------------------------------------------------------
]
// 非生产退料申请 已调整
// 非生产退料申请 20230417
export const materialReturnRequest = [
{ 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: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
{ label: "调入ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
{ label: "说明", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
// -----------------------------------------------------------------------
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "任务编号", prop: 'number',width:orderWidth },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
// -----------------------------------------------------------------------
{ label: "status", prop: 'status' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "库位代码", prop: 'locationCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// -----------------------------------------------------------------------
]
// 非生产退料审批 已调整
// 非生产退料审批 20230417
export const materialReturnApproval = [
{ 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: 'lot' },
{ label: "箱码", prop: 'packingCode' },
{ label: "调入库位", prop: "locationCode" },
{ label: "调入ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// -----------------------------------------------------------------------
{ label: "说明", prop: 'remark' },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "任务编号", prop: 'number', width:orderWidth },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
// -----------------------------------------------------------------------
{ label: "status", prop: 'status' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "库位代码", prop: 'locationCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// -----------------------------------------------------------------------
]
// 非生产退料记录 已调整
// 非生产退料记录 20230417
export const materialReturnNote = [
{ 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: 'lot' },
{ label: "箱码", prop: "packingCode" },
{ label: "调入库位", prop: "locationCode" },
{ label: "调入ERP库位", prop: 'locationErpCode' },
{ label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
{ label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
{ label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
{ label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
{ label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
{ label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "任务编号", prop: 'number' },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate', type: "dateTime" },
{ label: "生产时间", prop: 'produceDate', type: "dateTime" },
{ label: "过期时间", prop: 'expireDate', type: "dateTime" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "库位代码", prop: 'locationCode' },
{ label: "库位组", prop: 'locationGroup' },
{ label: "库区", prop: 'locationArea' },
{ label: "标包计量单位", prop: 'stdPackUom' },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "原因代码", prop: 'reasonCode' },//无
// -----------------------------------------------------------------------
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: 'lastModifierId' },
{ label: "推荐箱码", prop: "recommendPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
{ label: "推荐供应商批次", prop: "recommendSupplierBatch" },
{ label: "实际供应商批次", prop: "handledSupplierBatch" },
{ label: "推荐到货时间", prop: "recommendArriveDate", type: "dateTime" },
{ label: "实际到货时间", prop: "handledArriveDate", type: "dateTime" },
{ label: "推荐生产时间", prop: "recommendProduceDate", type: "dateTime" },
{ label: "实际生产时间", prop: "handledProduceDate", type: "dateTime" },
{ label: "推荐过期时间", prop: "recommendExpireDate", type: "dateTime" },
{ label: "实际过期时间", prop: "handledExpireDate", type: "dateTime" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
{ label: "推荐数量", prop: "recommendQty" },
{ label: "实际数量", prop: "handledQty" },
{ label: "推荐库位", prop: "recommendToLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "推荐库区", prop: "recommendToLocationArea" },
{ label: "实际库区", prop: "handledToLocationArea" },
{ label: "推荐库位组", prop: "recommendToLocationGroup" },
{ label: "实际库位组", prop: "handledToLocationGroup" },
{ label: "推荐ERP库位", prop: "recommendToLocationErpCode" },
{ label: "实际ERP库位", prop: "handledToLocationErpCode" },
{ label: "推荐仓库", prop: "recommendToWarehouseCode" },
{ label: "实际仓库", prop: "handledToWarehouseCode" },
{ label: "备注", prop: 'remark' },
{ label: "status", prop: 'status' },
{ label: "主表ID", prop: "masterID" },
{ label: "事务ID", prop: "tenantId" },
{ label: "ID", prop: 'id' },
// { label: "次交易码代码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiCode' },
// { label: "次交易码", prop: 'extraProperties',type: "object", showProp: 'OnceBusiName' },
// { label: "项目分类代码", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityCode' },
// { label: "项目分类", prop: 'extraProperties',type: "object", showProp: 'ProjCapacityName' },
// { label: "专案代码", prop: 'extraProperties',type: "object", showProp: 'CaseCode' },
// { label: "专案", prop: 'extraProperties',type: "object", showProp: 'CaseName' },
// { label: "库位代码", prop: 'locationCode' },
// { label: "标包计量单位", prop: 'stdPackUom' },
// -----------------------------------------------------------------------
]
// 回收料收货记录 20230415
export const recycledMaterialsReceipt = [

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

@ -2939,7 +2939,7 @@ export const expectIn = [
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
]
// 非生产领料申请 已调整
// 非生产领料申请 20230417
export const pickingRequest = [
{
label: "领料单号",
@ -2954,18 +2954,23 @@ export const pickingRequest = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ 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: '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: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料审批 已调整
// 非生产领料审批 20230417
export const pickingApproval = [
{
label: "领料单号",
@ -2974,24 +2979,29 @@ export const pickingApproval = [
type: "name",
width: orderWidth
},
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus',type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ 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: '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: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料记录 已调整
// 非生产领料记录 20230417
export const pickingNote = [
{
label: "领料记录单号",
@ -3006,13 +3016,18 @@ export const pickingNote = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "公司", prop: 'company' },
{ 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: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "仓库代码", prop: 'warehouseCode' },
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 非生产退料申请 已调整
// 非生产退料申请 20230417
export const materialReturnRequest = [
{
label: "退料单号",
@ -3027,18 +3042,23 @@ export const materialReturnRequest = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ 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: '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: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料审批 已调整
// 非生产退料审批 20230417
export const materialReturnApproval = [
{
label: "退料单号",
@ -3053,18 +3073,23 @@ export const materialReturnApproval = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ 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: '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: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料记录 已调整
// 非生产退料记录 20230417
export const materialReturnNote = [
{
label: "退料记录单号",
@ -3079,10 +3104,15 @@ export const materialReturnNote = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ 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: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 回收料收货记录 20230415

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

@ -2175,7 +2175,7 @@ export const expectOut = [
// { label: "公司", prop: 'company' },
// -----------------------------------------------------------------------
]
// 非生产领料申请 已调整 1
// 非生产领料申请 20230417
export const pickingRequest = [
{ label: "领料单号码", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
@ -2196,15 +2196,15 @@ export const pickingRequest = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料审批 已调整 1
// 非生产领料审批 20230417
export const pickingApproval = [
{ label: "领料单号", prop: "number" },
{ label: "状态", prop: 'requestStatus',type: "filter", filters: "requestStatus" },
{ label: "领料单号码", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
@ -2220,14 +2220,14 @@ export const pickingApproval = [
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "公司", prop: 'company' },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产领料记录 已调整 1
// 非生产领料记录 20230417
export const pickingNote = [
{ label: "领料记录单号", prop: "number" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@ -2243,50 +2243,48 @@ export const pickingNote = [
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: "warehouseCode" },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: "warehouseCode" },
// -----------------------------------------------------------------------
]
// 非生产退料申请 已调整 1
// 非生产退料申请 20230417
export const materialReturnRequest = [
{ label: "退料单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ 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: '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: '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: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料审批 已调整 1
// 非生产退料审批 20230417
export const materialReturnApproval = [
{ label: "退料单号", prop: "number" },
{ label: "状态", prop: 'requestStatus', type: "filter", filters: "requestStatus" },
{ label: "状态", prop: 'requestStatus', type: "tagFilter", filters: "requestStatus" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
{ label: "操作员", prop: "worker" },
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "自动提交审批", prop: 'autoSubmit', type: "filter", filters: "whetherOrNot" },
@ -2294,13 +2292,13 @@ export const materialReturnApproval = [
{ label: "自动执行", prop: 'autoHandle', type: "filter", filters: "whetherOrNot" },
{ label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
{ label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "公司", prop: 'company' },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 非生产退料记录 已调整 1
// 非生产退料记录 20230417
export const materialReturnNote = [
{ label: "退料记录单号", prop: "number" },
{ label: "建档日期", prop: "buildDate", type: "dateTime" },
@ -2309,16 +2307,15 @@ export const materialReturnNote = [
{ label: "部门代码", prop: "deptCode" },
{ label: "部门名称", prop: "deptName" },
// -----------------------------------------------------------------------
{ label: "备注", prop: 'remark' },
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: "创建者ID", prop: "creatorId" },
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "创建者ID", prop: 'creatorId' },
{ label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: "上次修改者ID", prop: "lastModifierId" },
{ label: "生效日期", prop: 'activeDate', type: "dateTime" },
{ label: "备注", prop: 'remark' },
{ label: "事务ID", prop: "tenantId" },
{ label: "仓库代码", prop: 'warehouseCode' },
{ label: "公司", prop: 'company' },
{ label: "ID", prop: 'id' },
// { label: "公司", prop: 'company' },
// { label: "仓库代码", prop: 'warehouseCode' },
// -----------------------------------------------------------------------
]
// 回收料收货记录 20230415

Write Preview
Loading…
Cancel
Save