diff --git a/README.md b/README.md index 2953275d5..284f3f170 100644 --- a/README.md +++ b/README.md @@ -14,7 +14,7 @@ form: { value:'undefined',//默认值,设置为'undefined'-->实际是undefined(解决SelectV2不显示占位符placeholder) enterSearch: true, //可输入回车 对应绑定事件:@onEnter="onEnter" isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '生产线物料关系信息', // 查询弹窗标题 hiddenFilterButton:true,//是否隐藏筛选按钮 diff --git a/src/api/wms/demandforecastingDetail/index.ts b/src/api/wms/demandforecastingDetail/index.ts index 944d0f0fd..e900faf38 100644 --- a/src/api/wms/demandforecastingDetail/index.ts +++ b/src/api/wms/demandforecastingDetail/index.ts @@ -55,7 +55,7 @@ const getPageParams = (params)=>{ } params.supplierCode = '' - // 物料代码 + // 品番 if(params.itemCode&¶ms.itemCode.length>0){ let keyValue = params.itemCode.split(' ') keyValue.forEach(item=>{item = item.trim()}) diff --git a/src/api/wms/demandforecastingMain/index.ts b/src/api/wms/demandforecastingMain/index.ts index e3f209037..3d4481fbd 100644 --- a/src/api/wms/demandforecastingMain/index.ts +++ b/src/api/wms/demandforecastingMain/index.ts @@ -104,7 +104,7 @@ const getPageParams = (params)=>{ } params.supplierCode = '' - // 物料代码 + // 品番 if(params.itemCode&¶ms.itemCode.length>0){ let keyValue = params.itemCode.split(' ') keyValue.forEach(item=>{item = item.trim()}) diff --git a/src/api/wms/itembasic/index.ts b/src/api/wms/itembasic/index.ts index 900d8475d..6af9d1007 100644 --- a/src/api/wms/itembasic/index.ts +++ b/src/api/wms/itembasic/index.ts @@ -122,7 +122,7 @@ export const selectConfigToItembasic = async (params) => { } } -// 根据物料代码查计量单位 +// 根据品番查计量单位 export const getQueryItemCodeInfo = async (data) => { return await request.post({ url: 'wms/itembasic/queryItemCodeInfo', data }) } diff --git a/src/locales/en-US.ts b/src/locales/en-US.ts index bc8fa1baa..0d2cbb593 100644 --- a/src/locales/en-US.ts +++ b/src/locales/en-US.ts @@ -528,8 +528,8 @@ export default { money:'Money', material_code:'Material Code', material_name:'Material Name', - material_description1:'Material Description1', - material_description2:'Material Description2', + material_abbreviation:'Material Abbreviation', + material_description:'Material Description', amount:'Amount', measuring_unit:'Measuring Unit', item_cde:'Item Code', @@ -635,7 +635,7 @@ export default { 是:'Yes', 否:'No', 供应商代码:'Supplier Code', - 物料代码:'Material Code', + 品番:'Material Code', 单据号:'Document Number', 订单类型:'Order Type', 状态:'State', @@ -668,7 +668,7 @@ export default { '税率(%)':'Tax Rate(%)', 生效时间:'Effective Time', 失效时间:'Expiration Time', - 供应商物料代码:'Supplier material code', + 供应商品番:'Supplier material code', 供应商计量单位:'Supplier measuring unit', 转换率:'Conversion Rate', 默认收货库位:'Default receiving warehouse location', @@ -756,9 +756,9 @@ export default { 批次:'Batch', 到货日期:'Arrival date', 过期日期:'Expiration date', - 物料名称:'Material Name', - 物料描述1:'Material Description1', - 物料描述2:'Material Description2', + 品名:'Material Name', + 背番:'Material Abbreviation', + 物料描述:'Material Description', 项目代码:'Item Code', 质检明细:'Quality inspection details', 履历表明细:'Details of your resume', @@ -933,7 +933,7 @@ export default { 序号:'Serial Number', 版本:'Version', 地点:'Place', - '影响明细中物料代码,需在供应商物料中维护':'The material code in the details is affected , must be maintained in the supplier\'s material', + '影响明细中品番,需在供应商物料中维护':'The material code in the details is affected , must be maintained in the supplier\'s material', 是否外部资源:'External resource or not', 注意事项:'Announcements', 导入模式:'Import Mode', @@ -952,8 +952,8 @@ export default { 用户信息:'User Information', 请选择供应商:'Please select a supplier', 请选择供应商代码:'Please select a vendor code', - 请选择物料代码:'Please select material code', - 请输入供应商物料代码:'Please input the supplier material code', + 请选择品番:'Please select material code', + 请输入供应商品番:'Please input the supplier material code', 请选择库位代码:'Please input the location code', ERP库位:'ERP Location Code', 单价:'Unit Price', diff --git a/src/locales/zh-CN.ts b/src/locales/zh-CN.ts index 308e02305..57db1a8f1 100644 --- a/src/locales/zh-CN.ts +++ b/src/locales/zh-CN.ts @@ -527,10 +527,10 @@ export default { cause:'原因', unit_price:'单价', money:'金额', - material_code:'物料代码', - material_name:'物料名称', - material_description1:'物料描述1', - material_description2:'物料描述2', + material_code:'品番', + material_name:'品名', + material_abbreviation:'背番', + material_description:'物料描述', amount:'数量', measuring_unit:'计量单位', item_code:'项目代码', @@ -640,7 +640,7 @@ export default { 是:'是', 否:'否', 供应商代码: '供应商代码', - 物料代码:'物料代码', + 品番:'品番', 单据号:'单据号', 订单类型:'订单类型', 状态:'状态', @@ -673,7 +673,7 @@ export default { '税率(%)':'税率(%)', 生效时间:'生效时间', 失效时间:'失效时间', - 供应商物料代码:'供应商物料代码', + 供应商品番:'供应商品番', 供应商计量单位:'供应商计量单位', 转换率:'转换率', 默认收货库位:'默认收货库位', @@ -761,9 +761,9 @@ export default { 批次:'批次', 到货日期:'到货日期', 过期日期:'过期日期', - 物料名称:'物料名称', - 物料描述1:'物料描述1', - 物料描述2:'物料描述2', + 品名:'品名', + 背番:'背番', + 物料描述:'物料描述', 项目代码:'项目代码', 质检明细:'质检明细', 履历表明细:'履历表明细', @@ -938,7 +938,7 @@ export default { 序号:'序号', 版本:'版本', 地点:'地点', - '影响明细中物料代码,需在供应商物料中维护':'影响明细中物料代码,需在供应商物料中维护', + '影响明细中品番,需在供应商物料中维护':'影响明细中品番,需在供应商物料中维护', 是否外部资源:'是否外部资源', 注意事项:'注意事项', 导入模式:'导入模式', @@ -957,8 +957,8 @@ export default { 用户信息:'用户信息', 请选择供应商:'请选择供应商', 请选择供应商代码:'请选择供应商代码', - 请选择物料代码:'请选择物料代码', - 请输入供应商物料代码:'请输入供应商物料代码', + 请选择品番:'请选择品番', + 请输入供应商品番:'请输入供应商品番', 请选择库位代码:'请选择库位代码', ERP库位:'ERP库位', 单价:'单价', diff --git a/src/utils/disposition/formFields.ts b/src/utils/disposition/formFields.ts index 941ce69fa..7456e990c 100644 --- a/src/utils/disposition/formFields.ts +++ b/src/utils/disposition/formFields.ts @@ -2,8 +2,8 @@ * @returns {Array} 基础物料信息 */ export const ItemBasic = [ - { label: "物料代码", prop: 'code' }, - { label: "物料名称", prop: "name" }, + { label: "品番", prop: 'code' }, + { label: "品名", prop: "name" }, { label: "描述1", prop: "desc1" }, { label: "描述2", prop: "desc2" }, { type: "filter", label: "状态", prop: "status", filters: "itemStatus" }, @@ -36,7 +36,7 @@ */ export const ItemQuality = [ { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", prop: 'name' }, + { label: "品名", prop: 'name' }, { label: "供应商代码", prop: 'supplierCode' }, { type: "filter", label: "检验类型", prop: 'inspectType', filters: "inspectType" }, { label: "检验周期-按到货频次", prop: 'inspFrequency' }, @@ -66,7 +66,7 @@ export const ItemPack = [ { label: "包装代码", prop: 'packCode', }, { label: "包装名称", prop: "packName" }, - { label: '物料代码', prop: "itemCode", }, + { label: '品番', prop: "itemCode", }, { label: "是否标准包装", type: "filter", prop: 'isStdPack', filters: "whetherOrNot" }, { label: '标包编号', prop: "stdPackCode", }, { label: "包装数量",type: "object", prop: "packQty", showProp: "qty" }, @@ -133,7 +133,7 @@ export const CustomerItem = [ { label: "客户代码", prop: 'customerCode', }, { label: "itemCode", prop: "itemCode", }, - { label: "客户物料代码", prop: "customerItemCode", }, + { label: "客户品番", prop: "customerItemCode", }, { label: "版本", prop: "version", }, { type: "objectDateTime", label: "开始时间", prop: "timeRange", showProp: "beginTime" }, { type: "objectDateTime", label: "结束时间", prop: "timeRange", showProp: "endTime" }, @@ -194,8 +194,8 @@ export const SupplierItem = [ { label: "供应商代码", prop: 'supplierCode' }, { label: "itemCode", prop: "itemCode" }, - { label: "供应商物料代码", prop: "supplierItemCode" }, - { label: "供应商物料名称", prop: "itemName" }, + { label: "供应商品番", prop: "supplierItemCode" }, + { label: "供应商品名", prop: "itemName" }, { label: "每托数量", prop: "qtyPerPallet" }, { type: "object", label: "包装数量", prop: "supplierPackQty", showProp: "qty" }, { type: "object", label: "包装单位", prop: "supplierPackQty", showProp: "uom" }, @@ -377,7 +377,7 @@ * @returns {Array} 物料安全库存 */ export const ItemSafetyStock = [ - { label: "物料代码", prop: "itemCode", }, + { label: "品番", prop: "itemCode", }, { label: "仓库代码", prop: "warehouseCode" }, { type: "filter", label: "存储关系类型", prop: "storeRelationType", filters: "storeRelationType", }, { label: "值", prop: "storeValue" }, @@ -394,7 +394,7 @@ */ export const ItemSafetyStockQuery = [ { - label: "物料代码", + label: "品番", prop: "itemCode", fixed: "left", type: "name", @@ -436,7 +436,7 @@ * @returns {Array} 生产线零件关系 */ export const ProdLineItem = [ - { label: "物料代码", prop: "itemCode", }, + { label: "品番", prop: "itemCode", }, { label: "生产线编号", prop: "prodLineCode", }, { label: "生产线名称", prop: "prodLineName", }, { label: "车间代码", prop: "workshopCode", }, @@ -924,9 +924,9 @@ export const DeliverNote = [ */ export const InventoryBalance = [ { label: "itemCode", prop: 'itemCode' }, - { type: "object", label: "物料名称", prop: "item", showProp: "name" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" }, + { type: "object", label: "品名", prop: "item", showProp: "name" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2" }, { label: "库位代码", prop: "locationCode" }, { type: "filter", label: "库存状态", prop: "status", filters: "inventoryStage" }, { label: "批次", prop: 'lot' }, @@ -975,9 +975,9 @@ export const ERPInventoryBalance = [ { label: "箱标签", prop: "packingCode" }, { label: "托标签", prop: "containerCode" }, { label: "itemCode", prop: "itemCode", }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom" }, { type: "filter", filters: "inventoryStage", label: "库存状态", prop: "inventoryStatus" }, { label: "仓库代码", prop: "warehouseCode" }, @@ -1022,9 +1022,9 @@ export const ERPInventoryBalance = [ { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", }, { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", }, { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "到货单位", prop: "qty", showProp: "uom", }, { label: "批次", prop: 'lot', }, @@ -1064,9 +1064,9 @@ export const InventoryTransferLogHegeZBuHeGe = [ { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", }, { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", }, { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "到货单位", prop: "qty", showProp: "uom", }, { label: "批次", prop: 'lot', }, @@ -1082,9 +1082,9 @@ export const InventoryTransferLogHegeZBuHeGe = [ */ export const InventoryOccupied = [ { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "任务编号", prop: "jobNumber" }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, @@ -1105,9 +1105,9 @@ export const InventoryTransferLogHegeZBuHeGe = [ */ export const InventoryPredictable = [ { label: "itemCode", prop: "itemCode", }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "任务编号", prop: "jobNumber" }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, @@ -1168,9 +1168,9 @@ export const InventoryTransferLogHegeZBuHeGe = [ { type: "filter", filters: "requestStatus", label: "从状态", prop: "fromStatus", }, { type: "filter", filters: "requestStatus", label: "到状态", prop: "toStatus", }, { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "到货单位", prop: "qty", showProp: "uom", }, { label: "批次", prop: 'lot', }, @@ -1210,10 +1210,10 @@ export const InventoryTransferLogHegeZBuHeGe = [ export const TracebackNote = [ // { label: "编号", prop: "id", }, { label: "追溯单号", prop: "number" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" }, + { label: "品番", prop: "itemCode" }, + { label: "品名", type: "object", prop: "item", showProp: "name" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2" }, { label: "箱标签", prop: "packingCode" }, { type: "object", label: "产品数量", prop: "qty", showProp: "qty" }, { type: "object", label: "单位", prop: "qty", showProp: "uom" }, @@ -1278,14 +1278,14 @@ export const ReworkNote = [ prop: "number", fixed: "left", }, - { label: "物料代码", prop: 'itemCode' }, + { label: "品番", prop: 'itemCode' }, // { label: "部门", prop: 'department' }, // { label: "工单号", prop: 'workOrder' }, // { label: "流水号", prop: 'seqNo' }, - { label: "目标物料代码", prop: 'toItemCode' }, - { label: "目标物料名称", prop: 'toItemName' }, - { label: "目标物料描述1", prop: 'toItemDesc1' }, - { label: "目标物料描述2", prop: 'toItemDesc2' }, + { label: "目标品番", prop: 'toItemCode' }, + { label: "目标品名", prop: 'toItemName' }, + { label: "目标背番", prop: 'toItemDesc1' }, + { label: "目标物料描述", prop: 'toItemDesc2' }, { label: "目标数量", prop: 'toQtyQty' }, { label: "目标单位", prop: 'toQtyUom' }, { label: "目标库位", prop: 'toLocationCode' }, @@ -1933,10 +1933,10 @@ export const PillarDeliverNote = [ */ export const labelInfo = [ { label: "箱码", prop: "packingCode" }, - { label: "物料代码", prop: "itemCode" }, - { label: "物料名称", prop: "item", showProp: 'name', type:'object' }, - { label: "物料描述1", prop: "item", showProp: 'desc1', type:'object' }, - { label: "物料描述2", prop: "item", showProp: 'desc2', type:'object' }, + { label: "品番", prop: "itemCode" }, + { label: "品名", prop: "item", showProp: 'name', type:'object' }, + { label: "背番", prop: "item", showProp: 'desc1', type:'object' }, + { label: "物料描述", prop: "item", showProp: 'desc2', type:'object' }, { label: "批次", prop: "lot" }, { label: "数量", prop: "qty", showProp: 'qty', type:'object' }, { label: "单位", prop: "qty", showProp: 'uom', type:'object' }, diff --git a/src/utils/disposition/tableDetailsColumns.ts b/src/utils/disposition/tableDetailsColumns.ts index 7db984905..06ca7b417 100644 --- a/src/utils/disposition/tableDetailsColumns.ts +++ b/src/utils/disposition/tableDetailsColumns.ts @@ -3,9 +3,9 @@ */ export const PurchaseOrder = [ { label: "itemCode", prop: "itemCode", fixed: "left" }, - { type:"object", label: "物料名称", prop: "item", showProp:"name", }, - { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", }, - { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", }, + { type:"object", label: "品名", prop: "item", showProp:"name", }, + { type:"object", label: "背番", prop: "item", showProp:"desc1", }, + { type:"object", label: "物料描述", prop: "item", showProp:"desc2", }, { label: "订单号", prop: "number", }, { label: "订单行", prop: "poLine", }, { type:"object", label: "数量", prop: "qty", showProp:"qty", }, @@ -23,9 +23,9 @@ { label: "销售订单号", prop: "number", fixed: "left",}, { label: "订单行", prop: "soLine", }, { label: "itemCode", prop: "itemCode", }, - { type:"object", label: "物料名称", prop: "item", showProp:"name", }, - { type:"object", label: "物料描述1", prop: "item", showProp:"desc1", }, - { type:"object", label: "物料描述2", prop: "item", showProp:"desc2", }, + { type:"object", label: "品名", prop: "item", showProp:"name", }, + { type:"object", label: "背番", prop: "item", showProp:"desc1", }, + { type:"object", label: "物料描述", prop: "item", showProp:"desc2", }, { label: "备注", prop: 'remark', }, ] /** @@ -36,9 +36,9 @@ { label: "订单行", prop: "poLine", width: "200px" }, { label: "箱标签", prop: "packingCode", width: "200px" }, { label: "itemCode", prop: "itemCode", width: "200px" }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "200px" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "200px" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "200px" }, + { type: "object", label: "品名", prop: "item", showProp: "name", width: "200px" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "200px" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", width: "200px" }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", width: "200px" }, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", width: "200px" }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom", width: "200px" }, @@ -58,9 +58,9 @@ { label: "订单行", prop: "poLine", }, { label: "箱标签", prop: "packingCode", }, { label: "itemCode", prop: "itemCode", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom", }, { label: "托标签", prop: "containerCode", }, @@ -75,13 +75,13 @@ */ export const ArriveNotice = [ { label: "itemCode", prop: "itemCode",fixed:"left", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", valueType: Number, label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "每托数量", prop: "qtyPerPallet", }, { type: "object", label: "计量单位", prop: "qty", showProp: "uom", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "批次", prop: "lot", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, @@ -96,7 +96,7 @@ */ export const PurchaseReceiptNote = [ { label: "itemCode", prop: "itemCode",fixed: "left", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, @@ -105,8 +105,8 @@ { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { label: "E-LEVEL等级", prop: "labelEqLevel" }, @@ -117,13 +117,13 @@ */ export const ReceiptAbnormalNote = [ { label: "itemCode", prop: "itemCode", fixed: "left", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, { label: "备注", prop: 'remark', }, @@ -133,9 +133,9 @@ */ export const PurchaseReturnNote = [ { label: "itemCode", prop: "itemCode", fixed: "left", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "箱标签", prop: "packingCode"}, { label: "退货库位", prop: "locationCode"}, { label: "发货单号", prop: "asnNumber" }, @@ -155,14 +155,14 @@ { label: "箱标签", prop: "toPackingCode", }, { type: "object", valueType: Number, label: "上架数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "备料单位", prop: "qty", showProp: "uom", }, { label: "目标库位", prop: "toLocationCode", }, { label: "来源库位", prop: "fromLocationCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "备注", prop: 'remark', }, ] /** @@ -177,9 +177,9 @@ { label: "请求库位", prop: "requestLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, { type: "dateTime", label: "过期日期", prop: "expiredTime", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "备注", prop: 'remark', }, ] /** @@ -190,15 +190,15 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "发料数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "发料单位", prop: "qty", showProp: "uom", }, { label: "请求库位", prop: "fromRequestLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, { label: "来源库位", prop: "fromLocationCode", }, { type: "dateTime", label: "发料时间", prop: "issueTime", }, { type: "dateTime", label: "过期时间", prop: "expiredTime", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "生产线", prop: "prodLine", }, { label: "工作中心", prop: "workCenter", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, @@ -213,13 +213,13 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "入库数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "入库单位", prop: "qty", showProp: "uom", }, { label: "库位编号", prop: "locationCode", }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { label: "供应商代码", prop: 'supplierCode', }, @@ -234,13 +234,13 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "出库数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "出库单位", prop: "qty", showProp: "uom", }, { label: "库位编号", prop: "locationCode", }, { label: "箱标签", prop: "packingCode", }, { label: "托标签", prop: "containerCode", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { label: "供应商代码", prop: 'supplierCode', }, @@ -255,7 +255,7 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "隔离数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "隔离单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, @@ -263,8 +263,8 @@ { label: "目标箱标签", prop: "toPackingCode", }, { label: "来源托标签", prop: "fromContainerCode", }, { label: "来源托标签", prop: "toContainerCode", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { label: "备注", prop: 'remark', }, @@ -277,7 +277,7 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "报废数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "报废单位", prop: "qty", showProp: "uom", }, { label: "来源库位", prop: "fromLocationCode", }, { label: "目标库位", prop: "toLocationCode", }, @@ -285,8 +285,8 @@ { label: "目标箱标签", prop: "toPackingCode", }, { label: "来源托标签", prop: "fromContainerCode", }, { label: "来源托标签", prop: "toContainerCode", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, { label: "备注", prop: 'remark', }, @@ -296,14 +296,14 @@ */ export const DeliverPlan = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, // { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "包装单位", prop: "qty", showProp: "uom", }, { type: "object", label: "包装规格", prop: "stdPack", showProp: "packUom", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "项目", prop: "project", }, { label: "销售订单号", prop: "soNumber", }, { label: "订单行", prop: "soLine", }, @@ -316,11 +316,11 @@ { label: "itemCode", prop: "itemCode", fixed: "left",}, { type: "object", label: "发货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { label: "目标库位", prop: "toLocationCode", }, { type: "dateTime", label: "过期时间", prop: "expiredTime", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "备注", prop: 'remark', }, ] /** @@ -331,7 +331,7 @@ // { label: "箱标签", type: "input", prop: "packingCode", }, { type: "object", valueType: Number, label: "发货数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, { type: "object", label: "发货单位", prop: "qty", showProp: "uom", }, { label: "目标库位", prop: "toLocationCode", }, { label: "来源库位", prop: "fromLocationCode", }, @@ -343,8 +343,8 @@ { label: "目标托标签", prop: "toContainerCode", }, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "备注", prop: 'remark', }, ] /** @@ -373,9 +373,9 @@ { type: "objectDateTime", label: "生产日期", prop: "batch", showProp: "produceDate", }, // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch", }, { label: "批次", prop: "lot", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "备注", prop: 'remark', }, ] @@ -386,9 +386,9 @@ { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", }, // { type: "filter", filters: "stageType", label: "阶段", prop: "stage",}, { label: "itemCode", prop: "itemCode", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "盘点数量", prop: "finalCountQty" }, { label: "盘点差异数量", prop: "diffQty" }, { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", }, @@ -416,9 +416,9 @@ { label: "盘点计划单号", prop: "countPlanNumber", fixed: "left", }, // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",}, { label: "itemCode", prop: "itemCode", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "盘点数量", prop: "finalCountQty" }, { label: "盘点差异数量", prop: "diffQty" }, { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", }, @@ -444,11 +444,11 @@ export const CountAdjustNote = [ { label: "itemCode", prop: "itemCode", fixed: "left", }, // { type: "filter", filters: "checkStage", label: "阶段", prop: "stage",}, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", width: "300px" }, { label: "库位编号", prop: "locationCode", width: "200px" }, // { type: "object", valueType: Number, label: "发货数量", prop: "InventoryQty", showProp: "qty", width: "100px" }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" }, + { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" }, // { type: "object", label: "发货单位", prop: "InventoryQty", showProp: "uom", width: "100px" }, { label: "盘点差异数量", prop: "diffQty" }, // { type: "filter", label: "明细状态", prop: "detailStatus", filters: "DetailStatus", width: "100px" }, @@ -468,9 +468,9 @@ */ export const ProductionPlan = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name",}, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name",}, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "计划数量", prop: "planQty", showProp: "qty", }, // { label: "合格数量", prop: "goodQty", }, // { label: "不合格数量", prop: "noGoodQty", }, @@ -486,9 +486,9 @@ */ export const PreparationPlan = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "备料数量", prop: "qty", showProp: "qty", }, { type: "object", label: "备料单位", prop: "qty", showProp: "uom", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "qty", }, @@ -503,9 +503,9 @@ */ export const ProductReceiptNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", width: "150px" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", width: "300px" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", width: "300px" }, + { type: "object", label: "品名", prop: "item", showProp: "name", width: "150px" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", width: "300px" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", width: "300px" }, { label: "库位编号", prop: "locationCode", }, { label: "原料库位", prop: "rawLocation", width: "100px" }, { type: "object", valueType: Number, label: "完工收货数量", prop: "qty", showProp: "qty", width: "100px" }, @@ -526,9 +526,9 @@ */ export const OfflineSettlementNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name",}, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name",}, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "下线结算数量", prop: "qty", showProp: "qty", }, { type: "object", label: "下线结算单位", prop: "qty", showProp: "uom", }, { label: "库位编号", prop: "locationCode", }, @@ -544,9 +544,9 @@ */ export const TracebackNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name",}, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name",}, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "消耗数量", prop: "rawQty", showProp: "qty", }, { type: "object", label: "包装规格", prop: "rawQty", showProp: "uom", }, { label: "来源库位代码", prop: "rawLocation", }, @@ -562,9 +562,9 @@ */ export const ProductRecycleNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "库位编号", prop: "locationCode", }, { label: "原料库位编号", prop: "rawLocation", }, { type: "object", valueType: Number, label: "成品回收数量", prop: "qty", showProp: "qty", }, @@ -584,9 +584,9 @@ */ export const StockReturnNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "退库数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "退库单位", prop: "qty", showProp: "uom", }, @@ -607,9 +607,9 @@ */ export const CustomerReturnNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", valueType: Number, label: "退货数量", prop: "qty", showProp: "qty", }, { type: "object", valueType: Number, label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "退货单位", prop: "qty", showProp: "uom", }, @@ -628,9 +628,9 @@ */ export const WareHouseTransferNote = [ { label: "物料编号", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "目标库位", prop: "toLocationCode", }, @@ -647,8 +647,8 @@ */ export const ReworkNote = [ { label: "工单号", prop: "number", fixed: "left" }, - { label: "物料代码", prop: 'itemCode' }, - { label: "物料名称", prop: 'item', showProp: 'name', type: "object" }, + { label: "品番", prop: 'itemCode' }, + { label: "品名", prop: 'item', showProp: 'name', type: "object" }, { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" }, { label: "描述1", prop: 'item', showProp: 'desc1', type: "object" }, { label: "批次", prop: 'lot' }, @@ -668,9 +668,9 @@ */ export const InspectNotice = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "箱标签", prop: "packingCode",}, { label: "托标签", prop: "containerCode",}, { label: "批次", prop: "lot" }, @@ -692,9 +692,9 @@ */ export const InspectNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "检验数量", prop: "inspectQty",}, { label: "合格数量", prop: "goodQty",}, { label: "不合格数量", prop: "failedQty",}, @@ -718,9 +718,9 @@ */ export const InspectAbnormalNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "质量异常数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { type: "object", label: "质量异常单位", prop: "qty", showProp: "uom", }, @@ -736,9 +736,9 @@ */ export const PurchaseReceiptJob = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "实际收货数量", prop: "handledQty", showProp: "qty", }, { type: "object", label: "推荐收货数量", prop: "recommendQty", showProp: "qty", }, { type: "object", label: "收货单位", prop: "recommendQty", showProp: "uom",}, @@ -773,9 +773,9 @@ { label: "推荐库位", prop: "recommendLocationCode",}, { label: "实际托标签", prop: "handledContainerCode",}, { label: "推荐托标签", prop: "recommendContainerCode",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",}, { type: "object", label: "实际供应商批次", prop: "handledBatch", showProp: "supplierBatch",}, @@ -789,9 +789,9 @@ */ export const PutawayJob = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "实际箱标签", prop: "handledPackingCode",}, { label: "推荐箱标签", prop: "recommendPackingCode",}, { label: "实际托标签", prop: "handledContainerCode",}, @@ -819,9 +819,9 @@ */ export const InspectJob = [ { label: "itemCode", prop: "itemCode", fixed:"left", }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "实际箱标签",prop: "handledPackingCode",}, { label: "推荐箱标签", prop: "recommendPackingCode",}, { label: "实际托标签", prop: "handledContainerCode",}, @@ -855,9 +855,9 @@ */ export const IssueJob = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "实际箱标签", prop: "handledPackingCode",}, { label: "推荐箱标签", prop: "recommendPackingCode",}, { label: "请求库位", prop: "fromRequestLocationCode", }, @@ -895,9 +895,9 @@ { label: "目标库位", prop: "toLocation",}, { label: "推荐库位", prop: "recommendLocationCode",}, { label: "托标签", prop: "containerCode",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",}, // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",}, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, @@ -922,9 +922,9 @@ { type: "object", label: "收货单位", prop: "handledQty", showProp: "uom",}, // { label: "箱标签", prop: "packingCode",}, { label: "托标签", prop: "containerCode",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",}, // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",}, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, @@ -952,9 +952,9 @@ { type: "object", label: "推荐批次", prop: "recommendBatch", showProp: "supplierBatch", }, { type: "object", label: "推荐日期", prop: "recommendBatch", showProp: "produceDate",}, { label: "托标签", prop: "containerCode",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, // { type: "object", label: "到货数量", prop: "handledQty", showProp: "qty",}, // { type: "object", label: "到货单位", prop: "handledQty", showProp: "uom",}, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, @@ -971,9 +971,9 @@ { type: "object", label: "库存单位", prop: "inventoryQty", showProp: "uom",}, { label: "实际库位", prop: "locationCode",}, { label: "托标签", prop: "containerCode",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",}, { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",}, @@ -996,10 +996,10 @@ { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty",}, { type: "object", label: "包装单位", prop: "stdPack", showProp: "packUom",}, { label: "托标签", prop: "containerCode",}, - //{ label: "物料代码", prop: "itemCode",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + //{ label: "品番", prop: "itemCode",}, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",}, { label: "批次", prop: "lot", }, { label: "备注", prop: 'remark', }, @@ -1069,9 +1069,9 @@ export const ReceivingRecords = [ */ export const JisProductRecycleNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "箱标签", prop: "packingCode"}, @@ -1090,9 +1090,9 @@ export const ReceivingRecords = [ */ export const JisProductReturnNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, // { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "产品号", prop: "productNo" }, @@ -1104,9 +1104,9 @@ export const ReceivingRecords = [ */ export const JisProductTransferNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, { label: "批次", prop: "lot" }, { label: "产品号", prop: "productNo" }, @@ -1132,8 +1132,8 @@ export const ReceivingRecords = [ * @returns {Array} JIS信息查询 */ export const JISMessageQuery = [ - { label: "物料代码", prop: "itemCode", }, - { label: "物料名称",type: "object", prop: "item", showProp: "name" }, + { label: "品番", prop: "itemCode", }, + { label: "品名",type: "object", prop: "item", showProp: "name" }, { label: "物料描述",type: "object", prop: "item", showProp: "desc1" }, { label: "产品号", prop: "productNo" }, { label: "项目号", prop: 'program' }, @@ -1150,7 +1150,7 @@ export const ReceivingRecords = [ */ export const OuterJisDeliverNote = [ { label: "单据号", prop: "number" }, - { label: "物料代码", prop: "itemCode" }, + { label: "品番", prop: "itemCode" }, { label: "发货单号", prop: 'deliverNumber' }, { label: "生产号", prop: 'productionNumber' }, { label: "REV", prop: 'rev' }, @@ -1179,14 +1179,14 @@ export const ReceivingRecords = [ */ export const OuterPillarDeliverNote = [ { label: "单据号", prop: "number" }, - { label: "物料代码", prop: "itemCode" }, + { label: "品番", prop: "itemCode" }, { label: "发货单号", prop: 'deliverNumber' }, // { label: "生产号", prop: 'productionNumber' }, // { label: "REV", prop: 'rev' }, // { label: "配置号", prop: 'l7Part' }, // { label: "流水号", prop: 'serialNumber' }, - { label: "物料描述1", prop: 'item', showProp:'desc1', type: "object" }, - { label: "物料描述2", prop: 'item', showProp:'desc2', type: "object" }, + { label: "背番", prop: 'item', showProp:'desc1', type: "object" }, + { label: "物料描述", prop: 'item', showProp:'desc2', type: "object" }, { label: "来源库位", prop: 'locationCode' }, { label: "发货数量", prop: 'qty', showProp: 'qty', type: 'object' }, // { label: "位置", prop: 'position' }, @@ -1211,7 +1211,7 @@ export const OuterPillarDeliverNote = [ */ export const OuterJisUnplannedReceiptNote = [ { label: "单据号", prop: "number" }, - { label: "物料代码", prop: "itemCode" }, + { label: "品番", prop: "itemCode" }, { label: "物料描述", prop: 'itemName' }, { label: "计划外入库单号", prop: 'outerUnplannedReceiptNumber' }, { label: "单据类型", prop: 'documentType' }, @@ -1234,7 +1234,7 @@ export const OuterPillarDeliverNote = [ */ export const OuterJisUnplannedIssueNote = [ { label: "单据号", prop: "number" }, - { label: "物料代码", prop: "itemCode" }, + { label: "品番", prop: "itemCode" }, { label: "物料描述", prop: 'itemName' }, { label: "计划外出库单号", prop: 'outerUnplannedIssueNumber' }, { label: "单据类型", prop: 'documentType' }, @@ -1255,9 +1255,9 @@ export const OuterPillarDeliverNote = [ */ export const SingleDoorPanelDeliverNote = [ { label: "itemCode", prop: "itemCode", fixed: "left" }, - { type: "object", label: "物料名称", prop: "item", showProp: "name" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" }, + { type: "object", label: "品名", prop: "item", showProp: "name" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2" }, { label: "目标批次", prop: "toLot" }, { label: "来源批次", prop: "fromLot" }, { label: "来源箱标签", prop: "fromPackingCode" }, @@ -1290,9 +1290,9 @@ export const SingleDoorPanelDeliverNote = [ */ export const SingleDoorPanelProductReceiptNote = [ { label: "itemCode", prop: "itemCode", fixed: "left" }, - { type: "object", label: "物料名称", prop: "item", showProp: "name" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" }, + { type: "object", label: "品名", prop: "item", showProp: "name" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2" }, { label: "批次", prop: "lot" }, { label: "箱标签", prop: "packingCode" }, { label: "托标签", prop: "containerCode" }, @@ -1318,7 +1318,7 @@ export const SingleDoorPanelProductReceiptNote = [ */ export const SingleDoorPanelProductAdjust = [ { label: "完工调整单号", prop: "number" }, - { label: "物料代码", prop: 'itemCode',}, + { label: "品番", prop: 'itemCode',}, { label: "批次", prop: 'lot',}, { label: "箱标签", prop: 'packingCode',}, { label: "托标签", prop: 'containerCode',}, @@ -1335,9 +1335,9 @@ export const SingleDoorPanelProductAdjust = [ */ export const SingleDoorPanelProductTransferNote = [ { label: "物料编号", prop: "itemCode", fixed: "left" }, - { type: "object", label: "物料名称", prop: "item", showProp: "name" }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1" }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2" }, + { type: "object", label: "品名", prop: "item", showProp: "name" }, + { type: "object", label: "背番", prop: "item", showProp: "desc1" }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2" }, { label: "批次", prop: "lot" }, { label: "箱标签", prop: "packingCode" }, { label: "托标签", prop: "containerCode" }, @@ -1358,7 +1358,7 @@ export const SingleDoorPanelProductAdjust = [ */ export const SingleDoorPanelCustomerReturnNote = [ { label: "客户退货单号", prop: "number" }, - { label: "物料代码", prop: 'itemCode' }, + { label: "品番", prop: 'itemCode' }, { label: "批次", prop: 'lot' }, { label: "箱标签", prop: 'packingCode' }, { label: "托标签", prop: 'containerCode' }, @@ -1380,9 +1380,9 @@ export const SingleDoorPanelCustomerReturnNote = [ */ export const PillarDeliverNote = [ { label: "物料编号", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, { label: "目标批次", prop: "toLot", }, @@ -1414,9 +1414,9 @@ export const InventoryTransferNote = [ { type: "filter", filters: "inventoryStage", label: "从状态", prop: "fromStatus", }, { type: "filter", filters: "inventoryStage", label: "到状态", prop: "toStatus", }, { label: "itemCode", prop: "itemCode" }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "object", label: "到货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "到货单位", prop: "qty", showProp: "uom", }, { label: "从批次", prop: "fromLot" }, diff --git a/src/utils/disposition/tableSummaryColumns.ts b/src/utils/disposition/tableSummaryColumns.ts index 98d55dc91..786a48b43 100644 --- a/src/utils/disposition/tableSummaryColumns.ts +++ b/src/utils/disposition/tableSummaryColumns.ts @@ -3,9 +3,9 @@ */ export const InspectJob = [ { label: "itemCode", prop: "itemCode", fixed:"left", }, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { type: "filter", filters: "inspectType", label: "检验类型", prop: "inspectType",}, { label: "检验数量", prop: "inspectQty",}, { label: "合格数量", prop: "goodQty",}, @@ -28,9 +28,9 @@ // { label: "最终不合格数量", prop: "notPassedQty",}, // { label: "实际库位", prop: "handledLocationCode",}, // { label: "推荐库位", prop: "recommendLocationCode",}, - // { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - // { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - // { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + // { label: "品名", type: "object", prop: "item", showProp: "name", }, + // { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + // { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, // { type: "object", label: "供应商批次", prop: "batch", showProp: "supplierBatch",}, // { label: "备注", prop: 'remark', }, ] @@ -40,9 +40,9 @@ */ export const InspectNotice = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { label: "物料名称", type: "object", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { label: "品名", type: "object", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "批次", prop: "lot" }, { label: "抽检百分比", prop: "samplePercent",}, { label: "检验数量", prop: "inspectQty",}, @@ -62,9 +62,9 @@ */ export const InspectNote = [ { label: "itemCode", prop: "itemCode", fixed: "left",}, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "检验数量", prop: "inspectQty",}, { label: "合格数量", prop: "goodQty",}, { label: "不合格数量", prop: "failedQty",}, @@ -82,9 +82,9 @@ */ export const PurchaseReceiptNote = [ { label: "itemCode", prop: "itemCode",fixed: "left", }, - { type: "object", label: "物料名称", prop: "item", showProp: "name", }, - { type: "object", label: "物料描述1", prop: "item", showProp: "desc1", }, - { type: "object", label: "物料描述2", prop: "item", showProp: "desc2", }, + { type: "object", label: "品名", prop: "item", showProp: "name", }, + { type: "object", label: "背番", prop: "item", showProp: "desc1", }, + { type: "object", label: "物料描述", prop: "item", showProp: "desc2", }, { label: "总数", prop: "summary" }, { type: "object", label: "收货数量", prop: "qty", showProp: "qty", }, { type: "object", label: "包装数量", prop: "stdPack", showProp: "packQty", }, diff --git a/src/views/eam/toolMod/toolMod.data.ts b/src/views/eam/toolMod/toolMod.data.ts index 77e4a638b..b4fecad3d 100644 --- a/src/views/eam/toolMod/toolMod.data.ts +++ b/src/views/eam/toolMod/toolMod.data.ts @@ -89,7 +89,7 @@ export const ToolMod = useCrudSchemas(reactive([ // form: { // componentProps: { // isSearchList: true, - // searchListPlaceholder: '请选择物料代码', + // searchListPlaceholder: '请选择品番', // searchField: 'modCodeShow', // searchTitle: '客户物料基础信息', // multiple:true, @@ -105,7 +105,7 @@ export const ToolMod = useCrudSchemas(reactive([ // search: { // componentProps: { // isSearchList: true, - // searchListPlaceholder: '请选择物料代码', + // searchListPlaceholder: '请选择品番', // searchField: 'modCodeShow', // searchTitle: '客户物料基础信息', // multiple: true, diff --git a/src/views/home/components/supplierIndex供应商发票空白页,暂时去掉部分模块.vue b/src/views/home/components/supplierIndex供应商发票空白页,暂时去掉部分模块.vue index 9fc7345e5..e1af17903 100644 --- a/src/views/home/components/supplierIndex供应商发票空白页,暂时去掉部分模块.vue +++ b/src/views/home/components/supplierIndex供应商发票空白页,暂时去掉部分模块.vue @@ -183,7 +183,7 @@ - + diff --git a/src/views/mes/orderDay/components/orderDetail.vue b/src/views/mes/orderDay/components/orderDetail.vue index 3e7b0e7ad..b2328a506 100644 --- a/src/views/mes/orderDay/components/orderDetail.vue +++ b/src/views/mes/orderDay/components/orderDetail.vue @@ -81,7 +81,7 @@ style="width: 100%" > - + diff --git a/src/views/mes/processroute/components/configDialog.vue b/src/views/mes/processroute/components/configDialog.vue index 1b6d72818..7aa377de6 100644 --- a/src/views/mes/processroute/components/configDialog.vue +++ b/src/views/mes/processroute/components/configDialog.vue @@ -108,7 +108,7 @@ - + diff --git a/src/views/qms/inspectionJob/inspectionJobMain.data.ts b/src/views/qms/inspectionJob/inspectionJobMain.data.ts index 2dbdc478f..c65a7b66a 100644 --- a/src/views/qms/inspectionJob/inspectionJobMain.data.ts +++ b/src/views/qms/inspectionJob/inspectionJobMain.data.ts @@ -109,7 +109,7 @@ export const InspectionJobMain = useCrudSchemas( } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', isSearch: false, diff --git a/src/views/qms/inspectionQ1/inspectionQ1.data.ts b/src/views/qms/inspectionQ1/inspectionQ1.data.ts index 1faeb77f9..2b59ef60f 100644 --- a/src/views/qms/inspectionQ1/inspectionQ1.data.ts +++ b/src/views/qms/inspectionQ1/inspectionQ1.data.ts @@ -27,7 +27,7 @@ const validateNumber = (rule: any, value: any, callback: any) => { } // 表单校验 export const Q1Rules = reactive({ - itemCode: [{ required: true, message: '请选择物料代码', trigger: 'change' }], + itemCode: [{ required: true, message: '请选择品番', trigger: 'change' }], customerCode: [{ required: true, message: '请选择客户代码', trigger: 'change' }], qty: [{ required: true, message: '请输入数量', trigger: 'change' }, { validator:validateNumber, message: '数量必须是数值类型', trigger: 'change'} @@ -57,7 +57,7 @@ export const Q1 = useCrudSchemas( } }, { - label: '物料代码', + label: '品番', field: 'itemCode', sort: 'custom', table: { @@ -69,7 +69,7 @@ export const Q1 = useCrudSchemas( componentProps: { enterSearch: true, isSearchList: true, // 开启查询弹窗 - searchListPlaceholder: '请选择物料代码', // 输入框占位文本 + searchListPlaceholder: '请选择品番', // 输入框占位文本 searchField: 'itemCode', // 查询弹窗赋值字段 searchTitle: '客户物料信息', // 查询弹窗标题 searchAllSchemas: Customeritem.allSchemas, // 查询弹窗所需类 @@ -95,7 +95,7 @@ export const Q1 = useCrudSchemas( } }, { - label: '物料名称', + label: '品名', field: 'itemName', sort: 'custom', dictClass: 'string', diff --git a/src/views/qms/inspectionQ2/index.vue b/src/views/qms/inspectionQ2/index.vue index acdb4c3f6..3a2f02894 100644 --- a/src/views/qms/inspectionQ2/index.vue +++ b/src/views/qms/inspectionQ2/index.vue @@ -69,7 +69,7 @@ >