From bb400fc52d695fdeee3cc4f92555f390785f28f6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 11 Apr 2023 16:45:05 +0800 Subject: [PATCH 1/2] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=8C=85=E8=A3=85=E6=95=B0=E9=87=8F=E6=A0=A1?= =?UTF-8?q?=E9=AA=8C=E5=A4=84=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/views/basicData/ItemsManage/ItemPack.vue | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index f88e1e788..e767ae665 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -48,8 +48,8 @@ :loading="Loading.importLoading" :show="displayDialog.importDialog" :URL="URL" - :disabledMethod = {method1:false,method2:false,method3:false} - :disabledIsAllowPartImport = {isAllowPartImport1:false,isAllowPartImport2:false} + :disabledMethod={method1:false,method2:false,method3:false} + :disabledIsAllowPartImport={isAllowPartImport1:false,isAllowPartImport2:false} methodValue="0" isAllowPartImportValue="1" @importClick="postImportMergeClick(arguments)" @@ -131,7 +131,7 @@ export default { packName: null, packType: "EA", basicUom: null, - qty: 0, + qty: null, packCode: null, itemCode: null, }, @@ -143,7 +143,7 @@ export default { packName: null, packType: "EA", basicUom: null, - qty: 0, + qty: null, concurrencyStamp: null, }, editOptions: {}, @@ -154,7 +154,7 @@ 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: "qty", colSpan: 12, validType:'number' }, + { 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 }, ], @@ -163,7 +163,7 @@ 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: "qty", colSpan: 12, validType:'number' }, + { 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 }, ], @@ -173,6 +173,7 @@ export default { itemCode: [{ required: true, trigger: "change", message: "不可为空" }], packQty: [{ required: true, trigger: "blur", message: "不可为空" }], packUom: [{ required: true, trigger: "blur", message: "不可为空" }], + qty: [{ required: true, trigger: "blur", message: "不可为空且最小值为1" }], conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }], }, editRule: { @@ -180,6 +181,7 @@ export default { itemCode: [{ required: true, trigger: "change", message: "不可为空" }], packQty: [{ required: true, trigger: "blur", message: "不可为空" }], packUom: [{ required: true, trigger: "blur", message: "不可为空" }], + qty: [{ required: true, trigger: "blur", message: "不可为空且最小值为1" }], conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }], } }, From 739700f81ae1b203a8fcfc8d9845a111723874a1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AE=89=E8=99=B9=E7=9D=BF?= <297504645@qq.com> Date: Tue, 11 Apr 2023 16:52:49 +0800 Subject: [PATCH 2/2] =?UTF-8?q?=E7=89=A9=E5=93=81=E5=8C=85=E8=A3=85?= =?UTF-8?q?=E6=95=B0=E9=87=8F=E6=9C=80=E5=B0=8F=E5=80=BC=E6=A0=A1=E9=AA=8C?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/basicData/ItemsManage/ItemPack.vue | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue index e767ae665..ce03fcb62 100644 --- a/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue +++ b/fe/PC/src/views/basicData/ItemsManage/ItemPack.vue @@ -114,6 +114,13 @@ export default { }, }, data () { + const validateQty = (rule, value, callback) => { + if (value <= 0) { + callback(new Error('最小值为1')) + } else { + callback() + } + } return { URL: 'basedata/item-pack', //常用按钮数据 @@ -173,7 +180,10 @@ export default { itemCode: [{ required: true, trigger: "change", message: "不可为空" }], packQty: [{ required: true, trigger: "blur", message: "不可为空" }], packUom: [{ required: true, trigger: "blur", message: "不可为空" }], - qty: [{ required: true, trigger: "blur", message: "不可为空且最小值为1" }], + qty: [ + { required: true, trigger: "blur", message: "不可为空且最小值为1" }, + { required: true, trigger: 'blur', validator: validateQty } + ], conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }], }, editRule: { @@ -181,7 +191,10 @@ export default { itemCode: [{ required: true, trigger: "change", message: "不可为空" }], packQty: [{ required: true, trigger: "blur", message: "不可为空" }], packUom: [{ required: true, trigger: "blur", message: "不可为空" }], - qty: [{ required: true, trigger: "blur", message: "不可为空且最小值为1" }], + qty: [ + { required: true, trigger: "blur", message: "不可为空且最小值为1" }, + { required: true, trigger: 'blur', validator: validateQty } + ], conversionRate: [{ required: true, trigger: "blur", message: "不可为空" }], } },