From 8f5d4c32a2fc8c5756d54ee4984ff10d5f9373c7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 31 Mar 2023 09:19:22 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E6=9A=82=E5=AD=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/utils/tableColumns/index.js | 37 +++++++++++++++++++++------ fe/PC/src/utils/tabsDesTions/index.js | 14 +++++----- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/fe/PC/src/utils/tableColumns/index.js b/fe/PC/src/utils/tableColumns/index.js index 225d00327..b3f432906 100644 --- a/fe/PC/src/utils/tableColumns/index.js +++ b/fe/PC/src/utils/tableColumns/index.js @@ -185,7 +185,7 @@ export const Bom = [ // fixed: "right" // }, ] -// 物料清单信息 - 详情【父物料信息、子物料信息】 +// 物料清单信息 - 详情【父物料信息、子物料信息】 20230331 export const BomInner = [ { label: "父物料号", @@ -194,16 +194,28 @@ export const BomInner = [ type: "name" }, { label: "子物料号", prop: "component" }, - { label: "子物料用量", prop: 'perQty', type:"object",showProp: 'qty' }, - { label: "子物料用量单位", prop: 'perQty', type:"object",showProp: 'uom' }, + { label: "子物料用量", prop: 'componentQty' }, + { label: "子物料用量单位", prop: 'componentUom' }, + // { label: "子物料用量", prop: 'perQty', type:"object",showProp: 'qty' }, + // { label: "子物料用量单位", prop: 'perQty', type:"object",showProp: 'uom' }, { label: "ERP工序", prop: "erpOp" }, { label: "制造工序", prop: "mfgOp" }, { label: "配送方式", prop: "distributionType", type: "filter", filters: "distributionType" }, { label: "取整方式", prop: "truncType", type: "filter", filters: "truncType" }, { label: "计划拆分规则", prop: "plannedSplitRule", type: "filter", filters: "plannedSplitRule" }, - { label: "开始时间", prop: "timeRange", type: "objectDateTime", showProp: 'beginTime' }, - { label: "结束时间", prop: "timeRange", type: "objectDateTime", showProp: 'endTime' }, + // { label: "开始时间", prop: "timeRange", type: "objectDateTime", showProp: 'beginTime' }, + // { label: "结束时间", prop: "timeRange", type: "objectDateTime", showProp: 'endTime' }, + { label: "开始时间", prop: "beginTime", type:'dateTime' }, + { label: "结束时间", prop: "endTime", type:'dateTime' }, { label: "备注", prop: 'remark' }, + // ------------------------------------- + { label: "层级", prop: "layer" }, + { label: "事务代码", prop: "tenantId" }, + { label: "创建时间", prop: "creationTime", type:'dateTime' }, + { label: "创建者Id", prop: "creatorId" }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, + { label: "上次修改者Id", prop: "lastModifierId" }, + { label: "id", prop: 'id' }, // { // label: "操作", // type:"buttonOperation", @@ -226,7 +238,6 @@ export const Customer = [ { label: "电话", prop: "phone" }, { label: "传真", prop: "fax" }, { label: "邮编", prop: "postID" }, - // ------------------------------------- { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "上次修改时间", prop: "lastModificationTime", type: "dateTime" }, @@ -583,7 +594,7 @@ export const Location = [ // fixed: "right" // }, ] -// 库位零件关系 +// 库位零件关系 20230331 export const ItemStoreRelation = [ { label: "物料代码", @@ -601,6 +612,13 @@ export const ItemStoreRelation = [ { label: "次要存储单位", prop: "altUm" }, { label: "存储单位", prop: "pramaryUM", type: "filter", filters: "pramaryUm" }, { label: "是否定制位置", prop: "isFixed", type: "filter", filters: "whetherOrNot" }, + // ----------------------------------------------------------------------- + { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" }, + { label: "库位代码", prop: "locationCode" }, + { label: "备注", prop: "remark" }, + { label: "创建时间", prop: "creationTime", type: "dateTime" }, + { label: "上次修改时间", prop: 'lastModificationTime', type: "dateTime" }, + // { // label: "操作", // type:"buttonOperation", @@ -609,7 +627,7 @@ export const ItemStoreRelation = [ // fixed: "right" // }, ] -// 库位可用容量信息 20230328 暂无接口 +// 库位可用容量信息 20230331 export const InventoryLocationCapacity = [ { label: "库位代码", @@ -622,6 +640,9 @@ export const InventoryLocationCapacity = [ { label: "创建时间", prop: "creationTime", type: "dateTime" }, { label: "备注", prop: "remark" }, // ----------------------------------------------------------------------- + { label: "已用容量", prop: "usedCapacity" }, + { label: "可承受过载容量", prop: "bearableOverloadCapacity" }, + { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, // { // label: "操作", diff --git a/fe/PC/src/utils/tabsDesTions/index.js b/fe/PC/src/utils/tabsDesTions/index.js index 33e55bbf3..432de46b8 100644 --- a/fe/PC/src/utils/tabsDesTions/index.js +++ b/fe/PC/src/utils/tabsDesTions/index.js @@ -13,7 +13,7 @@ export const ItemBasic = [ { label: "采购件", prop: "canBuy", type: "filter", filters: "whetherOrNot" }, { label: "外包件", prop: 'canOutsourcing', type: "filter", filters: "whetherOrNot" }, { label: "回收件", prop: 'isRecycled', type: "filter", filters: "whetherOrNot" }, - { label: "产品类", prop: 'productLine' }, + // { label: "产品类", prop: 'productLine' }, { label: "有效值", prop: "validity" }, { label: "有效期", prop: "validityUnit", type: "filter", filters: "validityUnit" }, { label: "管理类型", prop: "manageType", type: "filter", filters: "manageType" }, @@ -29,6 +29,7 @@ export const ItemBasic = [ { label: "是否虚拟物料", prop: "isPhantom", type: "filter", filters: "whetherOrNot" }, { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- + { label: "标包数", prop: "stdPackQty" }, { label: "事务代码", prop: "tenantId" }, { label: "创建时间", prop: "creationTime", type:'dateTime' }, { label: "创建者Id", prop: "creatorId" }, @@ -36,9 +37,6 @@ export const ItemBasic = [ { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, // { label: "公司", prop: 'company' }, - // --------------------------------------- - { label: "标包数", prop: "stdPackQty" }, - // ----------------------------------------------------------------------- ] // 物品质量信息 20230328 export const ItemQuality = [ @@ -465,7 +463,7 @@ export const Location = [ // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 库位零件关系 20221212 +// 库位零件关系 20230331 export const ItemStoreRelation = [ { label: "物料代码", prop: "itemCode" }, { label: "储存关系类型", prop: "storeRelationType", type: "filter", filters: "storeRelationType" }, @@ -480,7 +478,7 @@ export const ItemStoreRelation = [ { label: "备注", prop: 'remark' }, // ----------------------------------------------------------------------- { label: "是否占用多库位", prop: "multiLoc", type: "filter", filters: "whetherOrNot" }, - { label: "库位", prop: "locationCode" }, + { label: "库位代码", prop: "locationCode" }, { label: "事务代码", prop: "tenantId" }, { label: "创建时间", prop: "creationTime", type:'dateTime' }, { label: "创建者Id", prop: "creatorId" }, @@ -491,7 +489,7 @@ export const ItemStoreRelation = [ { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] -// 库位可用容量信息 20230328 暂无接口 +// 库位可用容量信息 20230331 export const InventoryLocationCapacity = [ { label: "可用容量(%)", prop: "availableCapacity" }, { label: "是否无穷大", prop: "isInfinity", type: "filter", filters: "whetherOrNot" }, @@ -506,7 +504,7 @@ export const InventoryLocationCapacity = [ { label: "上次修改时间", prop: "lastModificationTime", type:'dateTime' }, { label: "上次修改者Id", prop: "lastModifierId" }, { label: "id", prop: 'id' }, - { label: "公司", prop: 'company' }, + // { label: "公司", prop: 'company' }, // ----------------------------------------------------------------------- ] // 物品安全库存信息 20230328 From f1b4d7d154a7e706370b0214882010be8e08d10e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Fri, 31 Mar 2023 11:55:27 +0800 Subject: [PATCH 2/2] =?UTF-8?q?bug=E6=B8=85=E5=8D=95=E8=B7=9F=E8=B8=AA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/filterSelect/index.vue | 1 + fe/PC/src/utils/tableColumns/index.js | 2 +- fe/PC/src/utils/tabsDesTions/index.js | 2 +- .../basicData/WorkshopManage/ProdLineItem.vue | 3 +- .../WorkshopManage/ProductionLine.vue | 51 ++++++++++++++----- 5 files changed, 42 insertions(+), 17 deletions(-) diff --git a/fe/PC/src/components/filterSelect/index.vue b/fe/PC/src/components/filterSelect/index.vue index 390cbd659..b44940515 100644 --- a/fe/PC/src/components/filterSelect/index.vue +++ b/fe/PC/src/components/filterSelect/index.vue @@ -36,6 +36,7 @@
{ 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", diff --git a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue index 2ffed2fe9..b59e0030d 100644 --- a/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue +++ b/fe/PC/src/views/basicData/WorkshopManage/ProductionLine.vue @@ -161,15 +161,27 @@ export default { { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.CreateFormData) }, colSpan: 12 }, - { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 }, + + { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", + focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[ + {logic:"And",column:"type",action:"==",value:"2"}, + ])}, + searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[ + {logic:"And",column:"type",action:"==",value:"2"}, + ]) }, colSpan: 12 }, + { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.CreateFormData) }, colSpan: 12 }, + { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData) }, colSpan: 12 }, + focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[ + {logic:"And",column:"type",action:"==",value:"4"}, + ])}, + searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.CreateFormData,[ + {logic:"And",column:"type",action:"==",value:"4"}, + ]) }, colSpan: 12 }, + { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], @@ -177,32 +189,45 @@ export default { { type: "input", label: "生产线代码", disabled:"true", prop: "code", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "生产线名称", prop: 'name', colSpan: 12 }, { type: "select", label: "类型", prop: "type", options: "productionLineType", colSpan: 12 }, + { type: "filterSelect", label: "车间代码", prop: "workshopCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/workshop")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/workshop', 'Workshop', '车间选择', this.editFormData) }, colSpan: 12 }, + { type: "filterSelect", label: "原料库位", prop: "rawLocationCode", optionsLabel: "name", optionsValue: "code", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 }, + focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[ + {logic:"And",column:"type",action:"==",value:"2"}, + ])}, + searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[ + {logic:"And",column:"type",action:"==",value:"2"}, + ]) }, colSpan: 12 }, + { type: "filterSelect", label: "原料库位组", prop: "rawLocationGroupCode", optionsLabel: "name", optionsValue: "code", focus: (type,val) => { return this.getFilterList(type, val, "basedata/location-group")}, searchButton: (val) => { this.showSerarchPage(val, 'basedata/location-group', 'LocationGroup', '库位组选择', this.editFormData) }, colSpan: 12 }, + { type: "filterSelect", label: "成品库位", prop: "productLocationCode", optionsLabel: "name", optionsValue: "code", - focus: (type,val) => { return this.getFilterList(type, val, "basedata/location")}, - searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData) }, colSpan: 12 }, + focus: (type,val) => { return this.getFilterList(type, val, "basedata/location",[ + {logic:"And",column:"type",action:"==",value:"4"}, + ])}, + searchButton: (val) => { this.showSerarchPage(val, 'basedata/location', 'Location', '库位选择', this.editFormData,[ + {logic:"And",column:"type",action:"==",value:"4"}, + ]) }, colSpan: 12 }, + { type: "input", label: "描述", prop: "description", colSpan: 12 }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: { cerateRule: { code: [{ required: true, trigger: "blur", message: "不可为空" }], - rawLocation: [{ required: true, trigger: "change", message: "不可为空" }], workshopCode: [{ required: true, trigger: "change", message: "不可为空" }], - productLocation: [{ required: true, trigger: "change", message: "不可为空" }], + rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], + productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], }, editRule: { - rawLocation: [{ required: true, trigger: "change", message: "不可为空" }], workshopCode: [{ required: true, trigger: "change", message: "不可为空" }], - productLocation: [{ required: true, trigger: "change", message: "不可为空" }], + rawLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], + productLocationCode: [{ required: true, trigger: "change", message: "不可为空" }], } }, };