【nev-pc】物料代码更改为ERP料号使用全局配置更改，所有位置更改+库存事务bug处理

fe/PC/src/filters/excelOrReportsOption.js

@@ -12,7 +12,7 @@ export const supplierAsnExcel = {
     shipDate:"发货日期",
     details:{
         projectCode:"明细-项目编号",
-        itemCode:"明细-物品代码",
+        itemCode:"明细-ERP料号",
         ctype:"明细-类型",
         recommendErpCode:"明细-指定ERP储位",
         qty:"明细-发货数量",

fe/PC/src/filters/status.js

@@ -855,13 +855,13 @@ export function TransType(index, prop) {
   }
   return Enum(type, index, prop)
 }
-//库存事务子类型
+//事务替代类型
 /**
  * 
  * @param {Boolean}  
  * @returns {object}
  */
-export function TransSubType(index, prop) {
+export function TransReplaceType(index, prop) {
   let type = {
     1: {
       label: "库存",
@@ -2027,46 +2027,6 @@ export function SupplierAsnCtypeStaBack(name){
       value: 1202,
       label: '采购退货_上将后'
     },
-    3101: {
-      value: 3101,
-      label: '区域内调拨'
-    },
-    3102: {
-      value: 3102,
-      label: '区域间调拨'
-    },
-    3103: {
-      value: 3103,
-      label: '库间调拨'
-    },
-    3104: {
-      value: 3104,
-      label: '线边调拨'
-    },
-    1505: {
-      value: 1505,
-      label: '非生产调拨'
-    },
-    3105: {
-      value: 3105,
-      label: '客户库位调拨'
-    },
-    3601: {
-      value: 3601,
-      label: '线边报废'
-    },
-    3602: {
-      value: 3602,
-      label: '仓库报废'
-    },
-    3701: {
-      value: 3701,
-      label: '线边盘点调整'
-    },
-    3702: {
-      value: 3702,
-      label: '仓库盘点调整'
-    },
     1501: {
       value: 1501,
       label: '人工拉动'
@@ -2083,6 +2043,14 @@ export function SupplierAsnCtypeStaBack(name){
       value: 1504,
       label: '安全库存拉动'
     },
+    1505: {
+      value: 1505,
+      label: '非生产调拨'
+    },
+    1510: {
+      value: 1510,
+      label: '立库出库'
+    },
     2101: {
       value: 2101,
       label: '人工缴库'
@@ -2099,10 +2067,54 @@ export function SupplierAsnCtypeStaBack(name){
       value: 2302,
       label: 'FIS发货'
     },
+    2303: {
+      value: 2303,
+      label: '原料发货'
+    },
+    3101: {
+      value: 3101,
+      label: '区域内调拨'
+    },
+    3102: {
+      value: 3102,
+      label: '区域间调拨'
+    },
+    3103: {
+      value: 3103,
+      label: '库间调拨'
+    },
+    3104: {
+      value: 3104,
+      label: '线边调拨'
+    },
+    3105: {
+      value: 3105,
+      label: '客户库位调拨'
+    },
+    3106: {
+      value: 3106,
+      label: '注塑完工转储'
+    },
+    3107: {
+      value: 3107,
+      label: '喷涂完工转储'
+    },
+    3108: {
+      value: 3108,
+      label: '装配完工转储'
+    },
+    3109: {
+      value: 3109,
+      label: '拆箱'
+    },
     3301: {
       value: 3301,
       label: '回收料收货'
     },
+    3302: {
+      value: 3302,
+      label: '回收料调整'
+    },
     3601: {
       value: 3601,
       label: '人工报废'
@@ -2115,6 +2127,18 @@ export function SupplierAsnCtypeStaBack(name){
       value: 3603,
       label: '线边报废'
     },
+    3604: {
+      value: 3604,
+      label: '完工报废'
+    },
+    3701: {
+      value: 3701,
+      label: '线边盘点调整'
+    },
+    3702: {
+      value: 3702,
+      label: '仓库盘点调整'
+    },
     4401: {
       value: 4401,
       label: '采购收货上架'
@@ -2127,6 +2151,14 @@ export function SupplierAsnCtypeStaBack(name){
       value: 4403,
       label: '半成品上架'
     },
+    6001: {
+      value: 6001,
+      label: '人工盘点计划'
+    },
+    6002: {
+      value: 6002,
+      label: '导入盘点计划'
+    },
   }
   return Enum(type, index, prop)
 }

fe/PC/src/lang/zh.js

@@ -17,7 +17,7 @@ export default {
 
   // 所有字段（除了接口监控看板）
   ColumsNames:{
-    itemCode:'物品代码',
+    itemCode:'ERP料号',
     itemName:'物品名称',
     itemDesc1:'物品描述',
     itemDesc2:'物品描述2',

fe/PC/src/mixins/printMixin.js

@@ -37,7 +37,7 @@ export function initPrintPackingCodeData(propsData,options,name,url){
                     "produceDate": item[_options.produceDate] || item.produceDate,//生产时间
                     "lot": item[_options.lot] || item.lot,//生产批次
                     "locationErpCode": item[_options.locationErpCode] || item.locationErpCode,//储位
-                    "itemCode": item[_options.itemCode] || item.itemCode,//物品代码（ERP号）
+                    "itemCode": item[_options.itemCode] || item.itemCode,//ERP料号
                     "qty": item[_options.qty] || item.qty,//要货数量 + 整包数量
                     "packingCode": item[_options.packingCode] || item.packingCode,//条形码
                     "printIndex":item[_options.printIndex] || Number(key)+1,//打印序列
@@ -84,7 +84,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
             "oldProduceDate": oldData[_options.produceDate] || oldData.produceDate,//上方_生产时间
             "oldLot": oldData[_options.lot] || oldData.lot,//上方_生产批次
             "oldLocationErpCode": oldData[_options.locationErpCode] || oldData.locationErpCode,//上方_储位
-            "oldItemCode": oldData[_options.itemCode] || oldData.itemCode,//上方_物品代码（ERP号）
+            "oldItemCode": oldData[_options.itemCode] || oldData.itemCode,//上方_ERP料号
             "oldQty": oldData[_options.qty] || oldData.qty,//上方_要货数量
             "oldStdPackQty": oldData[_options.stdPackQty] || oldData.stdPackQty,//上方_整包数量
             "oldPackingCode": oldData[_options.packingCode] || oldData.packingCode,//上方_条形码
@@ -108,7 +108,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
             "newProduceDate": newData[_options.produceDate] || newData.produceDate,//下方_生产时间
             "newLot": newData[_options.lot] || newData.lot,//下方_生产批次
             "newLocationErpCode": newData[_options.locationErpCode] || newData.locationErpCode,//下方_储位
-            "newItemCode": newData[_options.itemCode] || newData.itemCode,//下方_物品代码（ERP号）
+            "newItemCode": newData[_options.itemCode] || newData.itemCode,//下方_ERP料号
             "newQty": newData[_options.qty] || newData.qty,//下方_数量 + 整包数量
             "newStdPackQty": newData[_options.stdPackQty] || newData.stdPackQty,//上方_整包数量
             "newPackingCode": newData[_options.packingCode] || newData.packingCode,//下方_条形码
@@ -178,7 +178,7 @@ export function initPrintPackingCodeTwoData(oldData,newData,options,name,url){
             _label['produceDate'+Number(key2 + 1)] = item[_options.produceDate] || item2.produceDate;//生产时间
             _label['lot'+Number(key2 + 1)] = item[_options.lot] || item2.lot;//生产批次
             _label['locationErpCode'+Number(key2 + 1)] = item[_options.locationErpCode] || item2.locationErpCode;//储位
-            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//物品代码（ERP号）
+            _label['itemCode'+Number(key2 + 1)] = item[_options.itemCode] || item2.itemCode;//ERP料号
             _label['stdPackQty'+Number(key2 + 1)] = item[_options.stdPackQty] || item2.stdPackQty;//整包数量 暂未使用
             _label['qty'+Number(key2 + 1)] = item[_options.qty] || item2.qty;//要货数量 + 整包数量
             _label['packingCode'+Number(key2 + 1)] = item[_options.packingCode] || item2.packingCode;//条形码
@@ -259,18 +259,18 @@ const printEnumOption = {
 // cgshd.rdlx  使用参数
 // 使用位置:采购收货记录-合格品收货明细tab页 (PurchaseReceiptNote-msQuery.vue)
 // 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName
-// 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr;
+// ERP料号:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 状态:statusStr; 不合格原因:reasonStr;
 
 // thd.rdlx  使用参数
 // 使用位置:上架前退货记录 (beforeGroundingReturnNote.vue) | 上架后退货记录 (purchaseReturn => returnNote.vue PurchaseReturnNote) 
 // 使用位置:采购收货记录-不合格品收货明细tab页 (PurchaseReceiptNote-msQuery.vue)
 // 退货单号:number; 发货单号:asnNumber; 制表日:creationTime; 供应商:supplierCode; 供应商简称:supplierShortName
-// 物品代码:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr;
+// ERP料号:itemCode; 物品名称:itemName; 箱码:packingCode; 单位:uom; 数量:qty; 退货原因:reasonStr;
 
 // lineSideWarehouse.rdlx  使用参数
 // 使用位置:线边仓调拨记录 (lineSideWarehouseAllocationNote.vue)
 // 调拨单号:number; 参考单据:poNumber; 制表日:creationTime; 调拨部门:deptCode; 部门名称:deptName
-// 物品代码:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode;
+// ERP料号:itemCode; 单位:uom; 预计调拨量:preQty; 调入储位:toLocationCode; 实际调拨量:qty; 调出储位:fromLocationCode;
 
 // fscll.rdlx | fsctl.rdlx 使用参数
 // 使用位置:非生产领料申请 (pickingRequest.vue - fscll.rdlx) 
@@ -281,28 +281,28 @@ const printEnumOption = {
 // cwdbd.rdlx  使用参数
 // 使用位置:储位调拨记录 (interStorageAllocationNote.vue) 
 // 调拨单号:number; 制表日:creationTime; 调拨日期:activeDate
-// 物品代码:itemCode; 物品名称:itemName; 单位:uom; 调出储位:fromLocationCode; 调入储位:toLocationCode; 调拨量:qty;
+// ERP料号:itemCode; 物品名称:itemName; 单位:uom; 调出储位:fromLocationCode; 调入储位:toLocationCode; 调拨量:qty;
 
 // khcwdbd.rdlx  使用参数
 // 使用位置:客户储位调拨记录 (customerStorageAllocationNote.vue) 
 // 调拨单号:number; 制表日:creationTime; 使用者:worker; 部门代码:deptCode; 客户储位:toLocationCode
-// 序号:xh; 物品代码:itemCode; 物品名称:itemName; 预计调拨量:preQty; 实际调拨量:qty; 调出储位:fromLocationCode;
+// 序号:xh; ERP料号:itemCode; 物品名称:itemName; 预计调拨量:preQty; 实际调拨量:qty; 调出储位:fromLocationCode;
 
 // xbcbfd.rdlx  使用参数
 // 使用位置:线边仓报废记录 (lineSideWarehouseScrappingNote.vue) 
 // 报废单号:number; 制表日:creationTime;
-// 物品代码:itemCode; 物品名称:itemName; 储位:fromLocationCode; 数量:qty; 原因说明:reasonStr; 参考单据:scrapRequestNumber;
+// ERP料号:itemCode; 物品名称:itemName; 储位:fromLocationCode; 数量:qty; 原因说明:reasonStr; 参考单据:scrapRequestNumber;
 
 // tzd.rdlx  使用参数
 // 使用位置:线边仓调整记录 (lineSideWarehouseAdjustmentSheetNote.vue) 
 // 单号:number; 制表日:creationTime;
-// 物品代码:itemCode; 物品名称:itemName; 储位:locationCode; 数量:adjustQty; 原因说明:reasonStr; 参考单据:requestNumber;
+// ERP料号:itemCode; 物品名称:itemName; 储位:locationCode; 数量:adjustQty; 原因说明:reasonStr; 参考单据:requestNumber;
 
 // xbcll.rdlx  使用参数
 // 使用位置:?自动发料任务 (automaticCallJob-msQuery.vue) | 自动发料记录 (automaticCallNote.vue) 
 // 使用位置:人工发料任务 (IssueJob.vue)  | 人工发料记录 (IssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// ERP料号:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // xbctl.rdlx  使用参数  xbctl.rdlx报表 和 xbcll.rdlx报表 目前字段相同，除了领/退字段
@@ -311,20 +311,20 @@ const printEnumOption = {
 // zjfl.rdlx  使用参数
 // 使用位置:直接发料记录 (directIssueNote.vue)
 // 单号:number; 制表日:creationTime; 部门名称:deptName; 
-// 物品代码:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
+// ERP料号:itemCode; 物品名称:itemName; 物品描述:itemDesc1; 零件号:itemCode; 来源库位:fromLocationCode; 
 // 实际数量:qty; 单位:uom; 批次:fromLot; 调入储位:toLocationErpCode; 调出储位:fromLocationErpCode;
 
 // hslrkd.rdlx  使用参数
 // 使用位置:回收料收货记录 (materialsReceipt.vue recycledMaterialsReceipt)
 // 入库单号:number; 制表日:creationTime; 入库日期:activeDate; 部门代码:deptCode; 部门名称:deptName;  
-// 物品代码:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode; 
+// ERP料号:itemCode; 物品名称:itemName; 物品描述1:itemDesc1; 物品描述2:itemDesc2; 数量:qty; 储位:locationErpCode; 
 
 // chdmxb.rdlx  使用参数
 // 使用位置:原料直发客户记录 (materialDirectSendNote.vue)
 // 出货单号:number; 出货日期:deliverTime; 制表日:creationTime; 客户名称:customerCode; 客户地址:customerAddressCode;  
-// 序号:xh, 物品代码:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty;  
+// 序号:xh, ERP料号:itemCode; 物品名称:itemName; 单位:uom; 箱标签:packingCode, 出货数量:qty;  
 
 // ysd.rdlx  使用参数
 // 使用位置:采购上架记录 (PutawayNote.vue)
 // 供应商代码:supplierCode; 供应商名称:supplierSimpleName; 制表日:creationTime; 采购单:poNumber; 收货单号:receiptNumber; 验收口:dockCode; 请购部门:deptName;  
-// 物品代码:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode; 
+// ERP料号:itemCode; 验收备注:remark; 厂商料品单号:supplierItemCode; 物品名称:itemName; 收料量:qty; 验收日期:arriveDate; 单位:uom; 储位:toLocationErpCode; 

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

@@ -2,7 +2,7 @@
 const orderWidth = 180
 import zh from '@/lang/zh'
 let _Public = zh.ColumsPublic // 字段通用
-let _Names = zh.ColumsNames // 接口监控看板
+let _Names = zh.ColumsNames // 业务字段
 // 基础数据管理
 /**/
 // 字典信息 20230404
@@ -28,7 +28,7 @@ export const Dict = [
 // 原料管理
 // 供应商发货通知 20230404
 export const SupplierAsn =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label:  _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -67,7 +67,7 @@ export const SupplierAsn =  [
 
 // 采购订单信息 20230404
 export const PurchaseOrder =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -111,7 +111,7 @@ export const PurchaseOrder =  [
 ]
 // 采购订单信息 （有关闭订单行）
 export const PurchaseOrderHigher =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -156,7 +156,7 @@ export const PurchaseOrderHigher =  [
 
 // 到货请求 20230404
 export const PurchaseReceiptRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -193,7 +193,7 @@ export const PurchaseReceiptRequest =  [
 ]
 // 采购收货任务 20230404
 export const PurchaseReceiptJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -249,7 +249,7 @@ export const PurchaseReceiptJob =  [
 ]
 // 报检单 20230410
 export const InspectRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName", width: orderWidth },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -302,7 +302,7 @@ export const InspectRequest =  [
 ]
 // 检验记录 20230407
 export const InspectNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -355,7 +355,7 @@ export const InspectNote =  [
 
 // 不合格转合格记录 已调整 20230407
 export const unqualifiedToQualifiedNote = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -398,7 +398,7 @@ export const unqualifiedToQualifiedNote = [
 ]
 // 采购上架记录  20230410
 export const PutawayNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -468,7 +468,7 @@ export const PutawayNote =  [
 ]
 // 人工叫料申请  20230411
 export const IssueRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -503,7 +503,7 @@ export const IssueRequest =  [
 ]
 // 人工发料任务 20230411
 export const IssueJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -567,7 +567,7 @@ export const IssueJob =  [
 ]
 // 人工发料记录 20230411
 export const IssueNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -638,7 +638,7 @@ export const IssueNote =  [
 ]
 // 自动叫料申请 20230411
 export const automaticCallApply =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -673,7 +673,7 @@ export const automaticCallApply =  [
 ]
 // 自动发料任务 20230411
 export const automaticCallJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -737,7 +737,7 @@ export const automaticCallJob =  [
 ]
 // 自动发料记录 20230411
 export const automaticCallNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -809,7 +809,7 @@ export const automaticCallNote =  [
 ]
 // 上架前退货记录 20230412
 export const beforeGroundingReturnNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -872,7 +872,7 @@ export const beforeGroundingReturnNote =  [
 ]
 // 上架后退货申请 20230412
 export const PurchaseReturnRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -909,7 +909,7 @@ export const PurchaseReturnRequest =  [
 ]
 // 上架后退货审批
 export const PurchaseReturnApprove =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -947,7 +947,7 @@ export const PurchaseReturnApprove =  [
 
 // 上架后退货任务 20230412
 export const PurchaseReturnJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -998,7 +998,7 @@ export const PurchaseReturnJob =  [
 ]
 // 上架后退货记录 20230412
 export const PurchaseReturnNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1061,7 +1061,7 @@ export const PurchaseReturnNote =  [
 ]
 // 原料报废记录 20230412
 export const ScrapNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1106,7 +1106,7 @@ export const ScrapNote =  [
 ]
 // 原料直发客户记录 20230412
 export const materialDirectSendNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1173,7 +1173,7 @@ export const materialDirectSendNote =  [
 ]
 // 直接发料记录 20230413
 export const directIssueNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1247,7 +1247,7 @@ export const directIssueNote =  [
 /**/
 // 完工收货缴库申请 20230415
 export const ProductReceiptRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1283,7 +1283,7 @@ export const ProductReceiptRequest =  [
 ]
 // 完工收货缴库记录 20230413
 export const ProductReceiptNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1347,7 +1347,7 @@ export const ProductReceiptNote =  [
 ]
 //  完工收货报废申请 20230412
 export const ProductReceiptScrapRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1377,7 +1377,7 @@ export const ProductReceiptScrapRequest =  [
 ]
 //  完工收货报废记录 20230412
 export const ProductReceiptScrapNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1422,7 +1422,7 @@ export const ProductReceiptScrapNote =  [
 ]
 // 半成品上架记录 20230415
 export const partiallyPreparedProductsNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1492,7 +1492,7 @@ export const partiallyPreparedProductsNote =  [
 ]
 // 成品发货申请 20230414
 export const DeliverRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1516,7 +1516,7 @@ export const DeliverRequest =  [
 ]
 // 成品发货任务 20230414
 export const DeliverJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1569,7 +1569,7 @@ export const DeliverJob =  [
 ]
 // 成品发货记录 20230414
 export const DeliverNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1636,7 +1636,7 @@ export const DeliverNote =  [
 ]
 // FIS发货申请 20230414
 export const FISDeliverRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1666,7 +1666,7 @@ export const FISDeliverRequest =  [
 ]
 // 成品发运任务
 export const FISDeliverJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1693,7 +1693,7 @@ export const FISDeliverJob =  [
 ]
 // FIS发货记录 20230415
 export const FISDeliverNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1765,7 +1765,7 @@ export const FISDeliverNote =  [
 ]
 // 客户退拆申请 20230415
 export const customerDismantle = [
-  { label: "退拆物品代码", prop: "itemCode" },
+  { label: "退拆ERP料号", prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1798,7 +1798,7 @@ export const customerDismantle = [
 ]
 // 客户退拆任务 20230415
 export const customerDismantleJob = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1848,7 +1848,7 @@ export const customerDismantleJob = [
 ]
 // 生产退库申请 20230415
 export const productionReturnRequest =  [
-  { label: "物品代码", prop: "itemCode",fixed:"left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed:"left" },
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1892,7 +1892,7 @@ export const productionReturnRequest =  [
 ]
 // 生产退库任务 20230415
 export const productionReturnJob =  [
-  {  label: "物品代码", prop: "itemCode",fixed:"left" },
+  {  label: _Names.itemCode, prop: "itemCode",fixed:"left" },
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1945,7 +1945,7 @@ export const productionReturnJob =  [
 ]
 // 生产退库记录 20230413
 export const productionReturnNote =  [
-  {  label: "物品代码", prop: "itemCode",fixed:"left" },
+  {  label: _Names.itemCode, prop: "itemCode",fixed:"left" },
   { label: "物品名称", prop: 'itemName' },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2016,7 +2016,7 @@ export const productionReturnNote =  [
 /**/
 // 非生产领料申请 20230417
 export const pickingRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2054,7 +2054,7 @@ export const pickingRequest =  [
 ]
 // 非生产领料审批 20230417
 export const pickingApproval =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2092,7 +2092,7 @@ export const pickingApproval =  [
 ]
 // 非生产领料任务 20240119
 export const pickingJob = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2143,7 +2143,7 @@ export const pickingJob = [
 ]
 // 非生产领料记录 20230417
 export const pickingNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2206,7 +2206,7 @@ export const pickingNote =  [
 ]
 // 非生产退料申请 20230417
  export const materialReturnRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2243,7 +2243,7 @@ export const pickingNote =  [
 ]
 // 非生产退料审批 20230417
 export const materialReturnApproval =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2280,7 +2280,7 @@ export const materialReturnApproval =  [
 ]
 // 非生产领料任务 20240119
 export const materialReturnJob = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2331,7 +2331,7 @@ export const materialReturnJob = [
 ]
 // 非生产退料记录 20230417
 export const materialReturnNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2395,7 +2395,7 @@ export const materialReturnNote =  [
 ]
 // 回收料收货记录 20230415
 export const recycledMaterialsReceipt = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2431,8 +2431,8 @@ export const recycledMaterialsReceipt = [
 ]
 // 回收料调整申请 20230415
 export const recycledMaterialsAdjustmentApply = [ 
-  { label: "来源物品代码", prop: "itemCode" },
+  { label: "来源ERP料号", prop: "itemCode" },
-  { label: "目标物品代码", prop: "toItemCode" },
+  { label: "目标ERP料号", prop: "toItemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "目标物品名称", prop: "toItemName" },
   { label: "物品描述1", prop: "itemDesc1" },
@@ -2485,8 +2485,8 @@ export const recycledMaterialsAdjustmentApply = [
 ]
 // 回收料调整记录 20230415
 export const materialsAdjustment = [
-  { label: "来源物品代码", prop: "itemCode" },
+  { label: "来源ERP料号", prop: "itemCode" },
-  { label: "目标物品代码", prop: "toItemCode" },
+  { label: "目标ERP料号", prop: "toItemCode" },
   { label: "来源物品名称", prop: "itemName" },
   { label: "目标物品名称", prop: "toItemName" },
   { label: "来源物品描述1", prop: "itemDesc1" },
@@ -2540,7 +2540,7 @@ export const materialsAdjustment = [
 ]
 // 线边仓调拨申请 20230417
 export const lineSideWarehouseAllocationRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2584,7 +2584,7 @@ export const lineSideWarehouseAllocationRequest =  [
 ]
 // 线边仓调拨确认 20230417
 export const lineSideWarehouseAllocationConfirm =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2629,7 +2629,7 @@ export const lineSideWarehouseAllocationConfirm =  [
 ]
 // 线边仓调拨记录 20230417
 export const lineSideWarehouseAllocationNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2674,7 +2674,7 @@ export const lineSideWarehouseAllocationNote =  [
 ]
 // 储位调拨记录 20230417
 export const interStorageAllocationNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2719,7 +2719,7 @@ export const interStorageAllocationNote =  [
 ]
 // 客户储位调拨申请 20230410
 export const customerStorageAllocationRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2763,7 +2763,7 @@ export const customerStorageAllocationRequest =  [
 ]
 // 客户储位调拨确认 20230410
 export const customerStorageAllocationConfirm =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2808,7 +2808,7 @@ export const customerStorageAllocationConfirm =  [
 ]
 // 客户储位调拨记录 20230410
 export const customerStorageAllocationNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2853,7 +2853,7 @@ export const customerStorageAllocationNote =  [
 ]
 // 储位内移库记录 20230410
 export const intraStorageTransferNote =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2898,7 +2898,7 @@ export const intraStorageTransferNote =  [
 ]
 // 线边仓缴库申请 20230415
 export const lineSideWarehousePaymentRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2934,7 +2934,7 @@ export const lineSideWarehousePaymentRequest =  [
 ]
 // 线边仓缴库记录 20230415
 export const lineSideWarehousePaymentNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2998,7 +2998,7 @@ export const lineSideWarehousePaymentNote =  [
 ]
 //  线边仓报废申请 20230412
 export const lineSideWarehouseScrappingRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3028,7 +3028,7 @@ export const lineSideWarehouseScrappingRequest =  [
 ]
 //  线边仓报废记录 20230412
 export const lineSideWarehouseScrappingNote =  [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3073,7 +3073,7 @@ export const lineSideWarehouseScrappingNote =  [
 ]
 // 线边仓调整申请 20230417
 export const lineSideWarehouseAdjustmentSheetRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3118,7 +3118,7 @@ export const lineSideWarehouseAdjustmentSheetRequest =  [
 ]
 // 线边仓调整记录 20230417
 export const lineSideWarehouseAdjustmentSheetNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3168,7 +3168,7 @@ export const lineSideWarehouseAdjustmentSheetNote =  [
 // 库存初始化记录
 export const InventoryInitialNote = [
   { label: "单据号", prop: "number" },
-  { label: "物品代码", prop: 'itemCode' },
+  { label: _Names.itemCode, prop: 'itemCode' },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3205,7 +3205,7 @@ export const InventoryInitialNote = [
 ]
 // 盘点计划 20240415
 export const CountPlan =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3258,7 +3258,7 @@ export const CountPlan =  [
 ]
 // 盘点任务 20230415
 export const CountJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3300,7 +3300,7 @@ export const CountJob =  [
 ]
 // 盘点记录 20230415
 export const CountNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3354,7 +3354,7 @@ export const CountNote =  [
 ]
 // 盘点调整申请 20230415
 export const CountPlanAdjust =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3393,7 +3393,7 @@ export const CountPlanAdjust =  [
 ]
 // 盘点调整记录 20230415
  export const CountAdjustNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3437,7 +3437,7 @@ export const CountPlanAdjust =  [
 // 物品安全库存预警 
 export const safetyStockWarning =  [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
   },
@@ -3483,7 +3483,7 @@ export const safetyStockWarning =  [
 //   },
 //   { label: "原箱码", prop: "fromPackingCode" },
 //   { label: "新签箱码", prop: "toPackingCode" },
-//   { label: "物品代码", prop: "itemCode" },
+//   { label: _Names.itemCode, prop: "itemCode" },
 //   { label: "物品名称", prop: "itemName" },
 //   { label: "物品描述1", prop: "itemDesc1" },
 //   { label: "物品描述2", prop: "itemDesc2" },
@@ -3532,7 +3532,7 @@ export const Kitting = [
 
 // 空器具呼叫任务 
 export const callEmptyUtensilJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3577,7 +3577,7 @@ export const completDumpNoteZS =  [
     fixed: "left",
     type: "name", 
   },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3616,7 +3616,7 @@ export const completDumpNotePT =  [
     fixed: "left",
     type: "name", 
   },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3655,7 +3655,7 @@ export const completDumpNoteZP =  [
     fixed: "left",
     type: "name", 
   },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3689,7 +3689,7 @@ export const completDumpNoteZP =  [
 
 // 注塑申请
 export const IssueRequestZS =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3717,7 +3717,7 @@ export const IssueRequestZS =  [
 ]
 // 注塑任务
 export const IssueJobZS =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3810,7 +3810,7 @@ export const IssueJobZS =  [
 ]
 // 注塑记录
 export const IssueNoteZS =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3904,7 +3904,7 @@ export const IssueNoteZS =  [
 
 // 喷涂申请
 export const IssueRequestPT =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3933,7 +3933,7 @@ export const IssueRequestPT =  [
 // 喷涂任务
 export const IssueJobPT =  [
 
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4026,7 +4026,7 @@ export const IssueJobPT =  [
 ]
 // 喷涂记录
 export const IssueNotePT =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4120,7 +4120,7 @@ export const IssueNotePT =  [
 
 // 装配申请
 export const IssueRequestZP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4148,7 +4148,7 @@ export const IssueRequestZP =  [
 ]
 // 装配任务
 export const IssueJobZP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4241,7 +4241,7 @@ export const IssueJobZP =  [
 ]
 // 装配记录
 export const IssueNoteZP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4335,7 +4335,7 @@ export const IssueNoteZP =  [
 
 // 备品申请
 export const IssueRequestBP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4363,7 +4363,7 @@ export const IssueRequestBP =  [
 ]
 // 备品任务
 export const IssueJobBP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4456,7 +4456,7 @@ export const IssueJobBP =  [
 ]
 // 备品记录
 export const IssueNoteBP =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4550,7 +4550,7 @@ export const IssueNoteBP =  [
 
 // 业务库移申请
 export const transferLibRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4587,7 +4587,7 @@ export const transferLibRequest =  [
 ]
 // 业务库移任务
 export const transferLibJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4635,7 +4635,7 @@ export const transferLibJob =  [
 ]
 // 业务库移记录
 export const transferLibNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4689,7 +4689,7 @@ export const transferLibNote =  [
 
 // 三方库申请
 export const ThirdLocationRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left", },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left", },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4706,7 +4706,7 @@ export const ThirdLocationRequest =  [
 ]
 // 三方库任务
 export const ThirdLocationJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left", },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left", },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4760,7 +4760,7 @@ export const ThirdLocationJob =  [
 ]
 // 三方库记录
 export const ThirdLocationNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left", },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left", },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4819,7 +4819,7 @@ export const ThirdLocationNote =  [
 
 // 客户退货记录
 export const customerReturnNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left", },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left", },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4875,7 +4875,7 @@ export const customerReturnNote =  [
 
 // kitting打包记录
 export const KittingPackagingNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4888,7 +4888,7 @@ export const KittingPackagingNote =  [
 
 // kitting请求
 export const KittingIssueRequest =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4917,7 +4917,7 @@ export const KittingIssueRequest =  [
 
 // kitting任务
 export const KittingIssueJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -5011,7 +5011,7 @@ export const KittingIssueJob =  [
 
 // kitting记录
 export const KittingIssueNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -5105,7 +5105,7 @@ export const KittingIssueNote =  [
 
 // 【pad】业务库移
 export const isPadForTransferLibJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },

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

@@ -3,7 +3,7 @@
 // export const primarySearchOptionExample = {
 //   action:"Like",//筛选方式：可不写，默认等于== 
 //   prop:'code',//接口要查的参数
-//   placeholder:'请输入物品代码',//placeholder
+//   placeholder:'请输入',//placeholder
 // }
 
 // 原料管理

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

@@ -1,11 +1,13 @@
 
 // 通用配置
 const orderWidth = 180
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 // 原料管理
 /**/
 // 报检单 20230410
 export const InspectRequest =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -47,7 +49,7 @@ export const InspectRequest =  [
 ]
 // 检验记录  字段需要确定
 export const InspectNote =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },

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

@@ -18,6 +18,9 @@ export const ItemBasic = [
   { label: _Names.itemName, prop: "name" },
   { label: _Names.itemDesc1, prop: "desc1" },
   { label: _Names.itemDesc2, prop: "desc2" },
+  { label: _Names.configuration, prop: "configuration" },
+  { label: _Names.basicUom, prop: "basicUom" },
+  { label: _Names.category, prop: "category" },
   { label: _Public.status, prop: "status", type: "filter", filters: "itemStatus" },
   { label: _Public.type, prop: 'type', type: "filter", filters: "ItemTypeBasic" },
   { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" },
@@ -26,20 +29,17 @@ export const ItemBasic = [
   { label: _Names.canOutsourcing, prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: _Names.isRecycled, prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
   { label: _Names.isPhantom, prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
-  { label: _Names.productLine, prop: 'productLine' },
+  // { label: _Names.productLine, prop: 'productLine' },
-  { label: _Names.elevel, prop: 'elevel' },
+  // { label: _Names.elevel, prop: 'elevel' },
-  { label: _Names.color, prop: "color" },
+  // { label: _Names.color, prop: "color" },
   // ---------------------------------------
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
   { label: _Public.lastModificationTime, prop: "lastModificationTime", type: "dateTime" },
-  { label: _Names.category, prop: "category" },
+  // { label: _Names.group, prop: "group" },
-  { label: _Names.group, prop: "group" },
-  { label: _Names.configuration, prop: "configuration" },
-  { label: _Names.basicUom, prop: "basicUom" },
   { label: _Names.stdPackQty, prop: "stdPackQty",isNumber:true },
-  { label: _Names.project, prop: "project" },
+  // { label: _Names.project, prop: "project" },
-  { label: _Names.version, prop: "version" },
+  // { label: _Names.version, prop: "version" },
-  { label: _Names.eco, prop: "eco" },
+  // { label: _Names.eco, prop: "eco" },
   { label: _Names.validity, prop: "validity" },
   { label: _Names.validityUnit, prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: _Names.manageType, prop: "manageType", type: "filter", filters: "manageType" },
@@ -60,7 +60,12 @@ export const ItemQuality = [
     fixed: "left",
     type: "name"
   },
+  { label: "物品名称", prop: "item_nameFromFE",showProp:true },
+  { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
+  { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
+  { label: "配置", prop: "item_configurationFromFE",showProp:true },
   { label: _Names.supplierCode, prop: 'supplierCode' },
+  { label: "供应商名称", prop: 'supplierName' },
   { label: _Public.status, prop: 'status', type: "filter", filters: "openToClose" },
   { label: _Names.inspectType, prop: 'inspectType', type: "filter", filters: "inspectType" },
   { label: _Public.creationTime, prop: "creationTime", type: "dateTime" },
@@ -129,7 +134,7 @@ export const ItemContainer =  [
     type: "name" 
   },
   { label: "收容代码描述", prop: "containerName" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "item_nameFromFE",showProp:true },
   { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
   { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
@@ -380,7 +385,7 @@ export const SupplierItem = [
     fixed: "left",
     type: "name"
   },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "供应商物品代码", prop: "supplierItemCode" },
   { label: "供应商物品名称", prop: "itemName" },
   { label: "供应商简称", prop: "supplierSimpleName" },
@@ -583,7 +588,7 @@ export const Location = [
 // 库位零件关系 20230331
 export const ItemStoreRelation = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -637,7 +642,7 @@ export const InventoryLocationCapacity = [
 // 物品安全库存信息 20230328
 export const ItemSafetyStock = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -708,7 +713,7 @@ export const TransactionType = [
 ]
 // 库存开账
 export const InventoryBilling = [
-  { label: "物品代码", prop: "itemCode", type: "name" },
+  { label: _Names.itemCode, prop: "itemCode", type: "name" },
   { label: "物品名称", prop: "item_nameFromFE",showProp:true },
   { label: "物品描述1", prop: "item_desc1FromFE",showProp:true },
   { label: "物品描述2", prop: "item_desc2FromFE",showProp:true },
@@ -752,7 +757,7 @@ export const ProductionLine = [
 ]
 // 生产线零件关系 20230328
 export const ProductionLineItem = [
-  { label: "物品代码", prop: "itemCode", type: "name" },
+  { label: _Names.itemCode, prop: "itemCode", type: "name" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -838,7 +843,7 @@ export const Shift = [
 // 作业指导书信息 20230328
 export const ItemGuideBook = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -1017,7 +1022,7 @@ export const documentBasic = [
 // 标准成本价格单
 export const StdCostPriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -1035,7 +1040,7 @@ export const StdCostPriceSheet = [
 // 采购价格单
 export const PurchasePriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -1055,7 +1060,7 @@ export const PurchasePriceSheet = [
 // 销售价格单
 export const SalePriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -1294,7 +1299,7 @@ export const qualifiedInfo = [
     width: orderWidth
   },
   { label: "状态",prop: "purchaseReceiptInspectStatus",  type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1360,7 +1365,7 @@ export const unqualifiedInfo = [
     width: orderWidth
   },
   { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1420,7 +1425,7 @@ export const unqualifiedInfo = [
 ]
 // 采购收货记录-详情【收货缺料明细】 20230404
 export const lackMaterialsInfo = [
-  { label: "物品代码", prop: "itemCode",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1551,7 +1556,7 @@ export const InspectNote = [
 // 不合格库存（不合格转合格） 已调整
 export const unqualifiedToQualified = [
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2343,7 +2348,7 @@ export const FISDeliverRequest =  [
 
 // 成品发运任务
 export const FISDeliverJob =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2693,7 +2698,7 @@ export const labelsList =  [
     type: "name",
     fixed:"left" 
   },
-  { label: "物品代码",  prop: 'itemCode' },
+  { label: _Names.itemCode,  prop: 'itemCode' },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2749,7 +2754,7 @@ export const InventoryInitialNote = [
 // 库存余额 20230407
 export const InventoryBalance = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name",
@@ -2794,7 +2799,7 @@ export const InventoryBalance = [
 // 库存余额(解/冻) 20230407
 export const InventoryBalanceActive = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name",
@@ -2842,7 +2847,7 @@ export const InventoryTransaction = [
     type: "name",
     width: orderWidth
   },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2898,7 +2903,7 @@ export const InventoryTransferLog =  [
   },
   { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
   { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2949,7 +2954,7 @@ export const expectOut = [
   { label: "状态", prop: "status",type: "tagFilter", filters: "jobStatus" },
   { label: "创建时间", prop: "creationTime", type: "dateTime" },
   { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2984,7 +2989,7 @@ export const expectIn = [
     width: orderWidth
   },
   { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -3015,7 +3020,7 @@ export const expectIn = [
 // 物品安全库存预警 
 export const safetyStockWarning =  [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -3035,7 +3040,7 @@ export const safetyStockWarning =  [
 // 拆箱记录
 export const splitPackingList =  [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -3656,7 +3661,7 @@ export const CountPlan = [
   { label: "类型", prop: "type",type: "filter", filters: "checkType" },
   { label: "生效时间", prop: 'activeDate', type: "dateTime" },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  // { label: "物品代码JSON", prop: 'jsonItemCodes' },
+  // { label: "ERP料号JSON", prop: 'jsonItemCodes' },
   // ************** 确认隐藏 ************************
   // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
   // { label: "创建者ID", prop: "creatorId" },
@@ -3737,7 +3742,7 @@ export const CountJob =  [
   { label: "完成时间", prop: "completeTime",type: "dateTime" },
   { label: "完成用户", prop: "completeUserName" },
   { label: "操作员", prop: 'worker' },
-  { label: "物品代码", prop: 'itemCode' },
+  { label: _Names.itemCode, prop: 'itemCode' },
   { label: "库位代码", prop: "locationCode" },
   { label: "上游任务编号", prop: "upStreamJobNumber", width:orderWidth},
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },
@@ -3763,7 +3768,7 @@ export const CountJob =  [
 
 // 盘点任务-扫描明细
 export const countJobDepDetails =  [
-  { label: "物品代码", prop: "itemCode", type: "name",fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", type: "name",fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -4684,7 +4689,7 @@ export const KittingPackagingNote =  [
 
 // kitting打包记录 - 扫描明细
 export const KittingPackagingDepDetails =  [
-  { label: "物品代码", prop: "itemCode", fixed: "left" },
+  { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },

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

@@ -1,49 +1,52 @@
 import zh from '@/lang/zh'
 let _Public = zh.ColumsPublic // 字段通用
-let _Names = zh.ColumsNames // 接口监控看板
+let _Names = zh.ColumsNames // 业务字段
 
 // 基础信息数据管理
 /**/
 // 物品基础信息 20230328
 export const ItemBasic =  [
-  { label: "物品代码", prop: 'code' },
+  { label: _Names.itemCode, prop: 'code' },
   { label: "物品名称", prop: "name" },
   { label: "物品描述1", prop: "desc1" },
   { label: "物品描述2", prop: "desc2" },
-  { label: "状态", prop: "status", type: "filter", filters: "itemStatus" },
+  { label: "配置", prop: 'configuration' },
   { label: "计量单位", prop: 'basicUom' },
-  { label: "ABC类", prop: 'abcClass',type: "filter",  filters: "abcClass" },
+  { label: "种类", prop: 'category' },
+  { label: "状态", prop: "status", type: "filter", filters: "itemStatus" },
+  { label: "类型", prop: 'type', type: "filter", filters: "ItemTypeBasic" },
   { label: "制造件", prop: "canMake", type: "filter",  filters: "whetherOrNot" },
   { label: "采购件", prop: "canBuy", type: "filter", filters: "whetherOrNot" },
   { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" },
   { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" },
+  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
+  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  { label: "标包数", prop: "stdPackQty" },
   { label: "有效期", prop: "validity" },
   { label: "有效期单位", prop: "validityUnit", type: "filter", filters: "validityUnit" },
   { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" },
-  { label: "类型", prop: 'type', type: "filter", filters: "ItemTypeBasic" },
-  { label: "种类", prop: 'category' },
-  { label: "分组", prop: 'group' },
-  { label: "颜色", prop: 'color' },
-  { label: "配置", prop: 'configuration' },
-  { label: "项目", prop: 'project' },
-  { label: "版本", prop: 'version' },
-  { label: "工程变革", prop: 'eco' },
-  { label: "Elevel", prop: 'elevel' },
-  { label: "是否虚拟物件", prop: "isPhantom", type: "filter", filters: "whetherOrNot" },
   { label: "备注", prop: 'remark' },
-  { label: "标包数", prop: "stdPackQty" },
+  // { label: "分组", prop: 'group' },
-  { label: "事务ID", prop: "tenantId" },
+  // { label: "颜色", prop: 'color' },
-  { label: "创建时间", prop: "creationTime", type:'dateTime' },
+  // { label: "项目", prop: 'project' },
-  { label: "创建者ID", prop: "creatorId" },
+  // { label: "版本", prop: 'version' },
-  { label: "上次修改时间", prop: "lastModificationTime",  type:'dateTime' },
+  // { label: "工程变革", prop: 'eco' },
-  { label: "上次修改者ID", prop: "lastModifierId" },
+  // { label: "Elevel", prop: 'elevel' },
+  // { label: "事务ID", prop: "tenantId" },
+  // { label: "创建者ID", prop: "creatorId" },
+  // { label: "上次修改者ID", prop: "lastModifierId" },
   // ************** 确认隐藏 ************************
   // { label: "ID", prop: 'id' },
   // ************** 确认隐藏 ************************
 ]
 // 物品质量信息 20230328
 export const ItemQuality =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
+  { label: "物品名称", prop: "item_nameFromFE" },
+  { label: "物品描述1", prop: "item_desc1FromFE" },
+  { label: "物品描述2", prop: "item_desc2FromFE" },
+  { label: "配置", prop: "item_configurationFromFE" },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "状态", prop: "status", type: "filter", filters: "openToClose" },
   { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" },
@@ -60,7 +63,7 @@ export const ItemQuality =  [
 ]
 // 物品分类信息 20230328
 export const ItemCategory =  [
-  { label: "物品代码", prop: 'itemCode' },
+  { label: _Names.itemCode, prop: 'itemCode' },
   { label: "分类代码", prop: "categoryCode" },
   { label: "分类值", prop: "value" },
   { label: "备注", prop: 'remark' },
@@ -77,7 +80,7 @@ export const ItemCategory =  [
 export const ItemPack =  [
   { label: "包装代码", prop: 'packCode' },
   { label: "包装名称", prop: "packName" },
-  { label: '物品代码', prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: '包装计量单位', prop: "basicUom" },
   { label: '包装数量', prop: "qty" },
   { label: "事务ID", prop: "tenantId" },
@@ -96,7 +99,7 @@ export const ItemPack =  [
 export const ItemContainer =  [
   { label: "收容代码", prop: 'containerCode' },
   { label: "收容代码描述", prop: "containerName" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "item_nameFromFE" },
   { label: "物品描述1", prop: "item_desc1FromFE" },
   { label: "物品描述2", prop: "item_desc2FromFE" },
@@ -108,7 +111,7 @@ export const ItemContainer =  [
 ]
 // 物品质检标准信息 20230328
 export const AQL =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "供应商代码", prop: "supplierCode" },
   { label: "数量上限", prop: 'ceilingQty' },
   { label: "数量下限", prop: "floorQty" },
@@ -178,7 +181,7 @@ export const Customer =  [
 // 客户物品信息 20230328
 export const CustomerItem =  [
   { label: "客户代码", prop: 'customerCode' },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "客户物品代码", prop: "customerItemCode" },
   { label: "版本", prop: "version" },
   { label: "开始时间", prop: "beginTime", type: "dateTime" },
@@ -264,7 +267,7 @@ export const Supplier =  [
 ]
 // 供应商物品信息 20230328
 export const SupplierItem =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "供应商代码", prop: 'supplierCode' },
   { label: "供应商物品代码", prop: "supplierItemCode" },
@@ -432,7 +435,7 @@ export const Location =  [
 ]
 // 库位零件关系 20230331
 export const ItemStoreRelation =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "是否可用", prop: "enabled", type: "filter", filters: "whetherOrNot" },
   { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" },
@@ -474,7 +477,7 @@ export const InventoryLocationCapacity =  [
 ]
 // 物品安全库存信息 20230328
 export const ItemSafetyStock = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "仓库代码", prop: "warehouseCode" },
   { label: "存储关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" },
   { label: "存储关系代码", prop: "storeValue" },
@@ -527,7 +530,7 @@ export const TransactionType = [
 ]
 // 库存开账
 export const InventoryBilling = [
-  { label: "物品代码", prop: "itemCode", type: "name" },
+  { label: _Names.itemCode, prop: "itemCode", type: "name" },
   { label: "物品名称", prop: "item_nameFromFE" },
   { label: "物品描述1", prop: "item_desc1FromFE" },
   { label: "物品描述2", prop: "item_desc2FromFE" },
@@ -564,7 +567,7 @@ export const ProductionLine = [
 ]
 // 生产线零件关系 20230328
 export const ProductionLineItem =  [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -631,7 +634,7 @@ export const Shift =  [
 ]
 // 作业指导书信息 20230328
 export const ItemGuideBook = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -767,7 +770,7 @@ export const documentBasic = [
 // 标准成本价格单
 export const StdCostPriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -785,7 +788,7 @@ export const StdCostPriceSheet = [
 // 采购价格单
 export const PurchasePriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -805,7 +808,7 @@ export const PurchasePriceSheet = [
 // 销售价格单
 export const SalePriceSheet = [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     fixed: "left",
     type: "name",
     prop: "itemCode",
@@ -1884,7 +1887,7 @@ export const productionReturnNote =  [
 // 标签查询 20230410
 export const labelsList =  [
   { label: "箱码", prop: "code" },
-  { label: "物品代码",  prop: 'itemCode' },
+  { label: _Names.itemCode,  prop: 'itemCode' },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -1945,7 +1948,7 @@ export const InventoryInitialNote = [
 ]
 // 库存余额 20230407
  export const InventoryBalance = [
-  { label: "物品代码", prop: 'itemCode' },
+  { label: _Names.itemCode, prop: 'itemCode' },
   { label: "物品名称", prop: "itemName" },
   { label: "库存数量", prop: "qty" },
   { label: "计量单位", prop: "uom" },
@@ -1987,7 +1990,7 @@ export const InventoryInitialNote = [
 ]
 // 库存余额(解/冻)
 export const InventoryBalanceActive = [
-  { label: "物品代码", prop: 'itemCode' },
+  { label: _Names.itemCode, prop: 'itemCode' },
   { label: "物品名称", prop: "itemName" },
   { label: "库存数量", prop: "qty" },
   { label: "计量单位", prop: "uom" },
@@ -2029,7 +2032,7 @@ export const InventoryBalanceActive = [
 // 库存事务 20230410
 export const InventoryTransaction = [
   { label: "事务编号", prop: "transNumber" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2061,7 +2064,7 @@ export const InventoryTransaction = [
   { label: "库区", prop: "locationArea" },
   { label: "库位组", prop: "locationGroup" },
   { label: "事务ID", prop: "tenantId" },
-  { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
+  { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransReplaceType" },
   { label: "仓库代码", prop: 'warehouseCode' },
   // ************** 确认隐藏 ************************
   // { label: "ID", prop: 'id' },
@@ -2072,7 +2075,7 @@ export const InventorySnapshot = [
   { label: "快照时间", prop: "snapshotTime",type: "dateTime" },
   { label: "备注", prop: 'remark' },
   { label: "序号", prop: "serialNumber" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2107,7 +2110,7 @@ export const InventoryTransferLog = [
   { label: "生效日期", prop: "activeDate",type: "dateTime" },
   { label: "从状态", prop: "fromStatus", type: "filter", filters: "requestStatus" },
   { label: "到状态", prop: "toStatus", type: "filter", filters: "requestStatus" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2119,7 +2122,7 @@ export const InventoryTransferLog = [
   { label: "箱码", prop: "toPackingCode" },
   { label: "事务时间", prop: "transferTime",type: "dateTime" },
   { label: "事务类型", prop: "transType", type: "filter", filters: "TransType" },
-  { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransSubType" },
+  { label: "事务替代类型", prop: "transSubType", type: "filter", filters: "TransReplaceType" },
   { label: "到事务编号", prop: "toTransNumber" },
   { label: "操作员", prop: "worker" },
   { label: "备注", prop: 'remark' },
@@ -2152,7 +2155,7 @@ export const InventoryTransferLog = [
 ]
 // 预计入库存 20230411
 export const expectIn = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2184,7 +2187,7 @@ export const expectIn = [
 ]
 // 预计入库存 20230411
 export const expectOut = [
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "物品名称", prop: "itemName" },
   { label: "物品描述1", prop: "itemDesc1" },
   { label: "物品描述2", prop: "itemDesc2" },
@@ -2218,7 +2221,7 @@ export const expectOut = [
 // 物品安全库存预警 
 export const safetyStockWarning =  [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -2238,7 +2241,7 @@ export const safetyStockWarning =  [
 // 拆箱记录
 export const splitPackingList =  [
   {
-    label: "物品代码",
+    label: _Names.itemCode,
     prop: "itemCode",
     fixed: "left",
     type: "name"
@@ -2854,7 +2857,7 @@ export const CountPlan = [
   { label: "自动完成任务", prop: 'autoCompleteJob', type: "filter", filters: "whetherOrNot" },
   { label: "直接生成记录", prop: 'directCreateNote', type: "filter", filters: "whetherOrNot" },
   { label: "事务ID", prop: "tenantId" },
-  // { label: "物品代码JSON", prop: 'jsonItemCodes' },
+  // { label: "ERP料号JSON", prop: 'jsonItemCodes' },
   // ************** 确认隐藏 ************************
   // { label: "阶段", prop: "stage", type: "filter", filters: "checkStage" },
   // { label: "ID", prop: 'id' },
@@ -2875,7 +2878,7 @@ export const CountJob = [
   { label: "完成用户", prop: "completeUserName" },
   { label: "操作员", prop: 'worker' },
   { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
-  { label: "物品代码", prop: "itemCode" },
+  { label: _Names.itemCode, prop: "itemCode" },
   { label: "库位代码", prop: "locationCode" },
   { label: "上游任务编号", prop: "upStreamJobNumber" },
   { label: "任务类型", prop: "jobType", type: "filter", filters: "taskType" },

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage copy 3.vue

@@ -90,7 +90,7 @@
             </div>
             <div v-else>
               <div v-if="item.prop == 'itemCode'">
-                <div>物料代码:<br/>【{{ scope.row.level1[item.prop] }}】</div>
+                <div>ERP料号:<br/>【{{ scope.row.level1[item.prop] }}】</div>
                 <br/>
                 <div>物料名称:<br/>【{{ scope.row.level1.itemName }}】</div>
                 <br/>

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue

@@ -116,7 +116,7 @@ export default {
       },
       // table标头
       tableTh:[
-        {label:'物料代码',prop:'itemCode',width:170},
+        {label:'ERP料号',prop:'itemCode',width:170},
         {label:'物料名称',prop:'itemName'},
         {label:'物料描述',prop:'itemDesc1'},
         {label:'物料配置',prop:'configuration'},

fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage_old.vue

@@ -89,7 +89,7 @@
             </div>
             <div v-else>
               <div v-if="item.prop == 'itemCode'">
-                <div>物料代码:<br/>【{{ scope.row.level1[item.prop] }}】</div>
+                <div>ERP料号:<br/>【{{ scope.row.level1[item.prop] }}】</div>
                 <br/>
                 <div>物料名称:<br/>【{{ scope.row.level1.itemName }}】</div>
                 <br/>

fe/PC/src/views/basicData/CustomerManage/CustomerItem.vue

@@ -94,6 +94,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "CustomerItem",
@@ -155,7 +157,7 @@ export default {
         reportGroupId: [],
       },
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         
@@ -173,7 +175,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户代码", prop: "customerCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "客户物品代码", prop: "customerItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "客户包装数量", prop: "customerPackQty", colSpan: 12, validType:'number' },

fe/PC/src/views/basicData/ItemsManage/AQL.vue

@@ -95,6 +95,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "AQL",
   mixins: [
@@ -185,7 +188,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
@@ -200,7 +203,7 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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.editFormData) }, colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 

fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue

@@ -84,8 +84,8 @@
       :title="tableColumns"
       :DrawerLoading="Loading.DrawerLoading"
       :drawer="displayDialog.detailsDialog"
-      :dropdownData="dropdownData"
       :propsData="propsData"
+      :Butttondata="[]"
       :tabsDesTions="tabsDesTions"
       :tableLoading="tableLoading"
       :dropdownTabsData="dropdownTabsData"
@@ -105,6 +105,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemBasic",
   mixins: [
@@ -202,7 +205,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },
@@ -219,23 +222,23 @@ export default {
         { type: "input", label: "有效期", prop: "validity", validType:'number', colSpan: 12 },
         { type: "select", label: "有效期单位", prop: "validityUnit", options: "validityUnit", colSpan: 12 },
         { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 },
-        { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
+        // { type: "filterSelect", label: "项目", prop: "project", optionsLabel: "name", optionsValue: "code", 
-          focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
+          // focus: (type,val) => { return this.getFilterList(type, val, "basedata/project")},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/project', 'Project', '项目选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
+        // { type: "input", label: "Elevel", prop: 'elevel', colSpan: 12 },
-        { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
+        // { type: "input", label: "颜色", prop: 'color', colSpan: 12 },
         { label: "类型", prop: 'type', type: "select", options: "ItemTypeBasic", colSpan: 12 },
         { type: "input", label: "种类", prop: 'category', colSpan: 12 },
-        { type: "input", label: "分组", prop: 'group', colSpan: 12 },
+        // { type: "input", label: "分组", prop: 'group', colSpan: 12 },
         { type: "input", label: "配置", prop: 'configuration', colSpan: 12 },
-        { type: "input", label: "版本", prop: 'version', colSpan: 12 },
+        // { type: "input", label: "版本", prop: 'version', colSpan: 12 },
-        { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
+        // { type: "input", label: "工程变革", prop: 'eco', colSpan: 12 },
         { type: "select", label: "是否虚拟物件", prop: "isPhantom", options: "whetherOrNot", colSpan: 12 },
         { type: "input", label: "标包数", prop: 'stdPackQty', validType:'number', colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "物品名称", prop: "name", colSpan: 12 },
         { type: "input", label: "物品描述1", prop: "desc1", colSpan: 12 },
         { type: "input", label: "物品描述2", prop: "desc2", colSpan: 12 },

fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue

@@ -94,6 +94,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemCategory",
   mixins: [
@@ -141,7 +144,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "分类代码", prop: "categoryCode", optionsLabel: "name", optionsValue: "code", 
@@ -151,7 +154,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode",disabled:"true", colSpan: 12 },
         { type: "input", label: "分类代码", prop: "categoryCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "分类值", prop: "value", colSpan: 12 },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue

@@ -95,6 +95,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemContainer",
   mixins: [
@@ -152,7 +155,7 @@ export default {
       CreateForm: [
         { type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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},
@@ -165,7 +168,7 @@ export default {
       editForm: [
         { disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, 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},

fe/PC/src/views/basicData/ItemsManage/ItemPack.vue

@@ -94,6 +94,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemPack",
   mixins: [
@@ -157,7 +160,7 @@ export default {
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "inputNumber", label: "包装数量", prop: "qty", colSpan: 12, min:1 },
@@ -168,7 +171,7 @@ export default {
         { type: "input", label: "包装代码", prop: 'packCode', colSpan: 12, validType:'numberLetter' },
         { type: "input", label: "包装名称", prop: "packName", colSpan: 12 },
         { type: "select", label: "包装类型", prop: "packType", options: "qtyUomType", clearable: true, filterable: true, allowCreate: true, colSpan: 12 },
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:true, colSpan: 12 },
         { type: "inputNumber", label: "包装数量", prop: "qty", colSpan: 12, min:1 },
         { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'letter' },
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },

fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue

@@ -96,6 +96,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemQuality",
   mixins: [
@@ -116,6 +119,7 @@ export default {
   },
   data () {
     return {
+      showTableBaseFromFE:['configuration','name','desc1','desc2'],
       URL: 'basedata/item-quality',
       //常用按钮数据
       currenButtonData: [
@@ -149,7 +153,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "物品名称", prop: "name", optionsLabel: "code", optionsValue: "name", 
@@ -165,7 +169,7 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 12 },
       ],
       editForm: [
-        { type: "input",label: "物品代码", prop: "itemCode",disabled:"true", colSpan: 12 },
+        { type: "input",label: _Names.itemCode, prop: "itemCode",disabled:"true", colSpan: 12 },
         { type: "input", label: "物品名称", prop: "name", colSpan: 12,disabled:"true", },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},

fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue

@@ -97,6 +97,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "Kitting",
   mixins: [
@@ -145,7 +148,7 @@ export default {
       },
       AddDetailsTableColumns: [
         { type:"input", label: "包装数量", prop: 'stdPack',width:"auto" },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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) }, 
           width: "auto",searchButton:false
@@ -207,7 +210,7 @@ export default {
           }
         })
         if(_isEmpty > 0){
-          this.$errorMsg('【包装数量】与【物料代码】不能为空！')
+          this.$errorMsg('【包装数量】与【ERP料号】不能为空！')
           reject()
         }
         let arraySort = array.sort()

fe/PC/src/views/basicData/ItemsManage/PositionCode.vue

@@ -98,6 +98,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PositionCode",
   mixins: [
@@ -162,7 +165,7 @@ export default {
         { type: "select", label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' },
         { type: "prefixInput", label: "位置码",validType:'numberLetter', prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
         { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 },
-        { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: _Names.itemCode, prop: "partCode", 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 
@@ -182,7 +185,7 @@ export default {
         { type: "select",disabled:true, label: "类型", prop: "type", colSpan: 12 ,options:'positionCodeType' },
         { disabled:true,type: "prefixInput", label: "位置码", prop: "codeSuffix",prefixProp:"codeType",prefixWidth:'50px',prefixDisabled:true, colSpan: 12 },
         { type: "inputNumber", label: "箱数/数量", prop: "stdPackQty", colSpan: 12, min:1 },
-        { type: "filterSelect", label: "物品代码", prop: "partCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: _Names.itemCode, prop: "partCode", 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 

fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue

@@ -94,6 +94,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "SupplierItem",
   mixins: [
@@ -158,7 +161,7 @@ export default {
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Supplier")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
@@ -171,7 +174,7 @@ export default {
       ],
       editForm: [
         { type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 },
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "input", label: "供应商物品代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 },
         { type: "input", label: "供应商物品名称", prop: "itemName", colSpan: 12 },
         { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 },

fe/PC/src/views/basicData/WarehouseManage/ItemSafetyStock.vue

@@ -94,6 +94,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "ItemSafetyStock",
@@ -185,7 +187,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@@ -203,7 +205,7 @@ export default {
         
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "filterSelect", label: "存储关系代码", prop: "storeValue", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, this.ediStoreValue.url)},

fe/PC/src/views/basicData/WarehouseManage/ItemStoreRelation.vue

@@ -94,6 +94,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "ItemStoreRelation",
   mixins: [
@@ -185,7 +188,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
@@ -204,7 +207,7 @@ export default {
         { type: "input", label: "占用多库位", prop: 'multiLoc',  disabled:"true", colSpan: 12 },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled:"true", colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled:"true", colSpan: 12 },
         { type: "select", label: "存储关系类型", prop: "storeRelationType", options: "storeRelationType", colSpan: 12 },
         { type: "select", label: "是否可用", prop: "enabled", options: "whetherOrNot", colSpan: 12 },
         { type: "select", label: "是否定制位置", prop: "isFixed", options: "whetherOrNot", colSpan: 12 },

fe/PC/src/views/basicData/WorkshopManage/ProdLineItem-old.vue

@@ -94,6 +94,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "ProductionLineItem",
@@ -148,7 +150,7 @@ export default {
         type: []
       },
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
@@ -157,7 +159,7 @@ export default {
         { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       ],
       editForm: [
-        { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 

fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue

@@ -97,6 +97,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "ProductionLineItem",
@@ -165,7 +167,7 @@ export default {
         { type: "filterSelect", label: "生产线代码", prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.CreateFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
@@ -193,7 +195,7 @@ export default {
         { type: "filterSelect", label: "生产线代码",disabled:true, prop: "prodLineCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/productionLine")},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/productionLine', 'ProductionLine', '生产线选择', this.editFormData) }, colSpan: 12 },
-        { type: "filterSelect", label: "物品代码",disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },

fe/PC/src/views/basicData/itemGuideBookManage/itemGuideBook.vue

@@ -87,6 +87,8 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "ItemGuideBook",
@@ -158,7 +160,7 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
@@ -167,7 +169,7 @@ export default {
         { type: "input", label: "备注", prop: "remark", colSpan: 24 },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: 'itemCode', disabled: true, colSpan: 12 },
+        { type: "input", label: _Names.itemCode, prop: 'itemCode', disabled: true, colSpan: 12 },
         { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12 },
         { type: "uploadPictureCard", label: "图片", prop: "formFile", limit: 1, picExt: ".png,.jpg", colSpan: 12 },
         { type: "textarea", label: "步骤", prop: "step", rows: 5, maxlength: 1000, colSpan: 24 },

fe/PC/src/views/basicData/priceManage/PurchasePriceSheet.vue

@@ -97,6 +97,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PurchasePriceSheet",
   mixins: [
@@ -139,10 +142,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/priceManage/SalePriceSheet.vue

@@ -97,6 +97,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "SalePriceSheet",
   mixins: [
@@ -139,10 +142,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/basicData/priceManage/StdCostPriceSheet.vue

@@ -97,6 +97,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "StdCostPriceSheet",
   mixins: [
@@ -139,10 +142,10 @@ export default {
       },
       editOptions: {},
       CreateForm: [
-        { type: "input", label: "物品代码", prop: 'code', colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', colSpan: 12, validType:'numberLetter' },
       ],
       editForm: [
-        { type: "input", label: "物品代码", prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
+        { type: "input", label: _Names.itemCode, prop: 'code', disabled: true, colSpan: 12, validType:'numberLetter' },
       ],
       editRules: {
         cerateRule: {

fe/PC/src/views/finishedProductManage/deliver/DeliverJob-msQuery.vue

@@ -74,6 +74,8 @@ import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import detailsRules from '@/utils/rules';
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: "DeliverJob",
@@ -142,7 +144,7 @@ export default {
           label: "实际箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "handledQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "handledQty", showProp: "uom", },
         { type: "object", label: "推荐数量", prop: "recomendQty", showProp: "qty", },

fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index.vue

@@ -51,7 +51,7 @@
       >
         <template>
           <el-form-item class="formTable-box" prop="details" v-if="active == 1">
-            <!-- <b style="font-size:20px;padding-bottom:10px">父级物料代码：{{ propsData.details[0].itemCode }}</b> -->
+            <!-- <b style="font-size:20px;padding-bottom:10px">父级ERP料号：{{ propsData.details[0].itemCode }}</b> -->
             <el-tree
               :check-strictly="true"
               ref="bomTree_Ref"

fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index_1.vue

@@ -51,7 +51,7 @@
       >
         <template>
           <el-form-item class="formTable-box " prop="details" v-if="active == 1">
-            <b style="font-size:20px;padding-bottom:10px">父级物料代码：{{ propsData.details[0].itemCode }}</b>
+            <b style="font-size:20px;padding-bottom:10px">父级ERP料号：{{ propsData.details[0].itemCode }}</b>
             <el-table
               height="85%"
               ref="bomTree_Ref"

fe/PC/src/views/finishedProductManage/dismantle/StepsFormTree/index_tabletree.vue

@@ -51,7 +51,7 @@
       >
         <template>
           <el-form-item class="formTable-box " prop="details" v-if="active == 1">
-            <b style="font-size:20px;padding-bottom:10px">父级物料代码：{{ propsData.details[0].itemCode }}</b>
+            <b style="font-size:20px;padding-bottom:10px">父级ERP料号：{{ propsData.details[0].itemCode }}</b>
             <el-table
               height="85%"
               ref="bomTree_Ref"

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-1.vue

@@ -81,6 +81,9 @@ import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import store  from '@/store'
 import StepsFormTree from './StepsFormTree'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "customerDismantleJob",
   mixins: [
@@ -164,7 +167,7 @@ export default {
         },
       },
       AddDetailsTableColumns: [
-        { label: "子物料代码", prop: "itemCode",width:"auto",align:'left' },
+        { label: "子"+_Names.itemCode, prop: "itemCode",width:"auto",align:'left' },
         { label: "数量", prop: 'qty',width:"auto" },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},
@@ -332,7 +335,7 @@ export default {
     },
     // 提交前检查所选数据，同级选择等情况处理
     checkSelectData(){
-    // todo:提交时候去掉父级物料代码的信息
+    // todo:提交时候去掉父级itemcode的信息
       // todo:检查所选数据，同级选择等情况处理
       let _isSelectData = this.$refs.StepsFormTree_Ref.selectData
       let _select_ids = []

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-old.vue

@@ -78,6 +78,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import store  from '@/store'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "customerDismantleJob",
   mixins: [
@@ -160,7 +163,7 @@ export default {
         },
       },
       AddDetailsTableColumns: [
-        { label: "子物料代码", prop: "partCode",width:"auto" },
+        { label: "子"+_Names.itemCode, prop: "partCode",width:"auto" },
         { label: "数量", prop: 'qty',width:"auto" },
         { type: "filterSelect", label: "目标库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob-tabletree.vue

@@ -81,6 +81,9 @@ import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import store  from '@/store'
 import StepsFormTree from './StepsFormTree'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "customerDismantleJob",
   mixins: [
@@ -164,7 +167,7 @@ export default {
         },
       },
       AddDetailsTableColumns: [
-        { label: "子物料代码", prop: "itemCode",width:"auto",align:'left' },
+        { label: "子"+_Names.itemCode, prop: "itemCode",width:"auto",align:'left' },
         { label: "数量", prop: 'qty',width:"auto" },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},

fe/PC/src/views/finishedProductManage/dismantle/customerDismantleJob.vue

@@ -81,6 +81,9 @@ import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import store  from '@/store'
 import StepsFormTree from './StepsFormTree'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "customerDismantleJob",
   mixins: [
@@ -164,7 +167,7 @@ export default {
         },
       },
       AddDetailsTableColumns: [
-        { label: "子物料代码", prop: "itemCode",width:"auto",align:'left' },
+        { label: "子"+_Names.itemCode, prop: "itemCode",width:"auto",align:'left' },
         { label: "数量", prop: 'qty',width:"auto" },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "5"))},

fe/PC/src/views/finishedProductManage/productionReturn/returnJob.vue

@@ -121,7 +121,6 @@ export default {
       //     label: "箱标签",
       //     prop: "handledPackingCode",
       //   },
-      //   { label: "物品代码", prop: "itemCode", },
       //   { label: "物品名称",  prop: "itemName" },
       //   // { type: "objectInput", rules: detailsRules.detailsRules, label: "供应商批次", prop: "supplierBatch",},
       //   // { type: "objectDateTimeInput", rules: detailsRules.detailsRules, label: "生产日期", prop: "produceDate",},

fe/PC/src/views/inventoryManage/Count/CountJob-msQuery.vue

@@ -76,6 +76,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import { countJobResetByNumber } from "@/api/wms-job"
 import detailsRules from '@/utils/rules';
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "CountJob",
   mixins: [
@@ -166,7 +169,7 @@ export default {
       ],
       handleDetailsTableColumns: [
         { label: "箱标签", prop: "packingCode", },
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { type: "objectInput", valueType: Number, label: "实际数量", rules: detailsRules.numberInput, prop: "countQty", showProp: "qty", },
         { type: "objectInput", label: "实际单位", prop: "countQty", showProp: "uom", },
         { type: "object", label: "库存数量", prop: "inventoryQty", showProp: "qty", },
@@ -174,7 +177,7 @@ export default {
         { type: "input", rules: detailsRules.detailsRules, label: "库位代码", prop: "locationCode", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装数量", prop: "stdPackQty", },
         { type: "input", rules: detailsRules.detailsRules, label: "包装单位", prop: "stdPackUom", },
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称",  prop: "itemName" },
         { label: "供应商批次", prop: "supplierBatch", },
         { label: "备注", prop: 'remark', },

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalance.vue

@@ -149,12 +149,10 @@ export default {
       //   { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
       //   { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
       //   { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
-      //   { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
       //   { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
       //   { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       // ],
       // editForm: [
-      //   { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
       //   { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
       //   { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
       //   { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryBalanceActive.vue

@@ -157,12 +157,10 @@ export default {
       //   { type: "input", label: "序号", prop: 'serialNumber', colSpan: 12 },
       //   { type: "input", label: "最后盘点计划", prop: 'lastCountPlanNumber', colSpan: 12 },
       //   { type: "input", label: "最后盘点标签", prop: 'lastCountLabel', colSpan: 12 },
-      //   { type: "input", label: "物品代码", prop: 'itemCode', colSpan: 12 },
       //   { type: "input", label: "批次编号", prop: 'batchCode', colSpan: 12 },
       //   { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
       // ],
       // editForm: [
-      //   { type: "input", label: "物品代码", prop: "itemCode", disabled:true, colSpan: 12 },
       //   { type: "input", label: "物品名称", prop: "itemName", disabled:true, colSpan: 12 },
       //   { type: "input", label: "库位代码", prop: "locationCode", disabled:true, colSpan: 12 },
       //   { type: "input", label: "批次", prop: "lot", disabled:true, colSpan: 12 },

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransaction-Query.vue

@@ -184,7 +184,7 @@ export default {
             item.interfaceType = '【TYRP】-【盘点调整单】'
           } else if (item.transType == 37 && item.transSubType == 3701) {
             item.interfaceType = '【TYRP】-【线边仓调整单】'
-          } else if (item.transType == 38 && item.transSubType == 3302) {
+          } else if (item.transType == 38 && (item.transSubType == 3301 || item.transSubType == 3302)) {
             item.interfaceType = '【TYRP】-【回收料调整单】'
           } else if (item.transType == 36) {
             item.interfaceType = '【TYRP】-【报废单、线边仓报废单】'

fe/PC/src/views/inventoryManage/InventoryQuery/InventoryTransferLog-Query.vue

@@ -89,6 +89,9 @@ import { mixins } from "@/mixins/mixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import store  from '@/store'
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "InventoryTransferLog",
   mixins: [
@@ -168,7 +171,7 @@ export default {
         { type: "radio", label: "转移方式", prop: "queryType",radio:'queryTypeRadio', value: '1', colSpan: 9 },
         { type: "radio", label: "清除箱码", prop: "clearPackCode",radio:'radio', value: '2', colSpan: 5 },
         { type: "radio", label: "清除批次", prop: "clearLot",radio:'radio', value: '2', colSpan: 5 },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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 },
         { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "itemCode", optionsValue: "packingCode", 
@@ -185,7 +188,7 @@ export default {
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.CreateFormData) }, colSpan: 12 },
       ],
       myTableColumns:[
-        {label: "物品代码", prop: "itemCode", width:'180px'},
+        {label: _Names.itemCode, prop: "itemCode", width:'180px'},
         {label: "物品名称", prop: "itemName", width:'150px'},
         {label: "来源库位", prop: "locationCode",},
         {label: "箱码", prop: "packingCode", width:'110px'},

fe/PC/src/views/inventoryManage/recycledMaterials/materialsAdjustmentFunc.vue

@@ -117,6 +117,9 @@ import { postInventoryLabelCode_count } from "@/api/wms-core"
 import { getNowToT,formatTimeStampToNorm } from '@/utils/formatTime'
 import {initPrintPackingCodeData } from "@/mixins/printMixin"
 import store  from '@/store'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "materialsAdjustmentFunc",
   mixins: [
@@ -153,7 +156,7 @@ export default {
       }],
       //粉碎料表头信息
       addPopColumns_FS:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",
           this.isFilter("isRecycled","true"),1000
           )},
@@ -162,22 +165,16 @@ export default {
         },
         { 
           type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].length <= 0){this.$message.error('请选择物品代码'); return false}else{return true}},
+          beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
           focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_FS[tableScope.$index].itemCode),1000)},
           width:"auto",
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
-          beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
+          beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
           focus: (type,val,tableScope) => { return this.getFilterList(type, {itemCode:this.addPopData_FS[tableScope.$index].itemCode,supplierCode:this.addPopData_FS[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
           colSpan: 12,width:"auto", 
         },
-        // { 
-        //   type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
-        //   beforeFocus:(tableScope)=>{if(!this.addPopData_FS[tableScope.$index].itemCode || this.addPopData_FS[tableScope.$index].itemCode.length <= 0 || !this.addPopData_FS[tableScope.$index].supplierCode || this.addPopData_FS[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
-        //   focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_FS[tableScope.$index].supplierCode),1000)},
-        //   width:"auto",
-        // },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",this.isFilter("type", "2"),1000)},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) }, 
@@ -209,12 +206,12 @@ export default {
       }],
       //原料表头信息
       addPopColumns_YL:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilter("type", "10C02"),1000)},
           width:"auto"
         },
         { type: "filterSelect", label: "箱标签", prop: "packingCode", optionsLabel: "packingCode", optionsValue: "packingCode", clearable:true,
-          beforeFocus:(tableScope)=>{if(!this.addPopData_YL[tableScope.$index].itemCode || this.addPopData_YL[tableScope.$index].length <= 0){this.$message.error('请选择物品代码'); return false}else{return true}},
+          beforeFocus:(tableScope)=>{if(!this.addPopData_YL[tableScope.$index].itemCode || this.addPopData_YL[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
           focus: async (type,val,tableScope) => { return this.getFilterList(type, val, "wms/inventory/Inventory-Balance",await this.getPackingFilterYl(this.addPopData_YL[tableScope.$index].itemCode),1000)},
           width:"auto",
         },
@@ -252,29 +249,23 @@ export default {
       }],
       //混拌料表头信息
       addPopColumns_HB:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic",this.isFilter("isRecycled","false"),1000)},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.addPopData_HB) }, 
           width:"auto", 
         },
         { 
           type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].length <= 0){this.$message.error('请选择物品代码'); return false}else{return true}},
+          beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].length <= 0){this.$message.error('请选择'+_Names.itemCode); return false}else{return true}},
           focus: (type,val,tableScope) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.addPopData_HB[tableScope.$index].itemCode),1000)},
           width:"auto",
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "number", clearable:true,getType:"getPage",
-          beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
+          beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择'+_Names.itemCode+'和供应商代码'); return false}else{return true}},
           focus: (type,val,tableScope) => {  return this.getFilterList(type, {itemCode:this.addPopData_HB[tableScope.$index].itemCode,supplierCode:this.addPopData_HB[tableScope.$index].supplierCode}, "wms/store/purchase-order/get-list-by-supplier-code-and-item-code")},
           colSpan: 12,width:"auto", 
         },
-        // { 
-        //   type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,
-        //   beforeFocus:(tableScope)=>{if(!this.addPopData_HB[tableScope.$index].itemCode || this.addPopData_HB[tableScope.$index].itemCode.length <= 0 || !this.addPopData_HB[tableScope.$index].supplierCode || this.addPopData_HB[tableScope.$index].supplierCode.length <= 0){this.$message.error('请选择物品代码和供应商代码'); return false}else{return true}},
-        //   focus: (type,val,tableScope) => { return this.getFilterList(type, val, "wms/store/supplier-asn",this.isFilter("supplierCode", this.addPopData_HB[tableScope.$index].supplierCode),1000)},
-        //   width:"auto",
-        // },
         { type: "filterSelect", label: "目标库位", prop: "locationCode", optionsLabel: "name", optionsValue: "code", 
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/Location",false,1000)},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Location', 'InventoryBalance', '库位选择', this.addPopData_HB) }, 

fe/PC/src/views/kittingManage/Kitting.vue

@@ -102,6 +102,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import { mixins } from "@/mixins/mixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "Kitting",
   mixins: [
@@ -155,7 +158,7 @@ export default {
       },
       AddDetailsTableColumns: [
         { type:"inputNumber", label: "数量", prop: 'qty',width:"auto",min:1 },
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", 
+        { 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) }, 
           width: "auto",searchButton:false
@@ -228,7 +231,7 @@ export default {
             }
           })
           if(_isEmpty > 0){
-            this.$errorMsg('【数量】与【物料代码】不能为空,且【数量】要大于0！')
+            this.$errorMsg('【数量】与【'+_Names.itemCode+'】不能为空,且【数量】要大于0！')
             reject()
             return
           }

fe/PC/src/views/labelManage/PartiallyPreparedProducts/PartiallyPreparedProducts.vue

@@ -69,6 +69,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PartiallyPreparedProductsLabel",
   mixins: [
@@ -105,7 +108,7 @@ export default {
       selectPoNumberInfo:{},//已选采购订单号的信息
       // 默认筛选数据
       defaultSelectData:{
-        itemCode:"",//物品代码
+        itemCode:"",
         itemName:"",//物品名称
         canMake:null,//制造件
         canBuy:null,//采购件
@@ -125,12 +128,12 @@ export default {
       selectData:{},
       // 筛选条件
       selectForm:[
-      { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
+      { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
             // {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"10C04"}
           ])},
-          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,[
           //   // {logic:"And",column:"canMake",action:"==",value:"true"},
           //   {logic:"And",column:"type",action:"==",value:"10C04"}
           // ]) }, 
@@ -150,7 +153,7 @@ export default {
         { type: "dateTime", label: "到货时间", prop: "arriveDate", colSpan: 12 },
         { 
           hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
           //   this.isFilter("itemCode", this.selectData.itemCode)
@@ -159,14 +162,14 @@ export default {
         },
         { 
           hide:false,type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" },],
         labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
@@ -176,7 +179,7 @@ export default {
       },
       // 表格头部信息
       flexTableColumns:[
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         { label: "实际数量", prop: "qty", },
@@ -223,7 +226,7 @@ export default {
       })
       return _index
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemcode点击拉取
     detailsDataPush (val) {
       // 点击物品
       if(val[1].prop == "itemCode"){

fe/PC/src/views/labelManage/PartiallyPreparedProducts/RecycledMaterialsLabel.vue

@@ -69,6 +69,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "RecycledMaterialsLabel",
   mixins: [
@@ -104,7 +107,7 @@ export default {
       selectPoNumberInfo:{},//已选采购订单号的信息
       // 默认筛选数据
       defaultSelectData:{
-        itemCode:"",//物品代码
+        itemCode:"",
         itemName:"",//物品名称
         canMake:null,//制造件
         canBuy:null,//采购件
@@ -125,11 +128,11 @@ export default {
       // 筛选条件
       selectForm:[
         { 
-          type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+          type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", 
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
           )},
-          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,
           //   // [{logic:"And",column:"canMake",action:"!=",value:"true"}]  //原回收料的条件
           // )}, 
           colSpan: 12,
@@ -148,7 +151,7 @@ export default {
         { type: "input", label: "备注", prop: "remark",  colSpan: 12 },
         { 
           hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
           //   this.isFilter("itemCode", this.selectData.itemCode)
@@ -157,14 +160,14 @@ export default {
         },
         { 
           hide:false,type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" },],
         labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
@@ -173,7 +176,7 @@ export default {
       },
       // 表格头部信息
       flexTableColumns:[
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         { label: "实际数量", prop: "qty", },
@@ -220,7 +223,7 @@ export default {
       })
       return _index
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemcode点击拉取
     detailsDataPush (val) {
       // 点击物品
       if(val[1].prop == "itemCode"){

fe/PC/src/views/labelManage/PartiallyPreparedProducts/__PartiallyPreparedProducts.vue

@@ -68,6 +68,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PartiallyPreparedProductsLabel",
   mixins: [
@@ -105,12 +108,12 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code",
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", [
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,[
             {logic:"And",column:"canMake",action:"==",value:"true"},
             {logic:"And",column:"type",action:"==",value:"半成品"}
           ]) }, 
@@ -125,14 +128,14 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: _Names.itemCode, prop: "itemCode", },
         { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "标包数量", prop: "packQty", },
@@ -163,7 +166,7 @@ export default {
       this.$refs.steps_bcpsj.returnFirstActive()
       this.$refs.form_bcpsj.getDom().resetFields();
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemcode点击拉取
     detailsDataPush (val) {
       if(val[1].prop == "itemCode"){
         this.pageLoading = true

fe/PC/src/views/labelManage/PartiallyPreparedProducts/__RecycledMaterialsLabel.vue

@@ -84,6 +84,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   mixins: [
     mixins,
@@ -130,11 +133,11 @@ export default {
       // 筛选条件
       selectForm:[
         { 
-          type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+          type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic", 
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}] //原回收料的条件
           )},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,
             // [{logic:"And",column:"canMake",action:"!=",value:"true"}]  //原回收料的条件
           )}, 
           colSpan: 12,
@@ -149,7 +152,7 @@ export default {
         { type: "input",  label: "批次", prop: "lot", colSpan: 12 },
         { type: "inputNumber", label: "标签个数", prop: "labelQty", min:1,colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -160,14 +163,14 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" },],
         // lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
         qty: [{ required: true, trigger: "change", message: "实际数量不能为空" }],
         labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
       },
       // 表格头部信息
       flexTableColumns:[
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         // { width:"auto",label: "标包数量", prop: "packQty", },
@@ -206,7 +209,7 @@ export default {
       this.$refs.steps_create.returnFirstActive()
       this.$refs.form_create.getDom().resetFields();
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemcode点击拉取
     detailsDataPush (val) {
       // 点击物品
       if(val[1].prop == "itemCode"){

fe/PC/src/views/labelManage/PartiallyPreparedProducts/__productionReturnLabel.vue

@@ -69,6 +69,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   mixins: [
     mixins,
@@ -110,12 +113,12 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ])},
-          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
+          searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ]) }, 
@@ -123,7 +126,7 @@ export default {
         },
         { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
             this.isFilter("itemCode", this.selectData.itemCode)
@@ -132,7 +135,7 @@ export default {
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
@@ -143,7 +146,7 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" }],
         supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
         poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
@@ -152,7 +155,7 @@ export default {
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: _Names.itemCode, prop: "itemCode", },
         { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "订单号", prop: "poNumber", },
@@ -229,7 +232,7 @@ export default {
         // this.selectData.poNumber = val[0].poNumber
       }
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemCode点击拉取
     filterClearHandle(val){
       if(val[0].prop == "itemCode"){
         this.selectData.supplierCode = ""

fe/PC/src/views/labelManage/PartiallyPreparedProducts/productionReturnLabel.vue

@@ -70,6 +70,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   mixins: [
     mixins,
@@ -113,12 +116,12 @@ export default {
       },
       // 筛选条件
       selectForm:[
-        { type: "filterSelect", label: "物品代码", prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
+        { type: "filterSelect", label: _Names.itemCode, prop: "itemCode", optionsLabel: "name", optionsValue: "code", clearable:true,
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/item-basic",[
             {logic:"And",column:"canMake",action:"!=",value:"true"},
             {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           ])},
-          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品代码', this.selectData,[
+          // searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', _Names.itemCode, this.selectData,[
           //   {logic:"And",column:"canMake",action:"!=",value:"true"},
           //   {logic:"And",column:"isRecycled",action:"!=",value:"true"},
           // ]) }, 
@@ -126,7 +129,7 @@ export default {
         },
         { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
           // searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
           //   this.isFilter("itemCode", this.selectData.itemCode)
@@ -135,7 +138,7 @@ export default {
         },
         { 
           type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+          beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
           focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
           colSpan: 12,
         },
@@ -148,7 +151,7 @@ export default {
       ],
       // 筛选Rules
       selectRules:{
-        itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" }],
+        itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" }],
         supplierCode: [{ required: true, trigger: "change", message: "供应商代码不能为空" }],
         poNumber: [{ required: true, trigger: "change", message: "采购订单号不能为空" }],
         lot: [{ required: true, trigger: "change", message: "批次不能为空" }],
@@ -157,7 +160,7 @@ export default {
       },
       // 格头部信息
       flexTableColumns:[
-        { width:"auto",label: "物品代码", prop: "itemCode", },
+        { width:"auto",label: _Names.itemCode, prop: "itemCode", },
         { width:"auto",label: "物品名称", prop: "itemName", },
         { width:"auto",label: "批次", prop: "lot", },
         { width:"auto",label: "订单号", prop: "poNumber", },
@@ -229,7 +232,7 @@ export default {
         this.poNumberInfo = val[0]
       }
     },
-    // 第一部物品代码点击拉取
+    // 第一部itemcode点击拉取
     filterClearHandle(val){
       if(val[0].prop == "itemCode"){
         this.selectData.supplierCode = ""

fe/PC/src/views/labelManage/PartiallyPreparedProducts/splitLabels.vue

@@ -70,6 +70,9 @@ import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
 import store  from '@/store'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "splitLabels",
   mixins: [
@@ -107,7 +110,7 @@ export default {
       // 默认筛选数据
       defaultSelectData:{
         oldPackingCode:"",//原箱标签
-        itemCode:"",//物品代码
+        itemCode:"",
         itemName:"",//物品名称
         // canMake:null,//制造件
         // canBuy:null,//采购件
@@ -141,7 +144,7 @@ export default {
           colSpan: 12,
         },
         { type: "inputNumber", label: "拆出数量", prop: "qty",colSpan: 12 },
-        { type: "input",disabled:true,label: "物品代码", prop: "itemCode",  colSpan: 12 },
+        { type: "input",disabled:true,label: _Names.itemCode, prop: "itemCode",  colSpan: 12 },
         { type: "input",disabled:true,label: "物品名称", prop: "itemName",  colSpan: 12 },
         { type: "input",disabled:true,label: "标包数量", prop: "stdPackQty",  colSpan: 12 },
         // { type: "select",disabled:true, label: "制造件", prop: "canMake", options: "whetherOrNot", colSpan: 12 },
@@ -158,7 +161,7 @@ export default {
         { type: "input",disabled:true,label: "采购订单号", prop: "poNumber",  colSpan: 12 },
         // { 
         //   hide:false,type: "filterSelect", label: "供应商代码", prop: "supplierCode", optionsLabel: "supplierSimpleName", optionsValue: "supplierCode", clearable:true,
-        //   beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+        //   beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
         //   focus: (type,val) => { return this.getFilterList(type, val, "basedata/supplier-item",this.isFilter("itemCode", this.selectData.itemCode))},
         //   searchButton: (val) => { this.showSerarchPage(val, 'basedata/supplier-item', 'SupplierItem', '供应商代码', this.selectData,
         //     this.isFilter("itemCode", this.selectData.itemCode)
@@ -167,7 +170,7 @@ export default {
         // },
         // { 
         //   hide:false,type: "filterSelect", label: "采购订单号", prop: "poNumber",optionsValue: "poNumber", clearable:true,getType:"getPage",
-        //   beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入物品代码'); return false}else{return true}},
+        //   beforeFocus:()=>{if(!this.selectData.itemCode || this.selectData.itemCode.length <= 0){this.$message.error('请输入'+_Names.itemCode); return false}else{return true}},
         //   focus: (type,val) => { return this.getFilterList(type, {itemCode:this.selectData.itemCode}, "wms/store/supplier-asn/get-list-by-item-code")},
         //   colSpan: 12,
         // },
@@ -175,7 +178,7 @@ export default {
       // 筛选Rules
       selectRules:{
         oldPackingCode: [{ required: true, trigger: "change", message: "请选择原箱标签" },],
-        // itemCode: [{ required: true, trigger: "change", message: "物品代码不能为空" },],
+        // itemCode: [{ required: true, trigger: "change", message: _Names.itemCode+"不能为空" },],
         // labelType:[{ required: true, trigger: "change", message: "标签类型不能为空" }],
         qty: [{ required: true, trigger: "change", message: "拆出数量不能为空" }],
         // labelQty: [{ required: true, trigger: "change", message: "标签个数不能为空" }],
@@ -185,7 +188,7 @@ export default {
       // 表格头部信息
       flexTableColumns:[
         { label: "原箱标签", prop: "oldPackingCode", },
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称", prop: "itemName", },
         { label: "批次", prop: "lot", },
         { label: "拆出数量", prop: "qty", },
@@ -226,7 +229,7 @@ export default {
       })
       return _index
     },
-    // 第一部物品代码点击拉取
+    // 第一部点击拉取
     detailsDataPush (val) {
       if(val[1].prop == "oldPackingCode"){
         this.rest()

fe/PC/src/views/labelManage/RepairLabels.vue

@@ -67,6 +67,9 @@ import _ from "lodash"
 import { mixins } from "@/mixins/mixins"
 import { LoadingMixins } from "@/mixins/LoadingMixins"
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   mixins: [
     mixins,
@@ -129,7 +132,7 @@ export default {
       flexTableData:[],
       // 箱码表格头部信息
       flexTableColumns:[
-        { label: "物品代码", prop: "itemCode", width:"auto" },
+        { label: _Names.itemCode, prop: "itemCode", width:"auto" },
         { label: "物品名称", prop: "itemName", width:"auto" },
         { label: "箱标签", prop: "packingCode", width:"auto" },
         { label: "数量", prop: "qty", width:"auto" },

fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue

@@ -37,6 +37,9 @@
 <script>
 import { getPageList, getDetailed } from '@/api/wms-api'
 import InventoryTransaction from "@/views/inventoryManage/InventoryQuery/InventoryTransaction-Query"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
     name: "libraryShiftSearch",
     components:{InventoryTransaction},
@@ -64,7 +67,7 @@ export default {
             infoData:null,
             transactionColumns:[
                 { label: "事务编号", prop: "transNumber",width: 180 },
-                { label: "物品代码", prop: "itemCode" },
+                { label: _Names.itemCode, prop: "itemCode" },
                 { label: "物品名称", prop: "itemName" },
                 { label: "物品描述1", prop: "itemDesc1" },
                 { label: "物品描述2", prop: "itemDesc2" },

fe/PC/src/views/padManage/isPadForKittingPack.vue

@@ -60,7 +60,7 @@
                 ></el-table-column>
                 <el-table-column
                   prop="itemCode"
-                  label="物料代码"
+                  label="ERP料号"
                 ></el-table-column>
                 <el-table-column
                   prop="itemName"

fe/PC/src/views/padManage/isPadForTransferLibJob.vue

@@ -100,6 +100,8 @@ import { getInventoryByPackingCode } from '@/api/wms-api'
 import { transferLibJobHandel } from '@/api/wms-job'
 import { inventoryBalanceRecommendList } from '@/api/wms-pad'
 import { filterSelectMixins } from '@/mixins/filter-Select'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
 
 export default {
   name: 'isPadForTransferLibJob',
@@ -176,7 +178,7 @@ export default {
         // { label: "回调业务类型", prop: "callBusinessType" },
       ],
       padDeatilColumn:[
-        { label: "物品代码", prop: "itemCode"},
+        { label: _Names.itemCode, prop: "itemCode"},
         { label: "物品名称", prop: "itemName" },
         { label: "物品描述1", prop: "itemDesc1" },
         { label: "物品描述2", prop: "itemDesc2" },
@@ -253,7 +255,7 @@ export default {
       showInventoryLoading:false,
       inventoryTableData:[],
       inventoryColumn:[
-        { label: "物品代码", prop: "itemCode" },
+        { label: _Names.itemCode, prop: "itemCode" },
         { label: "物品名称", prop: "itemName" },
         { label: "物品描述1", prop: "itemDesc1" },
         { label: "物品描述2", prop: "itemDesc2" },

fe/PC/src/views/padManage/isPadForpadListPage_jt.vue

@@ -92,6 +92,9 @@
   <script>
   import { getPageList } from "@/api/wms-api";
   import currenDescriptions from "@/components/currenDescriptions"
+  import zh from '@/lang/zh'
+  let _Names = zh.ColumsNames // 业务字段
+
   export default {
     name: 'padListPage_jt',
     components: { currenDescriptions },
@@ -124,7 +127,7 @@
           { label: "创建时间", prop: 'creationTime', type: "dateTime" },
         ],
         padDeatilColumn:[
-          {label:'物品代码',prop:'itemCode'},
+          {label:_Names.itemCode,prop:'itemCode'},
           {label:'物品名称',prop:'itemName'},
           {label:'物料描述1',prop:'itemDesc1'},
           {label:'物料描述2',prop:'itemDesc2'},

fe/PC/src/views/rawMaterialManage/automaticMaterialCall/automaticCallJob-msQuery.vue

@@ -68,6 +68,9 @@ import { mixins } from "@/mixins/mixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import store  from '@/store'
 import { initPrintAllData } from "@/mixins/printMixin"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "automaticCallJob",
   mixins: [
@@ -118,7 +121,7 @@ export default {
         // },
       ],
       handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },

fe/PC/src/views/rawMaterialManage/manualMaterialRequest/IssueJob.vue

@@ -68,6 +68,9 @@ import { mixins } from "@/mixins/mixins"
 import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins"
 import store  from '@/store'
 import { initPrintAllData } from "@/mixins/printMixin"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "IssueJob",
   mixins: [
@@ -119,7 +122,7 @@ export default {
         },
       ],
       handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称",  prop: "itemName" },
         { label: "实际库位", prop: "handledLocationCode", },
         { label: "推荐库位", prop: "recommendLocationCode", },

fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseReceiptJob-msQuery.vue

@@ -134,6 +134,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import {getImgsDetailPopData} from "@/utils/index"
 import currenForm from "@/components/currenForm"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PurchaseReceiptJob",
   mixins: [
@@ -251,7 +254,7 @@ export default {
         // }
       ],
       handleDetailsTableColumns: [
-        { label: "物品代码", prop: "itemCode" ,fixed:"left",width:"auto"},
+        { label: _Names.itemCode, prop: "itemCode" ,fixed:"left",width:"auto"},
         { label: "物品名称", prop: "itemName",width:"auto"},
         { label: "箱标签", prop: "recommendPackingCode",width:"auto"},
         { type: "object", label: "实际数量", prop: "handledQty", showProp: "qty",width:"auto"},

fe/PC/src/views/rawMaterialManage/purchaseReturn/returnJob.vue

@@ -62,6 +62,9 @@ import { drawerMixins } from "@/mixins/drawerMixins"
 import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import detailsRules from '@/utils/rules';
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "PurchaseReturnJob",
   mixins: [
@@ -129,7 +132,7 @@ export default {
           label: "箱标签",
           prop: "handledPackingCode",
         },
-        { label: "物品代码", prop: "itemCode", },
+        { label: _Names.itemCode, prop: "itemCode", },
         { label: "物品名称",  prop: "itemName" },
         { type: "objectInput", valueType: Number, rules: detailsRules.numberInput, label: "收货数量", prop: "handledQty", showProp: "qty", },
         { label: "包装数量", prop: "stdPackQty", },

fe/PC/src/views/rawMaterialManage/quality/InspectRequest.vue

@@ -293,6 +293,9 @@ import currenDescriptions from "@/components/currenDescriptions"
 import currenTableFlex from "@/components/currenTableFlex"
 import pdf from "@/components/pdf"
 import store  from '@/store'
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "InspectRequest",
   mixins: [
@@ -446,7 +449,7 @@ export default {
       //   }]
       // },
       // supplierForm: [
-      //   { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+      //   { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 12  },
       //   { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
       //   { type: "input", label: "描述", prop: "lot", disabled: true, colSpan: 12 },
       //   { type: "input", label: "外观", prop: "jysl", disabled: true, colSpan: 12  },
@@ -515,7 +518,7 @@ export default {
       },
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 8  },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 8  },
         { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 8  },
         { type: "input", label: "单位", prop: "stdPackUom", disabled: true,  colSpan: 8  },
         // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true,  colSpan: 8  },
@@ -538,7 +541,7 @@ export default {
       ],
       inspectNoticeDetailsTableColumns: [
         { label: "箱码", prop: "packingCode", width:'100%' },
-        { label: "物品代码", prop: "itemCode", width:'100%'  },
+        { label: _Names.itemCode, prop: "itemCode", width:'100%'  },
         { label: "物品名称", prop: "itemName", width:'100%' },
         // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },
@@ -605,7 +608,7 @@ export default {
     initInspectForm(){
       if(this.isBatchInspect){
         this.inspectForm = [
-          { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+          { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 12  },
           { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
           { type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
           { type: "input", label: "重量", prop: "weight", colSpan: 12  },
@@ -613,7 +616,7 @@ export default {
         ]
       }else{
         this.inspectForm = [
-          { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+          { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 12  },
           { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
           { type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
           { type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },

fe/PC/src/views/rawMaterialManage/quality/InspectRequest_old.vue

@@ -239,6 +239,9 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins"
 import { mixins } from "@/mixins/mixins"
 import currenDescriptions from "@/components/currenDescriptions"
 import pdf from "@/components/pdf"
+import zh from '@/lang/zh'
+let _Names = zh.ColumsNames // 业务字段
+
 export default {
   name: "InspectRequest",
   mixins: [
@@ -348,7 +351,7 @@ export default {
         // receiveUom: null,
       },
       inspectForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 12  },
         { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
         { type: "input", label: "箱码", prop: "packingCode", disabled: true, colSpan: 12 },
         { type: "select", label: "外观", prop: "appearance", options: "inspectAppearanceStatus", colSpan: 12 },
@@ -396,7 +399,7 @@ export default {
       //   }]
       // },
       // supplierForm: [
-      //   { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 12  },
+      //   { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 12  },
       //   { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 12  },
       //   { type: "input", label: "描述", prop: "lot", disabled: true, colSpan: 12 },
       //   { type: "input", label: "外观", prop: "jysl", disabled: true, colSpan: 12  },
@@ -465,7 +468,7 @@ export default {
       },
       // 质检详情页面-form字段
       inspectNoticeDetailsForm: [
-        { type: "input", label: "物品代码", prop: "itemCode", disabled: true, colSpan: 8  },
+        { type: "input", label: _Names.itemCode, prop: "itemCode", disabled: true, colSpan: 8  },
         { type: "input", label: "物品名称", prop: "itemName", disabled: true, colSpan: 8  },
         { type: "input", label: "单位", prop: "stdPackUom", disabled: true,  colSpan: 8  },
         // { type: "input", label: "整包数量", prop: "stdPackQty", disabled: true,  colSpan: 8  },
@@ -488,7 +491,7 @@ export default {
       ],
       inspectNoticeDetailsTableColumns: [
         { label: "箱码", prop: "packingCode", width:'100%' },
-        { label: "物品代码", prop: "itemCode", width:'100%'  },
+        { label: _Names.itemCode, prop: "itemCode", width:'100%'  },
         { label: "物品名称", prop: "itemName", width:'100%' },
         // { label: "单位", prop: "receiveUom", width:'100%' },
         { label: "收货数量", prop: "receiveQty", width:'100%' },