purovps/jshERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

给商品和计量单位增加对小数比例的兼容

Browse Source
This commit is contained in:
季圣华
2023-03-08 21:39:23 +08:00
parent 84026b5f9c
commit 00cabc2612
3 changed files with 98 additions and 67 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -54,6 +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 {mixinDevice} from '@/utils/mixin'
export default {
name: "UnitModal",
@@ -124,20 +125,41 @@
that.confirmLoading = false;
return;
}
if(formData.otherUnit && !formData.ratio) {
that.$message.warning('抱歉，比例不能为空！');
that.confirmLoading = false;
return;
if(formData.otherUnit) {
if(!formData.ratio) {
that.$message.warning('抱歉，比例不能为空！');
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratio)) {
that.$message.warning('抱歉，比例只能为数字，最多两位小数！')
that.confirmLoading = false
return
}
}
if(formData.otherUnitTwo && !formData.ratioTwo) {
that.$message.warning('抱歉，比例2不能为空！');
that.confirmLoading = false;
return;
if(formData.otherUnitTwo) {
if(!formData.ratioTwo) {
that.$message.warning('抱歉，比例2不能为空！');
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratioTwo)) {
that.$message.warning('抱歉，比例2只能为数字，最多两位小数！')
that.confirmLoading = false
return
}
}
if(formData.otherUnitThree && !formData.ratioThree) {
that.$message.warning('抱歉，比例3不能为空！');
that.confirmLoading = false;
return;
if(formData.otherUnitThree) {
if(!formData.ratioThree) {
that.$message.warning('抱歉，比例3不能为空！');
that.confirmLoading = false;
return;
}
if(!isDecimalTwo(formData.ratioThree)) {
that.$message.warning('抱歉，比例3只能为数字，最多两位小数！')
that.confirmLoading = false
return
}
}
if(!formData.otherUnitTwo && formData.otherUnitThree) {
that.$message.warning('抱歉，需要先输入副单位2再输入副单位3！');