From 00cabc2612d2a1366e02606f82c3d5cc2385a601 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com> Date: Wed, 8 Mar 2023 21:39:23 +0800 Subject: [PATCH] =?UTF-8?q?=E7=BB=99=E5=95=86=E5=93=81=E5=92=8C=E8=AE=A1?= =?UTF-8?q?=E9=87=8F=E5=8D=95=E4=BD=8D=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=B0=8F?= =?UTF-8?q?=E6=95=B0=E6=AF=94=E4=BE=8B=E7=9A=84=E5=85=BC=E5=AE=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- jshERP-web/src/utils/validate.js | 71 +++++++++++-------- .../views/material/modules/MaterialModal.vue | 48 ++++++------- .../src/views/system/modules/UnitModal.vue | 46 ++++++++---- 3 files changed, 98 insertions(+), 67 deletions(-) diff --git a/jshERP-web/src/utils/validate.js b/jshERP-web/src/utils/validate.js index c8edcac4..aa725f2d 100644 --- a/jshERP-web/src/utils/validate.js +++ b/jshERP-web/src/utils/validate.js @@ -1,31 +1,40 @@ -/** - * 邮箱 - * @param {*} s - */ -export function isEmail (s) { - return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(s) -} - -/** - * 手机号码 - * @param {*} s - */ -export function isMobile (s) { - return /^1[0-9]{10}$/.test(s) -} - -/** - * 电话号码 - * @param {*} s - */ -export function isPhone (s) { - return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) -} - -/** - * URL地址 - * @param {*} s - */ -export function isURL (s) { - return /^http[s]?:\/\/.*/.test(s) -} +/** + * 邮箱 + * @param {*} s + */ +export function isEmail (s) { + return /^([a-zA-Z0-9._-])+@([a-zA-Z0-9_-])+((.[a-zA-Z0-9_-]{2,3}){1,2})$/.test(s) +} + +/** + * 手机号码 + * @param {*} s + */ +export function isMobile (s) { + return /^1[0-9]{10}$/.test(s) +} + +/** + * 电话号码 + * @param {*} s + */ +export function isPhone (s) { + return /^([0-9]{3,4}-)?[0-9]{7,8}$/.test(s) +} + +/** + * URL地址 + * @param {*} s + */ +export function isURL (s) { + return /^http[s]?:\/\/.*/.test(s) +} + +/** + * 两位小数 + * @param {*} s + */ +export function isDecimalTwo (s) { + let reg = /^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^([^0][0-9]+|0)$/ + return reg.test(s) +} diff --git a/jshERP-web/src/views/material/modules/MaterialModal.vue b/jshERP-web/src/views/material/modules/MaterialModal.vue index 202d355d..3783cb92 100644 --- a/jshERP-web/src/views/material/modules/MaterialModal.vue +++ b/jshERP-web/src/views/material/modules/MaterialModal.vue @@ -927,21 +927,21 @@ basicLowDecimal = mInfo.lowDecimal } else { //副单位进行换算 - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratio} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratio} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratio} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratio} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratio).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratio).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratio).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratio).toFixed(2)} if(otherUnitTwo && i===2) { - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratioTwo} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratioTwo} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratioTwo} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratioTwo} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratioTwo).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratioTwo).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratioTwo).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratioTwo).toFixed(2)} } if(otherUnitThree && i===3) { - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratioThree} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratioThree} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratioThree} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratioThree} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratioThree).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratioThree).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratioThree).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratioThree).toFixed(2)} } } } @@ -1083,23 +1083,23 @@ } else { //副单位进行换算 mInfo.commodityUnit = otherUnit - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratio} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratio} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratio} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratio} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratio).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratio).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratio).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratio).toFixed(2)} if(otherUnitTwo && i===2) { mInfo.commodityUnit = otherUnitTwo - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratioTwo} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratioTwo} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratioTwo} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratioTwo} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratioTwo).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratioTwo).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratioTwo).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratioTwo).toFixed(2)} } if(otherUnitThree && i===3) { mInfo.commodityUnit = otherUnitThree - if(basicPurchaseDecimal) { mInfo.purchaseDecimal = basicPurchaseDecimal*ratioThree} - if(basicCommodityDecimal) { mInfo.commodityDecimal = basicCommodityDecimal*ratioThree} - if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = basicWholesaleDecimal*ratioThree} - if(basicLowDecimal) { mInfo.lowDecimal = basicLowDecimal*ratioThree} + if(basicPurchaseDecimal) { mInfo.purchaseDecimal = (basicPurchaseDecimal*ratioThree).toFixed(2)} + if(basicCommodityDecimal) { mInfo.commodityDecimal = (basicCommodityDecimal*ratioThree).toFixed(2)} + if(basicWholesaleDecimal) { mInfo.wholesaleDecimal = (basicWholesaleDecimal*ratioThree).toFixed(2)} + if(basicLowDecimal) { mInfo.lowDecimal = (basicLowDecimal*ratioThree).toFixed(2)} } } } diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue index 36c88da2..a73b4a1a 100644 --- a/jshERP-web/src/views/system/modules/UnitModal.vue +++ b/jshERP-web/src/views/system/modules/UnitModal.vue @@ -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！');