From e83e566e6ce9c58f599bc86e5d7970053eafd5cc Mon Sep 17 00:00:00 2001 From: "SERVERM-0FVHDNN\\Administrator" <942005050@qq.com> Date: Wed, 29 Mar 2023 16:08:43 +0800 Subject: [PATCH] =?UTF-8?q?=E5=9F=BA=E7=A1=80=E7=89=A9=E5=93=81=E4=BF=A1?= =?UTF-8?q?=E6=81=AF=E6=96=B0=E5=A2=9E=E7=BC=96=E8=BE=91=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/views/basicData/ItemsManage/AQL.vue | 5 ++- .../views/basicData/ItemsManage/ItemBasic.vue | 22 +++++++----- .../basicData/ItemsManage/ItemCategory.vue | 1 - .../views/basicData/ItemsManage/ItemPack.vue | 29 +++++----------- .../basicData/ItemsManage/ItemQuality.vue | 34 ++++++++++--------- 5 files changed, 44 insertions(+), 47 deletions(-) diff --git a/fe/PC/src/views/basicData/ItemsManage/AQL.vue b/fe/PC/src/views/basicData/ItemsManage/AQL.vue index e18424719..7e56738b9 100644 --- a/fe/PC/src/views/basicData/ItemsManage/AQL.vue +++ b/fe/PC/src/views/basicData/ItemsManage/AQL.vue @@ -141,7 +141,7 @@ export default { samplePercent: 0, sampleQty: 0, isUsePercent: false, - company: null + abcClass: null, }, //编辑 editFormData: { @@ -153,6 +153,7 @@ export default { samplePercent: 0, sampleQty: 0, isUsePercent: true, + abcClass: null, concurrencyStamp: null }, editOptions: {}, @@ -168,6 +169,7 @@ export default { { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 }, { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 }, { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 24 }, ], editForm: [ @@ -182,6 +184,7 @@ export default { { type: "input", label: "抽检百分比%", valueType: Number, prop: "samplePercent", colSpan: 12 }, { type: "input", label: "抽检数量", valueType: Number, prop: "sampleQty", colSpan: 12 }, { type: "select", label: "使用百分比", prop: "isUsePercent", options: "whetherOrNot", colSpan: 12 }, + { type: "select", label: "ABC类", prop: "abcClass", options: "abcClass", clearable: true, filterable: true, allowCreate: true, colSpan: 12 }, { type: "input", label: "备注", prop: "remark", colSpan: 12 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue index ded253e9a..c3bea4d72 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemBasic.vue @@ -156,7 +156,7 @@ export default { configuration: null, basicUom: null, abcClass: "C", - productLine: null, + // productLine: null, project: null, version: null, eco: null, @@ -166,7 +166,8 @@ export default { elevel: null, code: null, company: null, - isPhantom: false + isPhantom: false, + stdPackQty: null, }, //编辑 editFormData: { @@ -187,7 +188,7 @@ export default { configuration: null, basicUom: null, abcClass: null, - productLine: null, + // productLine: null, project: null, version: null, eco: null, @@ -196,13 +197,15 @@ export default { manageType: 1, elevel: null, concurrencyStamp: null, - isPhantom: null + isPhantom: null, + stdPackQty: null, }, editOptions: {}, CreateForm: [ { type: "input", label: "物料代码", prop: 'code', colSpan: 12, validType:'numberLetter' }, { type: "input", label: "物料名称", prop: "name", colSpan: 12 }, - { type: "input", label: "物料描述", prop: "desc1", colSpan: 12 }, + { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 }, + { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 }, { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, @@ -212,7 +215,7 @@ export default { { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", colSpan: 12 }, { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "产品类", prop: "productLine", colSpan: 12 }, + // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 }, { type: "input", label: "有效值", prop: "validity", colSpan: 12 }, { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 }, { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 }, @@ -227,12 +230,14 @@ export default { { type: "input", label: "版本", prop: 'version', 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: "物料名称", prop: "name", colSpan: 12 }, - { type: "input", label: "物料描述", prop: "desc1", colSpan: 12 }, + { type: "input", label: "物料描述1", prop: "desc1", colSpan: 12 }, + { type: "input", label: "物料描述2", prop: "desc2", colSpan: 12 }, { type: "select", label: "状态", prop: "status", options: "itemStatus", colSpan: 12 }, { type: "filterSelect", label: "计量单位", prop: "basicUom", optionsLabel: "description", optionsValue: "name", focus: (type,val) => { return this.getFilterList(type, val, "basedata/uom")}, @@ -242,7 +247,7 @@ export default { { type: "select", label: "采购件", prop: "canBuy", options: "whetherOrNot", disabled: true, colSpan: 12 }, { type: "select", label: "外包件", prop: "canOutsourcing", options: "whetherOrNot", disabled: true, colSpan: 12 }, { type: "select", label: "回收件", prop: "isRecycled", options: "whetherOrNot", disabled: true, colSpan: 12 }, - { type: "input", label: "产品类", prop: "productLine", colSpan: 12 }, + // { type: "input", label: "产品类", prop: "productLine", colSpan: 12 }, { type: "input", label: "有效值", prop: "validity", colSpan: 12 }, { type: "select", label: "有效期", prop: "validityUnit", options: "validityUnit", colSpan: 12 }, { type: "select", label: "管理类型", prop: "manageType", options: "manageType", colSpan: 12 }, @@ -257,6 +262,7 @@ export default { { type: "input", label: "版本", prop: 'version', 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 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue index 8beab0677..8087f3b4b 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemCategory.vue @@ -127,7 +127,6 @@ export default { ], //新增 CreateFormData: { - company: '', itemCode: '', categoryCode: '', value: '', diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index 64ea1f726..bc0d4cc96 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -130,12 +130,8 @@ export default { remark: null, packName: null, packType: "EA", - packQty: 0, - packUom: null, - isStdPack: true, - stdPackCode: null, - conversionRate: 0, - company: null, + basicUom: null, + qty: 0, packCode: null, itemCode: null, }, @@ -146,11 +142,8 @@ export default { remark: null, packName: null, packType: "EA", - packQty: 0, - packUom: null, - isStdPack: true, - stdPackCode: null, - conversionRate: 0, + basicUom: null, + qty: 0, concurrencyStamp: null, }, editOptions: {}, @@ -161,11 +154,8 @@ export default { { type: "filterSelect", label: "物料代码", 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: "packQty", colSpan: 12, validType:'number' }, - { type: "input", label: "物料单位", prop: "packUom", colSpan: 12, validType:'numberLetter' }, - { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12, validType:'numberLetter' }, - { type: "input", label: "转换率", prop: "conversionRate", colSpan: 12, validType:'number' }, + { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' }, + { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editForm: [ @@ -173,11 +163,8 @@ export default { { 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: "包装数量", prop: "packQty", colSpan: 12, validType:'number' }, - { type: "input", label: "物料单位", prop: "packUom", colSpan: 12, validType:'numberLetter' }, - { type: "select", label: "是否标准包装", prop: "isStdPack", options: "whetherOrNot", colSpan: 12 }, - { type: "input", label: "标包编号", prop: "stdPackCode", colSpan: 12, validType:'numberLetter' }, - { type: "input", label: "转换率", prop: "conversionRate", colSpan: 12, validType:'number' }, + { type: "input", label: "包装数量", prop: "qty", colSpan: 12, validType:'number' }, + { type: "input", label: "包装计量单位", prop: "basicUom", colSpan: 12, validType:'numberLetter' }, { type: "input", label: "备注", prop: 'remark', colSpan: 12 }, ], editRules: { diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue index f579a03f0..39ff76251 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemQuality.vue @@ -136,13 +136,13 @@ export default { status: 1, description: null, inspectType: 1, - inspFrequency: 0, - inspFreqDays: 0, - sampleQty: 0, - samplePercent: 0, - destructive: true, - sampleByBatch: true, - returnMethod: true, + // inspFrequency: 0, + // inspFreqDays: 0, + // sampleQty: 0, + // samplePercent: 0, + // destructive: true, + // sampleByBatch: true, + // returnMethod: true, company: null }, //编辑 @@ -154,13 +154,13 @@ export default { status: 1, description: "", inspectType: 1, - inspFrequency: 0, - inspFreqDays: 0, - sampleQty: 0, - samplePercent: 0, - destructive: true, - sampleByBatch: true, - returnMethod: true, + // inspFrequency: 0, + // inspFreqDays: 0, + // sampleQty: 0, + // samplePercent: 0, + // destructive: true, + // sampleByBatch: true, + // returnMethod: true, concurrencyStamp: "" }, editOptions: {}, @@ -176,8 +176,9 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.CreateFormData) }, colSpan: 12 }, { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 }, { type: "select", label: "检验类型", prop: "inspectType", options: "inspectType", colSpan: 12 }, - { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, + { type: "input", label: "备注", prop: "remark", colSpan: 12 }, ], editForm: [ { type: "input",label: "物料代码", prop: "itemCode",disabled:"true", colSpan: 12 }, @@ -187,8 +188,9 @@ export default { searchButton: (val) => { this.showSerarchPage(val, 'basedata/Supplier', 'Supplier', '供应商选择', this.editFormData) }, colSpan: 12 }, { type: "select", label: "状态", prop: "status", options: "openToClose", colSpan: 12 }, { type: "select", label: "检验类型", prop: "inspectType", options: "inspectType", colSpan: 12 }, - { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 }, + // { type: "select", label: "是否是破坏性检验", prop: "destructive", options: "whetherOrNot", colSpan: 12 }, { type: "input", label: "描述", prop: "description", colSpan: 12 }, + { type: "input", label: "备注", prop: "remark", colSpan: 12 }, ], editRules: { cerateRule: {