diff --git a/fe/PC/src/lang/zh.js b/fe/PC/src/lang/zh.js index 8de057a6c..d1aabff95 100644 --- a/fe/PC/src/lang/zh.js +++ b/fe/PC/src/lang/zh.js @@ -42,6 +42,7 @@ export default { validityUnit:'有效期单位', manageType:'管理类型', supplierCode:'供应商代码', + supplierName:'供应商名称', inspectType:'检验类型', categoryCode:'分类代码', categoryValue:'分类值', @@ -55,8 +56,12 @@ export default { isUsePercent:'使用百分比', samplePercent:'抽检百分比', sampleQty:'抽检数量', - productCode:'父物品号', - componentCode:'子物品号', + productCode:'父ERP料号', + productName:'父物品名称', + productDesc1:'父物品描述', + componentCode:'子ERP料号', + componentName:'子物品名称', + componentDesc1:'子物品描述', componentQty:'子物品用量', componentUom:'子物品用量单位', erpOp:'ERP工序', diff --git a/fe/PC/src/mixins/TableMixins.js b/fe/PC/src/mixins/TableMixins.js index fc2cb70b4..1ce4cfe0d 100644 --- a/fe/PC/src/mixins/TableMixins.js +++ b/fe/PC/src/mixins/TableMixins.js @@ -226,14 +226,19 @@ export const tableMixins = { // 主表+明细表 if(type != 'props'){ let _mainData = type == 'table' ? this.tableData : this.propsData.details + let _valueArr = [] _mainData.forEach((item)=>{ - let _filt = { - logic: 'Or', - column: "code", - action: "==", - value: item.itemCode + for(let i in item){ + if(i.indexOf('itemCode') >= 0){ + _valueArr.push(item[i]) + } } - _data.condition.filters.push(_filt) + }) + _data.condition.filters.push({ + logic: 'Or', + column: "code", + action: "In", + value: JSON.stringify(_valueArr) }) getPageList(_data, 'basedata/item-basic').then(res => { _mainData.forEach(item=>{ @@ -366,6 +371,7 @@ export const tableMixins = { // 点击抽屉,获取明细后全局通用操作 inlineDialogCallback(){ if(this.inlineDialogCallbackUser){this.inlineDialogCallbackUser()} + this.getSupplierByCodesHandle_props() // 如果业务页面设置showDetailBaseFromFE为空,detailsTableColumns.js别忘了删除配置项 if( (this.showDetailBaseFromFE && this.showDetailBaseFromFE.length > 0) || @@ -381,7 +387,6 @@ export const tableMixins = { else{ this.Loading.DrawerLoading = false } - this.getSupplierByCodesHandle_props() } } } diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 350756012..a985472c8 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -60,12 +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.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, { label: _Names.supplierCode, prop: 'supplierCode' }, - { label: "供应商名称", prop: 'supplierName' }, + { label: _Names.supplierName, 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" }, @@ -109,6 +109,12 @@ export const ItemPack = [ fixed: "left", type: "name" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: 'supplierName' }, { label: _Names.packCode, prop: "packCode", }, { label: _Names.packName, prop: "packName" }, { label: _Names.packType, prop: "packType" }, @@ -152,7 +158,12 @@ export const AQL = [ fixed: "left", type: "name" }, - { label: _Names.supplierCode, prop: "supplierCode" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: 'supplierName' }, { label: _Names.abcClass, prop: 'abcClass', type: "filter", filters: "abcClass" }, { label: _Names.ceilingQty, prop: 'ceilingQty',isNumber:true }, { label: _Names.floorQty, prop: "floorQty",isNumber:true}, @@ -178,7 +189,11 @@ export const Bom = [ fixed: "left", type: "name" }, + { label: _Names.productName, prop: "productName",showProp:true }, + { label: _Names.productDesc1, prop: "productDesc1",showProp:true }, { label: _Names.componentCode, prop: "component" }, + { label: _Names.componentName, prop: "componentName",showProp:true }, + { label: _Names.componentDesc1, prop: "componentDesc1",showProp:true }, { label: _Names.componentQty, prop: 'componentQty',isNumber:true }, { label: _Names.componentUom, prop: 'componentUom' }, { label: _Names.erpOp, prop: "erpOp" }, diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 311422423..6544a5ac8 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -43,11 +43,12 @@ export const ItemBasic = [ // 物品质量信息 20230328 export const ItemQuality = [ { 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: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: 'supplierName' }, { label: "状态", prop: "status", type: "filter", filters: "openToClose" }, { label: "检验类型", prop: 'inspectType', type: "filter", filters: "inspectType" }, { label: "描述", prop: "description" }, @@ -81,6 +82,12 @@ export const ItemPack = [ { label: "包装代码", prop: 'packCode' }, { label: "包装名称", prop: "packName" }, { label: _Names.itemCode, prop: "itemCode" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: 'supplierName' }, { label: '包装计量单位', prop: "basicUom" }, { label: '包装数量', prop: "qty" }, { label: "事务ID", prop: "tenantId" }, @@ -112,7 +119,12 @@ export const ItemContainer = [ // 物品质检标准信息 20230328 export const AQL = [ { label: _Names.itemCode, prop: "itemCode" }, - { label: "供应商代码", prop: "supplierCode" }, + { label: _Names.itemName, prop: "item_nameFromFE",showProp:true }, + { label: _Names.itemDesc1, prop: "item_desc1FromFE",showProp:true }, + { label: _Names.itemDesc2, prop: "item_desc2FromFE",showProp:true }, + { label: _Names.configuration, prop: "item_configurationFromFE",showProp:true }, + { label: _Names.supplierCode, prop: 'supplierCode' }, + { label: _Names.supplierName, prop: 'supplierName' }, { label: "数量上限", prop: 'ceilingQty' }, { label: "数量下限", prop: "floorQty" }, { label: "使用百分比", prop: 'isUsePercent', type: "filter", filters: "whetherOrNot" }, diff --git a/fe/PC/src/views/basicData/BomManage/Bom.vue b/fe/PC/src/views/basicData/BomManage/Bom.vue index f8af2812b..66746c210 100644 --- a/fe/PC/src/views/basicData/BomManage/Bom.vue +++ b/fe/PC/src/views/basicData/BomManage/Bom.vue @@ -80,6 +80,7 @@ import { TableHeaderMixins } from "@/mixins/TableHeaderMixins" import { newAndEdiDialogMixins } from "@/mixins/newAndEdiDialogMixins" import { mixins } from "@/mixins/mixins" import { filterSelectMixins } from '@/mixins/filter-Select' +import { getPageList } from '@/api/wms-api' export default { name: "Bom", mixins: [ @@ -242,6 +243,47 @@ export default { } } }, + // 父子双物料相关信息 + pagingCallback(){ + let _allItemCode = [] + let _itemProp = ['product','component'] + this.tableData.forEach(item => { + for(let i in item){ + console.log(i.indexOf(_itemProp) >= 0) + if(_itemProp.indexOf(i) >= 0){ + _allItemCode.push(item[i]) + } + } + }); + let _data = { + Sorting: "", + SkipCount: 0, + MaxResultCount: 1000, + condition: {filters: [ + { + logic: 'Or', + column: "code", + action: "In", + value: JSON.stringify(_allItemCode) + } + ]}, + } + getPageList(_data, 'basedata/item-basic').then(res => { + let _itemsConfig = {} + res.items.forEach(item=>{ _itemsConfig[item.code] = item }) + this.tableData.forEach(item=>{ + item.productName = _itemsConfig[item.product].name + item.productDesc1 = _itemsConfig[item.product].desc1 + item.componentName = _itemsConfig[item.component].name + item.componentDesc1 = _itemsConfig[item.component].desc1 + }) + this.Loading.tableLoading = false + }).catch(err => { + this.Loading.tableLoading = false + }) + }, + // todo:父子双物料相关信息 + inlineDialogCallback(){} } }; diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue index 17dc4e5b8..33e6f53a3 100644 --- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue +++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue @@ -151,6 +151,7 @@ export default { callback(); } return { + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/AQL', //常用按钮数据 currenButtonData: [ diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index bacdd5722..fe1bfb9ca 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -124,6 +124,7 @@ export default { } } return { + showTableBaseFromFE:['configuration','name','desc1','desc2'], URL: 'basedata/item-pack', //常用按钮数据 currenButtonData: [