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 },