diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js
index 4aef2acb5..6a11c18b4 100644
--- a/fe/PC/src/lang/zh.js
+++ b/fe/PC/src/lang/zh.js
@@ -1,4 +1,5 @@
const _initLocationErpCode='ERP储位'
+const _inititemDesc1 = '料号描述'
export default {
// 字段通用
@@ -23,9 +24,9 @@ export default {
// 所有字段（除了接口监控看板）
ColumsNames:{
itemCode:'ERP料号',
- itemName:'物品名称',
- itemDesc1:'物品描述',
- itemDesc2:'物品描述2',
+ itemName:'料号名称',
+ itemDesc1:_inititemDesc1,
+ itemDesc2:_inititemDesc1+'2',
abcClass:'ABC类',
canMake:'制造件',
canBuy:'采购件',
@@ -37,7 +38,7 @@ export default {
color:'颜色',
category:'种类',
group:'分组',
- configuration:'配置',
+ configuration:'规格/颜色',
basicUom:'基本计量单位',
stdPackQty:'标包数',
project:'项目',
@@ -64,10 +65,10 @@ export default {
sampleQty:'抽检数量',
productCode:'父ERP料号',
productName:'父物品名称',
- productDesc1:'父物品描述',
+ productDesc1:'父'+_inititemDesc1,
componentCode:'子ERP料号',
componentName:'子物品名称',
- componentDesc1:'子物品描述',
+ componentDesc1:'子'+_inititemDesc1,
componentQty:'子物品用量',
componentUom:'子物品用量单位',
erpOp:'ERP工序',
diff --git a/fe/PC/src/utils/detailsTableColumns/index.js b/fe/PC/src/utils/detailsTableColumns/index.js
index aba3dc8a5..7e76430dc 100644
--- a/fe/PC/src/utils/detailsTableColumns/index.js
+++ b/fe/PC/src/utils/detailsTableColumns/index.js
@@ -133,10 +133,10 @@ export const PurchaseReceiptRequest = [
// 采购收货任务
export const PurchaseReceiptJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "状态", prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: "数量", prop: "recommendQty" },
{ label: "质量缺陷", prop: "massDefect" },
@@ -179,10 +179,10 @@ export const PurchaseReceiptJob = [
// 报检单
export const InspectRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName", width: orderWidth },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName", width: orderWidth },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "收货数量", prop: "receiveQty" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
@@ -223,10 +223,10 @@ export const InspectRequest = [
// 检验记录
export const InspectNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "收货数量", prop: "receiveQty" },
{ label: "生产批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
@@ -263,10 +263,10 @@ export const InspectNote = [
// 不合格转合格记录
export const unqualifiedToQualifiedNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "toLot" },
@@ -295,10 +295,10 @@ export const unqualifiedToQualifiedNote = [
// 采购上架记录
export const PutawayNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "来源库位", prop: "fromLocationCode" },
{ label: "实际库位", prop: "handledToLocationCode" },
{ label: "实际数量", prop: "handledQty" },
@@ -352,10 +352,10 @@ export const PutawayNote = [
// 人工叫料申请
export const IssueRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "叫料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
@@ -380,10 +380,10 @@ export const IssueRequest = [
// 人工发料任务
export const IssueJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
@@ -431,10 +431,10 @@ export const IssueJob = [
// 人工发料记录
export const IssueNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "发料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -489,10 +489,10 @@ export const IssueNote = [
// 自动叫料申请
export const automaticCallApply = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "叫料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
@@ -517,10 +517,10 @@ export const automaticCallApply = [
// 自动发料任务
export const automaticCallJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "推荐批次", prop: "recommendLot" },
{ label: "实际批次", prop: "handledLot" },
@@ -568,10 +568,10 @@ export const automaticCallJob = [
// 自动发料记录
export const automaticCallNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "发料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -626,10 +626,10 @@ export const automaticCallNote = [
// 上架前退货记录
export const beforeGroundingReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -678,10 +678,10 @@ export const beforeGroundingReturnNote = [
// 上架后退货申请
export const PurchaseReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -702,10 +702,10 @@ export const PurchaseReturnRequest = [
// 上架后退货审批
export const PurchaseReturnApprove = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -726,10 +726,10 @@ export const PurchaseReturnApprove = [
// 上架后退货任务
export const PurchaseReturnJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "退货原因代码", prop: 'reason' },
{ label: "退货原因说明", prop: 'reason', type: "filter", filters: "getDict" , dictType:"PurReturnReason" },
{ label: "订单号", prop: 'poNumber', width:orderWidth },
@@ -753,10 +753,10 @@ export const PurchaseReturnJob = [
// 上架后退货记录
export const PurchaseReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "实际批次", prop: "handledLot" },
{ label: "实际箱码", prop: "handledPackingCode" },
@@ -805,10 +805,10 @@ export const PurchaseReturnNote = [
// 原料报废记录
export const ScrapNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "报废数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "报废原因代码", prop: 'reasonCode' },
@@ -835,10 +835,10 @@ export const ScrapNote = [
// 原料直发客户记录
export const materialDirectSendNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "发料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -881,10 +881,10 @@ export const materialDirectSendNote = [
// 非生产调拨记录
export const directIssueNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "发料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -941,10 +941,10 @@ export const directIssueNote = [
// 完工收货缴库申请
export const ProductReceiptRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "返线数量", prop: "returnQty" },
@@ -969,10 +969,10 @@ export const ProductReceiptRequest = [
// 完工收货缴库记录
export const ProductReceiptNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "库位代码", prop: 'locationCode' },
@@ -1021,10 +1021,10 @@ export const ProductReceiptNote = [
// 完工收货报废申请
export const ProductReceiptScrapRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
@@ -1043,10 +1043,10 @@ export const ProductReceiptScrapRequest = [
// 完工收货报废记录
export const ProductReceiptScrapNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "报废数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "报废原因代码", prop: 'reasonCode' },
@@ -1077,10 +1077,10 @@ export const ProductReceiptScrapNote = [
// 半成品上架记录
export const partiallyPreparedProductsNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "来源库位", prop: "fromLocationCode" },
@@ -1134,10 +1134,10 @@ export const partiallyPreparedProductsNote = [
// 成品发货申请
export const DeliverRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "发货库区", prop: "areaCode" },
@@ -1151,10 +1151,10 @@ export const DeliverRequest = [
// 成品发货任务
export const DeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "单位", prop: "uom" },
{ label: "推荐批次", prop: 'recommendLot' },
{ label: "实际批次", prop: 'handledLot' },
@@ -1193,10 +1193,10 @@ export const DeliverJob = [
// 成品发货记录
export const DeliverNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "创建时间", prop: 'creationTime', type: "dateTime" },
@@ -1247,10 +1247,10 @@ export const DeliverNote = [
// FIS发货申请
export const FISDeliverRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "单位", prop: "uom" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "出货数量", prop: "qty" },
@@ -1263,10 +1263,10 @@ export const FISDeliverRequest = [
// 成品发运任务
export const FISDeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "出货库区", prop: "areaCode" },
@@ -1282,10 +1282,10 @@ export const FISDeliverJob = [
// FIS发货记录
export const FISDeliverNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "出货数量", prop: "qty" },
{ label: "出货库位", prop: "fromLocationCode" },
{ label: "出货"+_Names.locationErpCode, prop: "fromLocationErpCode" },
@@ -1340,10 +1340,10 @@ export const FISDeliverNote = [
// 客户退拆申请
export const customerDismantle = [
{ label: "退拆ERP料号", prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "退拆数量", prop: "qty" },
{ label: "单位", prop: 'uom' },
{ label: "扣账库位", prop: "locationCode" },
@@ -1363,9 +1363,9 @@ export const customerDismantle = [
// 客户退拆任务
export const customerDismantleJob = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "单位", prop: 'uom' },
{ label: "数量", prop: 'qty' },
@@ -1410,10 +1410,10 @@ export const customerDismantleJob = [
// 生产退库申请
export const productionReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "单位", prop: 'uom' },
{ label: "批次", prop: 'lot' },
{ label: _Names.toErpCode, prop: 'toLocationErpCode' },
@@ -1442,10 +1442,10 @@ export const productionReturnRequest = [
// 生产退库任务
export const productionReturnJob = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: 'recommendQty' },
{ label: "批次", prop: 'recommendLot' },
{ label: "任务编号", prop: 'number',width:orderWidth },
@@ -1483,10 +1483,10 @@ export const productionReturnJob = [
// 生产退库记录
export const productionReturnNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed:"left" },
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: 'qty' },
{ label: "单位", prop: 'uom' },
{ label: _Names.fromErpCode, prop: 'fromLocationErpCode' },
@@ -1538,10 +1538,10 @@ export const productionReturnNote = [
// 非生产领料申请
export const pickingRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -1559,10 +1559,10 @@ export const pickingRequest = [
// 非生产领料审批
export const pickingApproval = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -1580,10 +1580,10 @@ export const pickingApproval = [
// 非生产领料任务
export const pickingJob = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "实际数量", prop: "handledQty" },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
@@ -1623,10 +1623,10 @@ export const pickingJob = [
// 非生产领料记录
export const pickingNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
{ label: "调出库位", prop: "locationCode" },
@@ -1675,10 +1675,10 @@ export const pickingNote = [
// 非生产退料申请
export const materialReturnRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "退料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -1696,10 +1696,10 @@ export const pickingNote = [
// 非生产退料审批
export const materialReturnApproval = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "退料数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -1717,10 +1717,10 @@ export const materialReturnApproval = [
// 非生产领料任务
export const materialReturnJob = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "实际数量", prop: "handledQty" },
{ label: "实际库位", prop: 'handledFromLocationCode' },
{ label: _Names.handledErpCode, prop: 'handledFromLocationErpCode' },
@@ -1733,10 +1733,10 @@ export const materialReturnJob = [
// 非生产退料记录
export const materialReturnNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "领料数量", prop: "qty" },
{ label: "箱码", prop: "packingCode" },
{ label: "入库库位", prop: "locationCode" },
@@ -1749,10 +1749,10 @@ export const materialReturnNote = [
// 回收料收货记录
export const recycledMaterialsReceipt = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: 'lot' },
@@ -1774,13 +1774,13 @@ export const recycledMaterialsReceipt = [
export const recycledMaterialsAdjustmentApply = [
{ label: "来源ERP料号", prop: "itemCode" },
{ label: "目标ERP料号", prop: "toItemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "目标物品名称", prop: "toItemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "目标物品描述1", prop: "toItemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "目标物品描述2", prop: "toItemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: "目标"+_Names.itemName, prop: "toItemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: "目标"+_Names.itemDesc1, prop: "toItemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: "目标"+_Names.itemDesc2, prop: "toItemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "来源箱标签", prop: "fromPackingCode" },
{ label: "目标箱标签", prop: "toPackingCode" },
{ label: "单位", prop: "uom" },
@@ -1817,13 +1817,13 @@ export const recycledMaterialsAdjustmentApply = [
export const materialsAdjustment = [
{ label: "来源ERP料号", prop: "itemCode" },
{ label: "目标ERP料号", prop: "toItemCode" },
- { label: "来源物品名称", prop: "itemName" },
- { label: "目标物品名称", prop: "toItemName" },
- { label: "来源物品描述1", prop: "itemDesc1" },
- { label: "目标物品描述1", prop: "toItemDesc1" },
- { label: "来源物品描述2", prop: "itemDesc2" },
- { label: "目标物品描述2", prop: "toItemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: "来源"+_Names.itemName, prop: "itemName" },
+ { label: "目标"+_Names.itemName, prop: "toItemName" },
+ { label: "来源"+_Names.itemDesc1, prop: "itemDesc1" },
+ { label: "目标"+_Names.itemDesc1, prop: "toItemDesc1" },
+ { label: "来源"+_Names.itemDesc2, prop: "itemDesc2" },
+ { label: "目标"+_Names.itemDesc2, prop: "toItemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "来源箱标签", prop: "fromPackingCode" },
{ label: "目标箱标签", prop: "toPackingCode" },
{ label: "来源数量", prop: "fromQty" },
@@ -1849,10 +1849,10 @@ export const materialsAdjustment = [
// 线边仓调拨申请
export const lineSideWarehouseAllocationRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
@@ -1882,10 +1882,10 @@ export const lineSideWarehouseAllocationRequest = [
// 线边仓调拨确认
export const lineSideWarehouseAllocationConfirm = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "在途库位", prop: "onTheWayLocationCode" },
@@ -1916,10 +1916,10 @@ export const lineSideWarehouseAllocationConfirm = [
// 线边仓调拨记录
export const lineSideWarehouseAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
@@ -1950,10 +1950,10 @@ export const lineSideWarehouseAllocationNote = [
// 储位调拨记录
export const interStorageAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
@@ -1984,10 +1984,10 @@ export const interStorageAllocationNote = [
// 客户储位调拨申请
export const customerStorageAllocationRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调出库位", prop: "fromLocationCode" },
{ label: "调入库位", prop: "toLocationCode" },
@@ -2017,10 +2017,10 @@ export const customerStorageAllocationRequest = [
// 客户储位调拨确认
export const customerStorageAllocationConfirm = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "调出库位", prop: "fromLocationCode" },
@@ -2051,10 +2051,10 @@ export const customerStorageAllocationConfirm = [
// 客户储位调拨记录
export const customerStorageAllocationNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "调入库位", prop: "toLocationCode" },
{ label: "在途库位", prop: "onTheWayLocationCode" },
@@ -2085,10 +2085,10 @@ export const customerStorageAllocationNote = [
// 储位内移库记录
export const intraStorageTransferNote = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "调拨数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "调出库位", prop: "fromLocationCode" },
@@ -2117,10 +2117,10 @@ export const intraStorageTransferNote = [
// 线边仓缴库申请
export const lineSideWarehousePaymentRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "目标库位", prop: "locationCode" },
{ label: _Names.toErpCode, prop: "locationErpCode" },
@@ -2147,10 +2147,10 @@ export const lineSideWarehousePaymentRequest = [
// 线边仓缴库记录
export const lineSideWarehousePaymentNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "目标库位", prop: "locationCode" },
{ label: _Names.toErpCode, prop: "locationErpCode" },
@@ -2205,10 +2205,10 @@ export const lineSideWarehousePaymentNote = [
// 线边仓报废申请
export const lineSideWarehouseScrappingRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "库区", prop:"locationArea" },
@@ -2227,10 +2227,10 @@ export const lineSideWarehouseScrappingRequest = [
// 线边仓报废记录
export const lineSideWarehouseScrappingNote = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "报废数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "报废原因代码", prop: 'reasonCode' },
@@ -2261,10 +2261,10 @@ export const lineSideWarehouseScrappingNote = [
// 线边仓调整申请
export const lineSideWarehouseAdjustmentSheetRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: _Names.toErpCode, prop: 'toLocationErpCode' },
@@ -2295,10 +2295,10 @@ export const lineSideWarehouseAdjustmentSheetRequest = [
// 线边仓调整记录
export const lineSideWarehouseAdjustmentSheetNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "数量", prop: "qty" },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: _Names.toErpCode, prop: 'toLocationErpCode' },
@@ -2330,10 +2330,10 @@ export const lineSideWarehouseAdjustmentSheetNote = [
export const InventoryInitialNote = [
{ label: "单据号", prop: "number" },
{ label: _Names.itemCode, prop: 'itemCode' },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "批次", prop: "lot" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位", prop: "locationCode" },
@@ -2348,10 +2348,10 @@ export const InventoryInitialNote = [
// 盘点计划
export const CountPlan = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "单位", prop: "uom" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "初盘数量", prop: "firstCountQty" },
@@ -2390,10 +2390,10 @@ export const CountPlan = [
// 盘点任务
export const CountJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "盘点数量", prop: "countQty" },
{ label: "盘点次数", prop: "inventoryStage" },
@@ -2424,10 +2424,10 @@ export const CountJob = [
// 盘点记录
export const CountNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "最终盘点数量", prop: "finalCountQty" },
{ label: "盘点差异数量", prop: "diffQty" },
@@ -2468,10 +2468,10 @@ export const CountNote = [
// 盘点调整申请
export const CountPlanAdjust = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "盘点数量", prop: "countQty" },
{ label: "调整数量", prop: "qty" },
{ label: "库存数量", prop: "inventoryQty" },
@@ -2499,10 +2499,10 @@ export const CountPlanAdjust = [
// 盘点调整记录
export const CountAdjustNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "库存数量", prop: "diffQty" },
{ label: "盘点数量", prop: "countQty" },
{ label: "盘点差异数量", prop: "adjustQty" },
@@ -2536,10 +2536,10 @@ export const safetyStockWarning = [
prop: "itemCode",
fixed: "left",
},
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: 'itemDesc1' },
- { label: "物品描述2", prop: 'itemDesc2' },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "供应商批次", prop: 'supplierBatch' },
{ label: "到货时间", prop: 'arriveDate' ,type:"dateTime" },
{ label: "生产时间", prop: 'produceDate' ,type:"dateTime" },
@@ -2573,7 +2573,7 @@ export const Kitting = [
{ label: _Names.itemName, prop: 'itemName' },
{ label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: _Names.itemDesc2, prop: "itemDesc2" },
- { label: '配置', prop: "conf" },
+ { label: _Names.configuration, prop: "conf" },
{ label: '数量', prop: "qty" },
{ label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
{ label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
@@ -2583,9 +2583,9 @@ export const Kitting = [
// 空器具呼叫任务
export const callEmptyUtensilJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "包装数量", prop: "stdPackQty" },
{ label: "单位", prop: "uom" },
{ label: "来源库位", prop: 'fromLocationCode' },
@@ -2626,9 +2626,9 @@ export const completDumpNoteZS = [
type: "name",
},
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
@@ -2649,9 +2649,9 @@ export const completDumpNotePT = [
type: "name",
},
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
@@ -2672,9 +2672,9 @@ export const completDumpNoteZP = [
type: "name",
},
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "单位", prop: "uom" },
{ label: "数量", prop: "qty" },
{ label: "标包数量", prop: 'stdPackQty' },
@@ -2690,9 +2690,9 @@ export const completDumpNoteZP = [
// 注塑申请
export const IssueRequestZS = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "请求数/箱", prop: 'qty' },
{ label: "已发数", prop: "receivedQty" },
@@ -2720,9 +2720,9 @@ export const IssueRequestZS = [
// 注塑任务
export const IssueJobZS = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -2809,9 +2809,9 @@ export const IssueJobZS = [
// 注塑记录
export const IssueNoteZS = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -2898,9 +2898,9 @@ export const IssueNoteZS = [
// 喷涂申请
export const IssueRequestPT = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "请求数/箱", prop: 'qty' },
{ label: "已发数", prop: "receivedQty" },
@@ -2913,9 +2913,9 @@ export const IssueRequestPT = [
// 喷涂任务
export const IssueJobPT = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -2932,9 +2932,9 @@ export const IssueJobPT = [
// 喷涂记录
export const IssueNotePT = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -2950,9 +2950,9 @@ export const IssueNotePT = [
// 装配申请
export const IssueRequestZP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "请求数/箱", prop: 'qty' },
{ label: "已发数", prop: "receivedQty" },
@@ -2965,9 +2965,9 @@ export const IssueRequestZP = [
// 装配任务
export const IssueJobZP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -2984,9 +2984,9 @@ export const IssueJobZP = [
// 装配记录
export const IssueNoteZP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -3002,9 +3002,9 @@ export const IssueNoteZP = [
// 备品申请
export const IssueRequestBP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "请求数/箱", prop: 'qty' },
{ label: "已发数", prop: "receivedQty" },
@@ -3017,9 +3017,9 @@ export const IssueRequestBP = [
// 备品任务
export const IssueJobBP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -3036,9 +3036,9 @@ export const IssueJobBP = [
// 备品记录
export const IssueNoteBP = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -3054,9 +3054,9 @@ export const IssueNoteBP = [
// kitting请求
export const KittingIssueRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "openToClose" },
{ label: "请求数/箱", prop: 'qty' },
{ label: "已发数", prop: "receivedQty" },
@@ -3069,9 +3069,9 @@ export const KittingIssueRequest = [
// kitting任务
export const KittingIssueJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -3088,9 +3088,9 @@ export const KittingIssueJob = [
// kitting记录
export const KittingIssueNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "状态", prop: "status", type: "filter", filters: "inventoryStage" },
{ label: "请求库位代码", prop: 'requestLocationCode' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
@@ -3106,9 +3106,9 @@ export const KittingIssueNote = [
// 业务库移申请
export const transferLibRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "物品单位", prop: "uom" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "库存状态", prop: "status", type: "filter", filters: "inventoryStage" },
@@ -3144,10 +3144,10 @@ export const transferLibRequest = [
// 业务库移任务
export const transferLibJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求库位", prop: 'requestLocationCode' },
{ label: "实际来源箱标签", prop: 'handledFromPackingCode' },
@@ -3198,10 +3198,10 @@ export const transferLibJob = [
// 业务库移记录
export const transferLibNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "标包数量", prop: "stdPackQty" ,isNumber:true},
{ label: "请求数量", prop: 'requestQty' },
{ label: "请求库位", prop: 'requestLocationCode' },
@@ -3254,10 +3254,10 @@ export const transferLibNote = [
// 三方库申请
export const ThirdLocationRequest = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "申请数量", prop: "qty" },
{ label: "已发数量", prop: "issuedQty"},
{ label: "已收数量", prop: "receivedQty"},
@@ -3276,10 +3276,10 @@ export const ThirdLocationRequest = [
// 三方库任务
export const ThirdLocationJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "推荐数量", prop: "recommendQty" },
// todo:申请数量、已发数量、已收数量、未发数量、未收数量
@@ -3330,10 +3330,10 @@ export const ThirdLocationJob = [
// 三方库记录
export const ThirdLocationNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE" },
{ label: "申请数量", prop: "qty" },
// todo:已发数量、已收数量、未发数量、未收数量
{ label: "实际箱码", prop: "handledPackingCode" },
@@ -3387,9 +3387,9 @@ export const ThirdLocationNote = [
// 客户退货记录
export const customerReturnNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left", },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "目标库位", prop: 'toLocationCode' },
{ label: _Names.toErpCode, prop: 'toLocationErpCode' },
@@ -3442,9 +3442,9 @@ export const customerReturnNote = [
// kitting打包记录
export const KittingPackagingNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "kitting代码", prop: 'kittingCode' },
{ label: "备注", prop: "remark" },
@@ -3455,9 +3455,9 @@ export const KittingPackagingNote = [
// 【pad】业务库移
export const isPadForTransferLibJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "请求数量", prop: 'requestQty' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "推荐来源数量", prop: 'recommendFromQty' },
diff --git a/fe/PC/src/utils/summaryTableColumns/index.js b/fe/PC/src/utils/summaryTableColumns/index.js
index 3a8805025..b817001bb 100644
--- a/fe/PC/src/utils/summaryTableColumns/index.js
+++ b/fe/PC/src/utils/summaryTableColumns/index.js
@@ -9,9 +9,9 @@ let _Names = zh.ColumsNames // 业务字段
// 报检单
export const InspectRequest = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "生产批次", prop: "lot" },
{ label: "收货数量", prop: 'receiveQty' },
{ label: "检验数量", prop: 'inspectQty' },
@@ -47,9 +47,9 @@ export const InspectRequest = [
// 检验记录
export const InspectNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "生产批次", prop: "lot" },
{ label: "计量单位", prop: 'uom' },
{ label: "收货数量", prop: 'receiveQty' },
diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js
index e1e087ab3..6bf5941b3 100644
--- a/fe/PC/src/utils/tableColumns/index.js
+++ b/fe/PC/src/utils/tableColumns/index.js
@@ -1056,9 +1056,9 @@ export const qualifiedInfo = [
},
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "物品单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -1117,12 +1117,12 @@ export const unqualifiedInfo = [
},
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "物品单位", prop: "uom" },
- { label: "原箱码", prop: "fromPackingCode" },
+ { label: "推荐箱码", prop: "recommendPackingCode" },
// { label: "拆箱箱码", prop: "packingCode" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "不合格原因代码", prop: 'failedReason' },
@@ -1135,7 +1135,7 @@ export const unqualifiedInfo = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "订单号", prop: "poNumber" },
{ label: "订单行", prop: "poLine" },
- { label: "推荐箱码", prop: "recommendPackingCode" },
+ { label: "原箱码", prop: "fromPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" },
// { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
// { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
@@ -1172,9 +1172,9 @@ export const unqualifiedInfo = [
// 采购收货记录-详情【收货缺料明细】
export const lackMaterialsInfo = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "批次", prop: "lot" },
{ label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "单据号", prop: "number" },
@@ -1275,9 +1275,9 @@ export const InspectNote = [
export const unqualifiedToQualified = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -1845,10 +1845,10 @@ export const FISDeliverRequest = [
// 成品发运任务
export const FISDeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "出货库区", prop: "areaCode" },
@@ -2099,9 +2099,9 @@ export const labelsList = [
fixed:"left"
},
{ label: _Names.itemCode, prop: 'itemCode' },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -2160,11 +2160,11 @@ export const InventoryBalance = [
type: "name",
width: orderWidth
},
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "类型", prop: 'item_typeFromFE', type: "filter", filters: "ItemTypeBasic", showProp:true },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "标准成本单价", prop: "stdCostPrice" },
@@ -2204,10 +2204,10 @@ export const InventoryBalanceActive = [
type: "name",
width: orderWidth
},
- { label: "物品名称", prop: 'itemName' },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -2246,10 +2246,10 @@ export const InventoryTransaction = [
width: orderWidth
},
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
@@ -2303,9 +2303,9 @@ export const InventoryTransferLog = [
{ label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
{ label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "到货数量", prop: "qty",isNumber:true },
{ label: "到货单位", prop: "uom" },
{ label: "从库位代码", prop: "fromLocationCode" },
@@ -2353,9 +2353,9 @@ export const expectOut = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "占用数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "库位代码", prop: "locationCode" },
@@ -2383,9 +2383,9 @@ export const expectIn = [
},
{ label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "占用数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" },
{ label: "库位代码", prop: "locationCode" },
@@ -2412,9 +2412,9 @@ export const safetyStockWarning = [
fixed: "left",
type: "name"
},
- { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
- { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
+ { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "最小库存", prop: 'minStock' },
{ label: "最大库存", prop: 'maxStock' },
{ label: "安全库存", prop: 'safetyStock' },
@@ -2430,9 +2430,9 @@ export const splitPackingList = [
fixed: "left",
type: "name"
},
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" },
{ label: "目标箱码", prop: "toPackingCode" },
{ label: "原数量", prop: "fromQty",isNumber:true },
@@ -2951,9 +2951,9 @@ export const CountJob = [
// 盘点任务-扫描明细
export const countJobDepDetails = [
{ label: _Names.itemCode, prop: "itemCode", type: "name",fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "库存数量", prop: "inventoryQty" },
{ label: "盘点数量", prop: "countQty" },
@@ -3753,9 +3753,9 @@ export const KittingPackagingNote = [
// kitting打包记录 - 扫描明细
export const KittingPackagingDepDetails = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "底盘代码", prop: "chassisNumber" },
{ label: "底盘号排序序列", prop: "chassisSortNumber" },
{ label: "kitting代码", prop: 'kittingCode' },
diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js
index c32b4a975..9c08bc26e 100644
--- a/fe/PC/src/utils/tabsDesTions/index.js
+++ b/fe/PC/src/utils/tabsDesTions/index.js
@@ -1331,9 +1331,9 @@ export const productionReturnNote = [
export const labelsList = [
{ label: "箱码", prop: "code" },
{ label: _Names.itemCode, prop: 'itemCode' },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" },
@@ -1396,8 +1396,8 @@ export const InventoryInitialNote = [
{ label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
// { label: "最后盘点标签号", prop: "lastCountLabel" },
- { label: "物品描述", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "标准成本单价", prop: "stdCostPrice" },
{ label: "标准成本金额", prop: "stdCost" },
@@ -1432,8 +1432,8 @@ export const InventoryBalanceActive = [
{ label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
// { label: "最后盘点标签号", prop: "lastCountLabel" },
- { label: "物品描述", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' },
{ label: "供应商批次", prop: 'supplierBatch' },
// { label: "序号", prop: "serialNumber" },
@@ -1450,9 +1450,9 @@ export const InventoryBalanceActive = [
export const InventoryTransaction = [
{ label: "事务编号", prop: "transNumber" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "数量", prop: "qty" },
@@ -1487,9 +1487,9 @@ export const InventorySnapshot = [
{ label: "备注", prop: 'remark' },
{ label: "序号", prop: "serialNumber" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" },
{ label: "数量", prop: "qty" },
@@ -1516,9 +1516,9 @@ export const InventoryTransferLog = [
{ label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
{ label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "到货数量", prop: "qty" },
{ label: "到货单位", prop: "uom" },
{ label: "批次", prop: 'toLot' },
@@ -1554,9 +1554,9 @@ export const InventoryTransferLog = [
// 预计入库存
export const expectIn = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "任务编号", prop: "jobNumber" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位代码", prop: "locationCode" },
@@ -1580,9 +1580,9 @@ export const expectIn = [
// 预计入库存
export const expectOut = [
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "任务编号", prop: "jobNumber" },
{ label: "箱码", prop: "packingCode" },
{ label: "库位代码", prop: "locationCode" },
@@ -1630,9 +1630,9 @@ export const splitPackingList = [
fixed: "left",
type: "name"
},
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" },
{ label: "目标箱码", prop: "toPackingCode" },
{ label: "原数量", prop: "fromQty",isNumber:true },
diff --git a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
index 2af4a7708..28f40bfc4 100644
--- a/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
+++ b/fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
@@ -85,6 +85,9 @@
import { getInventoryTransactionSerials,getInterfaceCalendar } from '@/api/wms-api'
import { formatTimeStampToNorm,formatTimeStrToStr } from '@/utils/formatTime'
import * as statusType from "@/filters/statusType"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
export default {
name:"InventoryBookDetail_innerPage",
data(){
@@ -116,11 +119,11 @@ export default {
},
// table标头
tableTh:[
- {label:'ERP料号',prop:'itemCode',width:170},
- {label:'物料名称',prop:'itemName'},
- {label:'物料描述',prop:'itemDesc1'},
- {label:'物料配置',prop:'configuration'},
- {label:'ERP储位',prop:'erpLocatioCode',width:80},
+ {label:_Names.itemCode,prop:'itemCode',width:170},
+ {label:_Names.itemName,prop:'itemName'},
+ {label:_Names.itemDesc1,prop:'itemDesc1'},
+ {label:_Names.configuration,prop:'configuration'},
+ {label:_Names.locationErpCode,prop:'erpLocatioCode',width:80},
{label:'库位代码',prop:'locationCode',width:90},
{label:'单号',prop:'number',width:170},
{label:'创建时间',prop:'createDateTime',width:160},
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
index 39a05236f..554c112ff 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
@@ -208,7 +208,7 @@ export default {
{ type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
{ type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
{ type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
- { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
+ { type: "input", label: _Names.configuration, prop: 'configuration', colSpan: 12 },
{ type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
@@ -241,7 +241,7 @@ export default {
{ type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
{ type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
{ type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
- { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
+ { type: "input", label: _Names.configuration, prop: 'configuration', colSpan: 12 },
{ type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },
diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
index 0a5f2ae53..1b08cc62b 100644
--- a/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
@@ -158,10 +158,10 @@ export default {
{ type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilterItemCode())},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData,this.isFilterItemCode()) }, colSpan: 12 },
- { type: "input", label: "物品名称", prop: "item_nameFromFE", colSpan: 12, disabled:true},
- { type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true},
- { type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true},
- { type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemName, prop: "item_nameFromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemDesc1, prop: "item_desc1FromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemDesc2, prop: "item_desc2FromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.configuration, prop: "item_configurationFromFE", colSpan: 12, disabled:true},
{ type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
@@ -169,10 +169,10 @@ export default {
{ disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
{ type: "input", label: _Names.itemCode, prop: "itemCode", disabled:true, colSpan: 12 },
- { type: "input", label: "物品名称", prop: "item_nameFromFE", colSpan: 12, disabled:true},
- { type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true},
- { type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true},
- { type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemName, prop: "item_nameFromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemDesc1, prop: "item_desc1FromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.itemDesc2, prop: "item_desc2FromFE", colSpan: 12, disabled:true},
+ { type: "input", label: _Names.configuration, prop: "item_configurationFromFE", colSpan: 12, disabled:true},
{ type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 },
],
diff --git a/fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue b/fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue
index 903b4a0c9..43d4b6708 100644
--- a/fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue
@@ -153,10 +153,10 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
width: "auto",searchButton:false
},
- { label: "物料名称", prop: "itemName",width:"auto" },
- { label: "物料描述1", prop: "itemDesc1",width:"auto" },
- { label: "物料描述2", prop: "itemDesc2",width:"auto" },
- { label: "配置", prop: 'configuration',width:"auto" },
+ { label: _Names.itemName, prop: "itemName",width:"auto" },
+ { label: _Names.itemDesc1, prop: "itemDesc1",width:"auto" },
+ { label: _Names.itemDesc2, prop: "itemDesc2",width:"auto" },
+ { label: _Names.configuration, prop: 'configuration',width:"auto" },
],
childTableData:[{
stdPack:null,
diff --git a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
index 5e21c351f..00278ab55 100644
--- a/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
+++ b/fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
@@ -170,8 +170,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
colSpan: 12
},
- { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
- { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
+ { type: "input", disabled:true, label: _Names.itemName, prop: "partName",colSpan: 12 },
+ { type: "input", disabled:true, label: _Names.itemDesc1, prop: "partDesc",colSpan: 12 },
{ type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
{ type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
@@ -190,8 +190,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) },
colSpan: 12
},
- { type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 },
- { type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 },
+ { type: "input", disabled:true, label: _Names.itemName, prop: "partName",colSpan: 12 },
+ { type: "input", disabled:true, label: _Names.itemDesc1, prop: "partDesc",colSpan: 12 },
{ type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
{ type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
index 02cbd2ed5..5a084fd5b 100644
--- a/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
+++ b/fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
@@ -170,9 +170,9 @@ export default {
{ type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
- { label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
- { label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
- { label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemName, prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemDesc1, prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemDesc2, prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
// 3,4,16
{ type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))},
@@ -198,9 +198,9 @@ export default {
{ type: "filterSelect", label: _Names.itemCode,disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
- { label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
- { label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
- { label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemName, prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemDesc1, prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
+ { label: _Names.itemDesc2, prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
{ type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,this.locationFilter('product'))},
diff --git a/fe/PC/src/views/kittingManage/Kitting.vue b/fe/PC/src/views/kittingManage/Kitting.vue
index c319c81e7..0fd3d60ff 100644
--- a/fe/PC/src/views/kittingManage/Kitting.vue
+++ b/fe/PC/src/views/kittingManage/Kitting.vue
@@ -163,10 +163,10 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
width: "auto",searchButton:false
},
- { label: "物料名称", prop: "itemName",width:"auto" },
- { label: "物料描述1", prop: "itemDesc1",width:"auto" },
- { label: "物料描述2", prop: "itemDesc2",width:"auto" },
- { label: "配置", prop: 'conf',width:"auto" },
+ { label: _Names.itemName, prop: "itemName",width:"auto" },
+ { label: _Names.itemDesc1, prop: "itemDesc1",width:"auto" },
+ { label: _Names.itemDesc2, prop: "itemDesc2",width:"auto" },
+ { label: _Names.configuration, prop: 'conf',width:"auto" },
{ type:"input", label: "备注", prop: 'remark',width:"auto" },
],
childTableData:[{
diff --git a/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue b/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue
index 5f28384fa..1c3ca0df8 100644
--- a/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue
+++ b/fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue
@@ -68,10 +68,10 @@ export default {
transactionColumns:[
{ label: "事务编号", prop: "transNumber",width: 180 },
{ label: _Names.itemCode, prop: "itemCode" },
- { label: "物品名称", prop: "itemName" },
- { label: "物品描述1", prop: "itemDesc1" },
- { label: "物品描述2", prop: "itemDesc2" },
- { label: "配置", prop: "item_configurationFromFE",showProp:true },
+ { label: _Names.itemName, prop: "itemName" },
+ { label: _Names.itemDesc1, prop: "itemDesc1" },
+ { label: _Names.itemDesc2, prop: "itemDesc2" },
+ { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
diff --git a/fe/PC/src/views/padManage/isPadForKittingPack.vue b/fe/PC/src/views/padManage/isPadForKittingPack.vue
index 4c63b925e..b1883e036 100644
--- a/fe/PC/src/views/padManage/isPadForKittingPack.vue
+++ b/fe/PC/src/views/padManage/isPadForKittingPack.vue
@@ -64,15 +64,15 @@
>