gyzz/openerp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

将计量单位比例的校验改为3位小数

Browse Source
This commit is contained in:
季圣华 2023-03-09 22:13:32 +08:00
parent 4784882112
commit e0bf75d6a6
2 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
jshERP-web/src/utils/validate.js
View File

@ -38,3 +38,13 @@ export function isDecimalTwo (s) {
let reg = /^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^([^0][0-9]+|0)$/
return reg.test(s)
}
/**
* 三位小数
* @param {*} s
*/
export function isDecimalThree (s) {
let reg = /^(([^0][0-9]+|0)\.([0-9]{1,3})$)|^([^0][0-9]+|0)$/
return reg.test(s)
}

14
jshERP-web/src/views/system/modules/UnitModal.vue
View File

@ -54,7 +54,7 @@
import pick from 'lodash.pick'
import {addUnit,editUnit,checkUnit } from '@/api/api'
import {autoJumpNextInput} from "@/utils/util"
import {isDecimalTwo} from "@/utils/validate"
import {isDecimalThree} from "@/utils/validate"
import {mixinDevice} from '@/utils/mixin'
export default {
name: "UnitModal",
@ -131,8 +131,8 @@
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratio)) {
that.$message.warning('抱歉，比例只能为数字，最多两位小数！')
if(!isDecimalThree(formData.ratio)) {
that.$message.warning('抱歉，比例只能为数字，最多三位小数！')
that.confirmLoading = false
return
}
@ -143,8 +143,8 @@
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratioTwo)) {
that.$message.warning('抱歉，比例2只能为数字，最多两位小数！')
if(!isDecimalThree(formData.ratioTwo)) {
that.$message.warning('抱歉，比例2只能为数字，最多三位小数！')
that.confirmLoading = false
return
}
@ -155,8 +155,8 @@
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratioThree)) {
that.$message.warning('抱歉，比例3只能为数字，最多两位小数！')
if(!isDecimalThree(formData.ratioThree)) {
that.$message.warning('抱歉，比例3只能为数字，最多三位小数！')
that.confirmLoading = false
return
}