From 85cdefe15f72f7a05866c7cac4eb6de4e14e6a4c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=99=88=E8=96=AA=E5=90=8D?= <942005050@qq.com> Date: Fri, 31 Mar 2023 16:00:47 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=BF=AE=E6=94=B9inputNumber=E5=8F=AF?= =?UTF-8?q?=E8=BE=93=E5=85=A5=E5=B0=8F=E6=95=B0=20=E9=9C=80=E6=B7=BB?= =?UTF-8?q?=E5=8A=A0pointNumberFixed=E5=B1=9E=E6=80=A7?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- fe/PC/src/components/currenForm/index.vue | 12 ++++++++++-- fe/PC/src/views/basicData/BomManage/Bom.vue | 8 ++++---- .../views/basicData/SupplierManage/SupplierItem.vue | 4 ++-- 3 files changed, 16 insertions(+), 8 deletions(-) diff --git a/fe/PC/src/components/currenForm/index.vue b/fe/PC/src/components/currenForm/index.vue index 4d240b72d..7daa6723d 100644 --- a/fe/PC/src/components/currenForm/index.vue +++ b/fe/PC/src/components/currenForm/index.vue @@ -591,8 +591,16 @@ export default { // 数字类型input框onkeyup最大最小值处理 typeNumberOnkeyup(item,value){ if(value){ - let _match = String(value).match(/\d+/)//正整数 - this.searchData[item.prop] = _match?_match[0]:_match + // 添加pointNumberFixed 可以输入小数 + if (item.pointNumberFixed) { + let _fixed = item.pointNumberFixed ? Number(item.pointNumberFixed) : 100 + let reg = new RegExp(`\\d+\\.?\\d{0,${_fixed}}`); + let _match = String(value).match(reg) + this.searchData[item.prop] = _match ? _match[0] : _match + } else { + let _match = String(value).match(/\d+/)//正整数 + this.searchData[item.prop] = _match?_match[0]:_match + } } if(this.searchData[item.prop] > item.max){ this.searchData[item.prop] = item.max diff --git a/fe/PC/src/views/basicData/BomManage/Bom.vue b/fe/PC/src/views/basicData/BomManage/Bom.vue index ea9d8045d..7c237d625 100644 --- a/fe/PC/src/views/basicData/BomManage/Bom.vue +++ b/fe/PC/src/views/basicData/BomManage/Bom.vue @@ -115,7 +115,7 @@ export default { //新增 CreateFormData: { remark: null, - componentQty: 0, + componentQty: 1, componentUom: null, beginTime: null, endTime: null, @@ -134,7 +134,7 @@ export default { editFormData: { product:null, remark: null, - componentQty: 0, + componentQty: 1, componentUom: null, beginTime: null, endTime: null, @@ -155,7 +155,7 @@ export default { { type: "filterSelect", label: "子物料号", prop: "component", 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: 'componentQty', colSpan: 12, validType:'pointNumber' }, + { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 }, { type: "input", label: "子物料用量单位", prop: 'componentUom', disabled:"true", colSpan: 12 }, { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 }, { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 }, @@ -170,7 +170,7 @@ export default { editForm: [ { type: "input", label: "父物料号", prop: "product",disabled:"true", colSpan: 12 }, { type: "input", label: "子物料号", prop: 'component', disabled:"true", colSpan: 12 }, - { type: "input", label: "子物料用量", prop: 'componentQty', colSpan: 12, validType:'pointNumber' }, + { type: "inputNumber", label: "子物料用量", prop: 'componentQty', colSpan: 12, min:1, pointNumberFixed: 2 }, { type: "input", label: "子物料用量单位", prop: 'componentUom', colSpan: 12 }, { type: "dateTime", label: "开始时间", prop: "beginTime", colSpan: 12 }, { type: "dateTime", label: "结束时间", prop: "endTime", colSpan: 12 }, diff --git a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue index 1c5235a49..93639f132 100644 --- a/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue +++ b/fe/PC/src/views/basicData/SupplierManage/SupplierItem.vue @@ -161,7 +161,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: "supplierItemCode", colSpan: 12 }, + { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 }, { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 }, { type: "input", label: "版本", prop: "version", colSpan: 12 }, @@ -170,7 +170,7 @@ export default { editForm: [ { type: "input", label: "供应商代码", prop: "supplierCode", disabled:"true", colSpan: 12 }, { type: "input", label: "物料代码", prop: "itemCode", disabled:"true", colSpan: 12 }, - { type: "input", label: "供应商物料代码", prop: "supplierItemCode", colSpan: 12 }, + { type: "input", label: "供应商物料代码", prop: "supplierItemCode", validType:'numberLetter', colSpan: 12 }, { type: "input", label: "供应商物料名称", prop: "itemName", colSpan: 12 }, { type: "input", label: "供应商简称", prop: "supplierSimpleName", colSpan: 12 }, { type: "input", label: "包装单位", prop: "supplierPackUom", colSpan: 12 }, From b8435d2f3576928edf601bb9216efb839e6f4e2e 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 16:30:04 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E6=9B=B4=E6=94=B9=E7=BB=9F=E4=B8=80?= =?UTF-8?q?=E9=A2=84=E7=95=99?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../purchaseReceipt/SupplierAsn-msQuery.vue | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue index 5acc3dc8e..3a143d144 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/SupplierAsn-msQuery.vue @@ -25,6 +25,19 @@ :httpOverallSearchData="httpOverallSearchData" > + + + Date: Sat, 1 Apr 2023 20:45:02 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E9=87=87=E8=B4=AD=E8=AE=A2=E5=8D=95?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E6=96=B0=E5=A2=9E=E5=AF=BC=E5=85=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue index 7b11fc2a6..5a5bb73b7 100644 --- a/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue +++ b/fe/PC/src/views/rawMaterialManage/purchaseReceipt/PurchaseOrder-ms.vue @@ -79,6 +79,7 @@ export default { URL: 'wms/store/purchase-order', //常用按钮数据 currenButtonData: [ + this.defaultImportBtn(),//导入 this.defaultExportBtn(),//导出 this.defaultFieldSettingBtn(),//字段设置 this.defaultFreshBtn(),//刷新