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

【nev-pc-pad】所有字段统一更改：物料相关改为料号(名称，描述1，描述2)配置改为规格/颜色

ag_report_nev
安虹睿 12 months ago
parent
fec59823d5
commit
c7529e3e3c
16 changed files with 510 additions and 506 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 13
      fe/PC/src/lang/zh.js
  2. 726
      fe/PC/src/utils/detailsTableColumns/index.js
  3. 12
      fe/PC/src/utils/summaryTableColumns/index.js
  4. 108
      fe/PC/src/utils/tableColumns/index.js
  5. 50
      fe/PC/src/utils/tabsDesTions/index.js
  6. 13
      fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
  7. 4
      fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
  8. 16
      fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
  9. 8
      fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue
  10. 8
      fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
  11. 12
      fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
  12. 8
      fe/PC/src/views/kittingManage/Kitting.vue
  13. 8
      fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue
  14. 12
      fe/PC/src/views/padManage/isPadForKittingPack.vue
  15. 12
      fe/PC/src/views/padManage/isPadForTransferLibJob.vue
  16. 6
      fe/PC/src/views/padManage/isPadForpadListPage_jt.vue

13
fe/PC/src/lang/zh.js
View File

@ -1,4 +1,5 @@
const _initLocationErpCode='ERP储位' const _initLocationErpCode='ERP储位'
const _inititemDesc1 = '料号描述'
export default { export default {
// 字段通用 // 字段通用
@ -23,9 +24,9 @@ export default {
// 所有字段（除了接口监控看板） // 所有字段（除了接口监控看板）
ColumsNames:{ ColumsNames:{
itemCode:'ERP料号', itemCode:'ERP料号',
itemName:'物品名称', itemName:'料号名称',
itemDesc1:'物品描述', itemDesc1:_inititemDesc1,
itemDesc2:'物品描述2', itemDesc2:_inititemDesc1+'2',
abcClass:'ABC类', abcClass:'ABC类',
canMake:'制造件', canMake:'制造件',
canBuy:'采购件', canBuy:'采购件',
@ -37,7 +38,7 @@ export default {
color:'颜色', color:'颜色',
category:'种类', category:'种类',
group:'分组', group:'分组',
configuration:'配置', configuration:'规格/颜色',
basicUom:'基本计量单位', basicUom:'基本计量单位',
stdPackQty:'标包数', stdPackQty:'标包数',
project:'项目', project:'项目',
@ -64,10 +65,10 @@ export default {
sampleQty:'抽检数量', sampleQty:'抽检数量',
productCode:'父ERP料号', productCode:'父ERP料号',
productName:'父物品名称', productName:'父物品名称',
productDesc1:'父物品描述', productDesc1:'父'+_inititemDesc1,
componentCode:'子ERP料号', componentCode:'子ERP料号',
componentName:'子物品名称', componentName:'子物品名称',
componentDesc1:'子物品描述', componentDesc1:'子'+_inititemDesc1,
componentQty:'子物品用量', componentQty:'子物品用量',
componentUom:'子物品用量单位', componentUom:'子物品用量单位',
erpOp:'ERP工序', erpOp:'ERP工序',

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

File diff suppressed because it is too large

12
fe/PC/src/utils/summaryTableColumns/index.js
View File

@ -9,9 +9,9 @@ let _Names = zh.ColumsNames // 业务字段
// 报检单 // 报检单
export const InspectRequest = [ export const InspectRequest = [
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "生产批次", prop: "lot" }, { label: "生产批次", prop: "lot" },
{ label: "收货数量", prop: 'receiveQty' }, { label: "收货数量", prop: 'receiveQty' },
{ label: "检验数量", prop: 'inspectQty' }, { label: "检验数量", prop: 'inspectQty' },
@ -47,9 +47,9 @@ export const InspectRequest = [
// 检验记录 // 检验记录
export const InspectNote = [ export const InspectNote = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" }, { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "生产批次", prop: "lot" }, { label: "生产批次", prop: "lot" },
{ label: "计量单位", prop: 'uom' }, { label: "计量单位", prop: 'uom' },
{ label: "收货数量", prop: 'receiveQty' }, { label: "收货数量", prop: 'receiveQty' },

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

@ -1056,9 +1056,9 @@ export const qualifiedInfo = [
}, },
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true }, { label: "数量", prop: "qty",isNumber:true },
{ label: "物品单位", prop: "uom" }, { label: "物品单位", prop: "uom" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -1117,12 +1117,12 @@ export const unqualifiedInfo = [
}, },
{ label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" }, { label: "状态",prop: "purchaseReceiptInspectStatus", type: "filter", filters: "enumPurchaseReceiptInspectStatus" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true }, { label: "数量", prop: "qty",isNumber:true },
{ label: "物品单位", prop: "uom" }, { label: "物品单位", prop: "uom" },
{ label: "原箱码", prop: "fromPackingCode" }, { label: "推荐箱码", prop: "recommendPackingCode" },
// { label: "拆箱箱码", prop: "packingCode" }, // { label: "拆箱箱码", prop: "packingCode" },
{ label: _Names.locationErpCode, prop: "locationErpCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "不合格原因代码", prop: 'failedReason' }, { label: "不合格原因代码", prop: 'failedReason' },
@ -1135,7 +1135,7 @@ export const unqualifiedInfo = [
{ label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" },
{ label: "订单号", prop: "poNumber" }, { label: "订单号", prop: "poNumber" },
{ label: "订单行", prop: "poLine" }, { label: "订单行", prop: "poLine" },
{ label: "推荐箱码", prop: "recommendPackingCode" }, { label: "原箱码", prop: "fromPackingCode" },
{ label: "实际箱码", prop: "handledPackingCode" }, { label: "实际箱码", prop: "handledPackingCode" },
// { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" }, // { label: _Names.recommendErpCode, prop: "recommendToLocationErpCode" },
// { label: _Names.handledErpCode, prop: "handledToLocationErpCode" }, // { label: _Names.handledErpCode, prop: "handledToLocationErpCode" },
@ -1172,9 +1172,9 @@ export const unqualifiedInfo = [
// 采购收货记录-详情【收货缺料明细】 // 采购收货记录-详情【收货缺料明细】
export const lackMaterialsInfo = [ export const lackMaterialsInfo = [
{ label: _Names.itemCode, prop: "itemCode",fixed: "left" }, { label: _Names.itemCode, prop: "itemCode",fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
{ label: _Names.locationErpCode, prop: "locationErpCode" }, { label: _Names.locationErpCode, prop: "locationErpCode" },
{ label: "单据号", prop: "number" }, { label: "单据号", prop: "number" },
@ -1275,9 +1275,9 @@ export const InspectNote = [
export const unqualifiedToQualified = [ export const unqualifiedToQualified = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true }, { label: "数量", prop: "qty",isNumber:true },
{ label: "单位", prop: "uom" }, { label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -1845,10 +1845,10 @@ export const FISDeliverRequest = [
// 成品发运任务 // 成品发运任务
export const FISDeliverJob = [ export const FISDeliverJob = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" }, { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "出货数量", prop: "qty" }, { label: "出货数量", prop: "qty" },
{ label: "单位", prop: "uom" }, { label: "单位", prop: "uom" },
{ label: "出货库区", prop: "areaCode" }, { label: "出货库区", prop: "areaCode" },
@ -2099,9 +2099,9 @@ export const labelsList = [
fixed:"left" fixed:"left"
}, },
{ label: _Names.itemCode, prop: 'itemCode' }, { label: _Names.itemCode, prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty",isNumber:true }, { label: "数量", prop: "qty",isNumber:true },
{ label: "单位", prop: "uom" }, { label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -2160,11 +2160,11 @@ export const InventoryBalance = [
type: "name", type: "name",
width: orderWidth width: orderWidth
}, },
{ label: "物品名称", prop: 'itemName' }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "类型", prop: 'item_typeFromFE', type: "filter", filters: "ItemTypeBasic", showProp:true }, { label: "类型", prop: 'item_typeFromFE', type: "filter", filters: "ItemTypeBasic", showProp:true },
{ label: "配置", prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true }, { label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本单价", prop: "stdCostPrice" },
@ -2204,10 +2204,10 @@ export const InventoryBalanceActive = [
type: "name", type: "name",
width: orderWidth width: orderWidth
}, },
{ label: "物品名称", prop: 'itemName' }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "库存数量", prop: "qty",isNumber:true }, { label: "库存数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -2246,10 +2246,10 @@ export const InventoryTransaction = [
width: orderWidth width: orderWidth
}, },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" }, { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" }, { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
@ -2303,9 +2303,9 @@ export const InventoryTransferLog = [
{ label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" }, { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
{ label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" }, { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "到货数量", prop: "qty",isNumber:true }, { label: "到货数量", prop: "qty",isNumber:true },
{ label: "到货单位", prop: "uom" }, { label: "到货单位", prop: "uom" },
{ label: "从库位代码", prop: "fromLocationCode" }, { label: "从库位代码", prop: "fromLocationCode" },
@ -2353,9 +2353,9 @@ export const expectOut = [
{ label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "创建时间", prop: "creationTime", type: "dateTime" },
// { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" }, // { label: "上次修改时间", prop: "lastModificationTime",type: "dateTime" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "占用数量", prop: "qty",isNumber:true }, { label: "占用数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
@ -2383,9 +2383,9 @@ export const expectIn = [
}, },
{ label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" }, { label: "状态", prop: "status", type: "tagFilter", filters: "jobStatus" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "占用数量", prop: "qty",isNumber:true }, { label: "占用数量", prop: "qty",isNumber:true },
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
@ -2412,9 +2412,9 @@ export const safetyStockWarning = [
fixed: "left", fixed: "left",
type: "name" type: "name"
}, },
{ label: "物品描述1", prop: "item_desc1FromFE",showProp:true }, { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true },
{ label: "物品描述2", prop: "item_desc2FromFE",showProp:true }, { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true },
{ label: "配置", prop: "item_configurationFromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "最小库存", prop: 'minStock' }, { label: "最小库存", prop: 'minStock' },
{ label: "最大库存", prop: 'maxStock' }, { label: "最大库存", prop: 'maxStock' },
{ label: "安全库存", prop: 'safetyStock' }, { label: "安全库存", prop: 'safetyStock' },
@ -2430,9 +2430,9 @@ export const splitPackingList = [
fixed: "left", fixed: "left",
type: "name" type: "name"
}, },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" }, { label: "原箱箱码", prop: "fromPackingCode" },
{ label: "目标箱码", prop: "toPackingCode" }, { label: "目标箱码", prop: "toPackingCode" },
{ label: "原数量", prop: "fromQty",isNumber:true }, { label: "原数量", prop: "fromQty",isNumber:true },
@ -2951,9 +2951,9 @@ export const CountJob = [
// 盘点任务-扫描明细 // 盘点任务-扫描明细
export const countJobDepDetails = [ export const countJobDepDetails = [
{ label: _Names.itemCode, prop: "itemCode", type: "name",fixed: "left" }, { label: _Names.itemCode, prop: "itemCode", type: "name",fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" }, { label: "库存状态", type: "filter", filters: "inventoryStage", prop: "status" },
{ label: "库存数量", prop: "inventoryQty" }, { label: "库存数量", prop: "inventoryQty" },
{ label: "盘点数量", prop: "countQty" }, { label: "盘点数量", prop: "countQty" },
@ -3753,9 +3753,9 @@ export const KittingPackagingNote = [
// kitting打包记录 - 扫描明细 // kitting打包记录 - 扫描明细
export const KittingPackagingDepDetails = [ export const KittingPackagingDepDetails = [
{ label: _Names.itemCode, prop: "itemCode", fixed: "left" }, { label: _Names.itemCode, prop: "itemCode", fixed: "left" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "底盘代码", prop: "chassisNumber" }, { label: "底盘代码", prop: "chassisNumber" },
{ label: "底盘号排序序列", prop: "chassisSortNumber" }, { label: "底盘号排序序列", prop: "chassisSortNumber" },
{ label: "kitting代码", prop: 'kittingCode' }, { label: "kitting代码", prop: 'kittingCode' },

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

@ -1331,9 +1331,9 @@ export const productionReturnNote = [
export const labelsList = [ export const labelsList = [
{ label: "箱码", prop: "code" }, { label: "箱码", prop: "code" },
{ label: _Names.itemCode, prop: 'itemCode' }, { label: _Names.itemCode, prop: 'itemCode' },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "数量", prop: "qty" }, { label: "数量", prop: "qty" },
{ label: "单位", prop: "uom" }, { label: "单位", prop: "uom" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
@ -1396,8 +1396,8 @@ export const InventoryInitialNote = [
{ label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
// { label: "最后盘点标签号", prop: "lastCountLabel" }, // { label: "最后盘点标签号", prop: "lastCountLabel" },
{ label: "物品描述", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' }, { label: "标包数量", prop: 'stdPackQty' },
{ label: "标准成本单价", prop: "stdCostPrice" }, { label: "标准成本单价", prop: "stdCostPrice" },
{ label: "标准成本金额", prop: "stdCost" }, { label: "标准成本金额", prop: "stdCost" },
@ -1432,8 +1432,8 @@ export const InventoryBalanceActive = [
{ label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" }, { label: "最后盘点时间", prop: "lastCountTime", type: "dateTime" },
{ label: "最后盘点计划单号", prop: "lastCountPlanNumber" }, { label: "最后盘点计划单号", prop: "lastCountPlanNumber" },
// { label: "最后盘点标签号", prop: "lastCountLabel" }, // { label: "最后盘点标签号", prop: "lastCountLabel" },
{ label: "物品描述", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "标包数量", prop: 'stdPackQty' }, { label: "标包数量", prop: 'stdPackQty' },
{ label: "供应商批次", prop: 'supplierBatch' }, { label: "供应商批次", prop: 'supplierBatch' },
// { label: "序号", prop: "serialNumber" }, // { label: "序号", prop: "serialNumber" },
@ -1450,9 +1450,9 @@ export const InventoryBalanceActive = [
export const InventoryTransaction = [ export const InventoryTransaction = [
{ label: "事务编号", prop: "transNumber" }, { label: "事务编号", prop: "transNumber" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" }, { label: "事务分类", prop: "transType" ,type: "filter", filters: "TransTypeBase" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },
{ label: "数量", prop: "qty" }, { label: "数量", prop: "qty" },
@ -1487,9 +1487,9 @@ export const InventorySnapshot = [
{ label: "备注", prop: 'remark' }, { label: "备注", prop: 'remark' },
{ label: "序号", prop: "serialNumber" }, { label: "序号", prop: "serialNumber" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "批次", prop: "lot" }, { label: "批次", prop: "lot" },
{ label: "数量", prop: "qty" }, { label: "数量", prop: "qty" },
@ -1516,9 +1516,9 @@ export const InventoryTransferLog = [
{ label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" }, { label: "从状态", prop: "fromStatus",type: "filter", filters: "inventoryStage" },
{ label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" }, { label: "到状态", prop: "toStatus", type: "filter", filters: "inventoryStage" },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "到货数量", prop: "qty" }, { label: "到货数量", prop: "qty" },
{ label: "到货单位", prop: "uom" }, { label: "到货单位", prop: "uom" },
{ label: "批次", prop: 'toLot' }, { label: "批次", prop: 'toLot' },
@ -1554,9 +1554,9 @@ export const InventoryTransferLog = [
// 预计入库存 // 预计入库存
export const expectIn = [ export const expectIn = [
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "任务编号", prop: "jobNumber" }, { label: "任务编号", prop: "jobNumber" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
@ -1580,9 +1580,9 @@ export const expectIn = [
// 预计入库存 // 预计入库存
export const expectOut = [ export const expectOut = [
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "任务编号", prop: "jobNumber" }, { label: "任务编号", prop: "jobNumber" },
{ label: "箱码", prop: "packingCode" }, { label: "箱码", prop: "packingCode" },
{ label: "库位代码", prop: "locationCode" }, { label: "库位代码", prop: "locationCode" },
@ -1630,9 +1630,9 @@ export const splitPackingList = [
fixed: "left", fixed: "left",
type: "name" type: "name"
}, },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "原箱箱码", prop: "fromPackingCode" }, { label: "原箱箱码", prop: "fromPackingCode" },
{ label: "目标箱码", prop: "toPackingCode" }, { label: "目标箱码", prop: "toPackingCode" },
{ label: "原数量", prop: "fromQty",isNumber:true }, { label: "原数量", prop: "fromQty",isNumber:true },

13
fe/PC/src/views/activeReportManage/reportForm/InventoryBookDetail_innerPage.vue
View File

@ -85,6 +85,9 @@
import { getInventoryTransactionSerials,getInterfaceCalendar } from '@/api/wms-api' import { getInventoryTransactionSerials,getInterfaceCalendar } from '@/api/wms-api'
import { formatTimeStampToNorm,formatTimeStrToStr } from '@/utils/formatTime' import { formatTimeStampToNorm,formatTimeStrToStr } from '@/utils/formatTime'
import * as statusType from "@/filters/statusType" import * as statusType from "@/filters/statusType"
import zh from '@/lang/zh'
let _Names = zh.ColumsNames // 业务字段
export default { export default {
name:"InventoryBookDetail_innerPage", name:"InventoryBookDetail_innerPage",
data(){ data(){
@ -116,11 +119,11 @@ export default {
}, },
// table标头 // table标头
tableTh:[ tableTh:[
{label:'ERP料号',prop:'itemCode',width:170}, {label:_Names.itemCode,prop:'itemCode',width:170},
{label:'物料名称',prop:'itemName'}, {label:_Names.itemName,prop:'itemName'},
{label:'物料描述',prop:'itemDesc1'}, {label:_Names.itemDesc1,prop:'itemDesc1'},
{label:'物料配置',prop:'configuration'}, {label:_Names.configuration,prop:'configuration'},
{label:'ERP储位',prop:'erpLocatioCode',width:80}, {label:_Names.locationErpCode,prop:'erpLocatioCode',width:80},
{label:'库位代码',prop:'locationCode',width:90}, {label:'库位代码',prop:'locationCode',width:90},
{label:'单号',prop:'number',width:170}, {label:'单号',prop:'number',width:170},
{label:'创建时间',prop:'createDateTime',width:160}, {label:'创建时间',prop:'createDateTime',width:160},

4
fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue
View File

@ -208,7 +208,7 @@ export default {
{ type: "input", label: _Names.itemName, prop: "name", colSpan: 12 }, { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
{ type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 }, { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
{ type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 }, { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
{ type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, { type: "input", label: _Names.configuration, prop: 'configuration', colSpan: 12 },
{ type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.CreateFormData) }, colSpan: 12 },
@ -241,7 +241,7 @@ export default {
{ type: "input", label: _Names.itemName, prop: "name", colSpan: 12 }, { type: "input", label: _Names.itemName, prop: "name", colSpan: 12 },
{ type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 }, { type: "input", label: _Names.itemDesc1, prop: "desc1", colSpan: 12 },
{ type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 }, { type: "input", label: _Names.itemDesc2, prop: "desc2", colSpan: 12 },
{ type: "input", label: "配置", prop: 'configuration', colSpan: 12 }, { type: "input", label: _Names.configuration, prop: 'configuration', colSpan: 12 },
{ type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", { type: "filterSelect", label: "基本计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/uom', 'Uom', '计量单位选择', this.editFormData) }, colSpan: 12 },

16
fe/PC/src/views/basicData/ItemsManage/ItemContainer.vue
View File

@ -158,10 +158,10 @@ export default {
{ type: "filterSelect", label: _Names.itemCode, 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())}, 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 }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData,this.isFilterItemCode()) }, colSpan: 12 },
{ type: "input", label: "物品名称", prop: "item_nameFromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.itemName, prop: "item_nameFromFE", colSpan: 12, disabled:true},
{ type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.itemDesc1, prop: "item_desc1FromFE", colSpan: 12, disabled:true},
{ type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.itemDesc2, prop: "item_desc2FromFE", colSpan: 12, disabled:true},
{ type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.configuration, prop: "item_configurationFromFE", colSpan: 12, disabled:true},
{ type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 }, { type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
], ],
@ -169,10 +169,10 @@ export default {
{ disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' }, { disabled:true, type: "input", label: "收容代码", prop: 'containerCode', colSpan: 12, validType:'numberLetter' },
{ type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12}, { type: "input", label: "收容代码描述", prop: 'containerName', colSpan: 12},
{ type: "input", label: _Names.itemCode, 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: _Names.itemName, prop: "item_nameFromFE", colSpan: 12, disabled:true},
{ type: "input", label: "物品描述1", prop: "item_desc1FromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.itemDesc1, prop: "item_desc1FromFE", colSpan: 12, disabled:true},
{ type: "input", label: "物品描述2", prop: "item_desc2FromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.itemDesc2, prop: "item_desc2FromFE", colSpan: 12, disabled:true},
{ type: "input", label: "配置", prop: "item_configurationFromFE", colSpan: 12, disabled:true}, { type: "input", label: _Names.configuration, prop: "item_configurationFromFE", colSpan: 12, disabled:true},
{ type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 }, { type: "inputNumber", label: "转储标包数量", prop: "qty", colSpan: 12, min:1 },
{ type: "input", label: "备注", prop: 'remark', colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 },
], ],

8
fe/PC/src/views/basicData/ItemsManage/Kitting_hasView.vue
View File

@ -153,10 +153,10 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
width: "auto",searchButton:false width: "auto",searchButton:false
}, },
{ label: "物料名称", prop: "itemName",width:"auto" }, { label: _Names.itemName, prop: "itemName",width:"auto" },
{ label: "物料描述1", prop: "itemDesc1",width:"auto" }, { label: _Names.itemDesc1, prop: "itemDesc1",width:"auto" },
{ label: "物料描述2", prop: "itemDesc2",width:"auto" }, { label: _Names.itemDesc2, prop: "itemDesc2",width:"auto" },
{ label: "配置", prop: 'configuration',width:"auto" }, { label: _Names.configuration, prop: 'configuration',width:"auto" },
], ],
childTableData:[{ childTableData:[{
stdPack:null, stdPack:null,

8
fe/PC/src/views/basicData/ItemsManage/PositionCode.vue
View File

@ -170,8 +170,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
colSpan: 12 colSpan: 12
}, },
{ type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 }, { type: "input", disabled:true, label: _Names.itemName, prop: "partName",colSpan: 12 },
{ type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 }, { type: "input", disabled:true, label: _Names.itemDesc1, prop: "partDesc",colSpan: 12 },
{ type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 }, { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
{ type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},
@ -190,8 +190,8 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) },
colSpan: 12 colSpan: 12
}, },
{ type: "input", disabled:true, label: "物品名称", prop: "partName",colSpan: 12 }, { type: "input", disabled:true, label: _Names.itemName, prop: "partName",colSpan: 12 },
{ type: "input", disabled:true, label: "物品描述", prop: "partDesc",colSpan: 12 }, { type: "input", disabled:true, label: _Names.itemDesc1, prop: "partDesc",colSpan: 12 },
{ type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 }, { type: "input", disabled:true, label: "单位", prop: "basicUom",colSpan: 12 },
{ type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "目标库位代码", prop: "locationCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")},

12
fe/PC/src/views/basicData/WorkshopManage/ProdLineItem.vue
View File

@ -170,9 +170,9 @@ export default {
{ type: "filterSelect", label: _Names.itemCode, 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")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, colSpan: 12 },
{ label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemName, prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
{ label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemDesc1, prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
{ label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemDesc2, prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
// 3,4,16 // 3,4,16
{ type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))},
@ -198,9 +198,9 @@ export default {
{ type: "filterSelect", label: _Names.itemCode,disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: _Names.itemCode,disabled:true, prop: "itemCode", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/Item-Basic")},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.editFormData) }, colSpan: 12 },
{ label: "物料名称", prop: 'itemName', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemName, prop: 'itemName', type:"input", disabled:true, colSpan: 12 },
{ label: "物料描述1", prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemDesc1, prop: 'itemDesc1', type:"input", disabled:true, colSpan: 12 },
{ label: "物料描述2", prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 }, { label: _Names.itemDesc2, prop: 'itemDesc2', type:"input", disabled:true, colSpan: 12 },
{ type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code", { type: "filterSelect", label: "成品/半成品库位", prop: "productLocationCodeListJson_show", optionsLabel: "name", optionsValue: "code",
focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))}, focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",this.locationFilter('product'))},
searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,this.locationFilter('product'))}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,this.locationFilter('product'))},

8
fe/PC/src/views/kittingManage/Kitting.vue
View File

@ -163,10 +163,10 @@ export default {
searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) }, searchButton: (val) => { this.showSerarchPage(val, 'basedata/Item-Basic', 'ItemBasic', '物品选择', this.CreateFormData) },
width: "auto",searchButton:false width: "auto",searchButton:false
}, },
{ label: "物料名称", prop: "itemName",width:"auto" }, { label: _Names.itemName, prop: "itemName",width:"auto" },
{ label: "物料描述1", prop: "itemDesc1",width:"auto" }, { label: _Names.itemDesc1, prop: "itemDesc1",width:"auto" },
{ label: "物料描述2", prop: "itemDesc2",width:"auto" }, { label: _Names.itemDesc2, prop: "itemDesc2",width:"auto" },
{ label: "配置", prop: 'conf',width:"auto" }, { label: _Names.configuration, prop: 'conf',width:"auto" },
{ type:"input", label: "备注", prop: 'remark',width:"auto" }, { type:"input", label: "备注", prop: 'remark',width:"auto" },
], ],
childTableData:[{ childTableData:[{

8
fe/PC/src/views/materialIssueManage/libraryShiftSearch.vue
View File

@ -68,10 +68,10 @@ export default {
transactionColumns:[ transactionColumns:[
{ label: "事务编号", prop: "transNumber",width: 180 }, { label: "事务编号", prop: "transNumber",width: 180 },
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "配置", prop: "item_configurationFromFE",showProp:true }, { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true },
{ label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" }, { label: "事务分类", prop: "transType",type: "filter", filters: "TransTypeBase" },
{ label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" }, { label: "子事务类型", prop: "transSubType", type: "filter", filters: "transSubType" },
{ label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" }, { label: "出库/入库", prop: "transInOut",type: "filter", filters: "transInOutStatus" },

12
fe/PC/src/views/padManage/isPadForKittingPack.vue
View File

@ -64,15 +64,15 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="itemName" prop="itemName"
label="物料名称" label="料号名称"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="itemDesc1" prop="itemDesc1"
label="物料描述1" label="料号描述"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="configuration" prop="configuration"
label="配置" label="规格/颜色"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="creationTime" prop="creationTime"
@ -103,15 +103,15 @@
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="itemName" prop="itemName"
label="物料名称" label="料号名称"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="itemDesc1" prop="itemDesc1"
label="物料描述1" label="料号描述"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="configuration" prop="configuration"
label="配置" label="规格/颜色"
></el-table-column> ></el-table-column>
<el-table-column <el-table-column
prop="qty" prop="qty"

12
fe/PC/src/views/padManage/isPadForTransferLibJob.vue
View File

@ -179,9 +179,9 @@ export default {
], ],
padDeatilColumn:[ padDeatilColumn:[
{ label: _Names.itemCode, prop: "itemCode"}, { label: _Names.itemCode, prop: "itemCode"},
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "请求数量", prop: 'requestQty' }, { label: "请求数量", prop: 'requestQty' },
{ label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' }, { label: _Names.requestLocationErpCode, prop: 'requestLocationErpCode' },
{ label: "推荐来源数量", prop: 'recommendFromQty' }, { label: "推荐来源数量", prop: 'recommendFromQty' },
@ -256,9 +256,9 @@ export default {
inventoryTableData:[], inventoryTableData:[],
inventoryColumn:[ inventoryColumn:[
{ label: _Names.itemCode, prop: "itemCode" }, { label: _Names.itemCode, prop: "itemCode" },
{ label: "物品名称", prop: "itemName" }, { label: _Names.itemName, prop: "itemName" },
{ label: "物品描述1", prop: "itemDesc1" }, { label: _Names.itemDesc1, prop: "itemDesc1" },
{ label: "物品描述2", prop: "itemDesc2" }, { label: _Names.itemDesc2, prop: "itemDesc2" },
{ label: "计量单位", prop: "uom" }, { label: "计量单位", prop: "uom" },
{ label: '数量', prop: "qty" }, { label: '数量', prop: "qty" },
{ label: "箱码", prop: 'packingCode' }, { label: "箱码", prop: 'packingCode' },

6
fe/PC/src/views/padManage/isPadForpadListPage_jt.vue
View File

@ -128,9 +128,9 @@
], ],
padDeatilColumn:[ padDeatilColumn:[
{label:_Names.itemCode,prop:'itemCode'}, {label:_Names.itemCode,prop:'itemCode'},
{label:'物品名称',prop:'itemName'}, {label:_Names.itemName,prop:'itemName'},
{label:'物料描述1',prop:'itemDesc1'}, {label:_Names.itemDesc1,prop:'itemDesc1'},
{label:'物料描述2',prop:'itemDesc2'}, {label:_Names.itemDesc2,prop:'itemDesc2'},
{label:'数量',prop:'recommendToQty'}, {label:'数量',prop:'recommendToQty'},
], ],
listRowButton:[ listRowButton:[

Write Preview
Loading…
Cancel
Save