From 6153c49765c180c5d1f06c9862d8fbfe5c19ee01 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Fri, 17 Mar 2023 19:08:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E8=AE=A1=E9=87=8F=E5=8D=95?=
 =?UTF-8?q?=E4=BD=8D=E9=A1=B5=E9=9D=A2=E6=A0=A1=E9=AA=8C=E9=94=99=E8=AF=AF?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 jshERP-web/src/utils/validate.js                  | 4 ++--
 jshERP-web/src/views/system/modules/UnitModal.vue | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/jshERP-web/src/utils/validate.js b/jshERP-web/src/utils/validate.js
index 1c400719..96ac3233 100644
--- a/jshERP-web/src/utils/validate.js
+++ b/jshERP-web/src/utils/validate.js
@@ -35,7 +35,7 @@ export function isURL (s) {
  * @param {*} s
  */
 export function isDecimalTwo (s) {
-  let reg = /^(([^0][0-9]+|0)\.([0-9]{1,2})$)|^([^0][0-9]+|0)$/
+  let reg = /^[0-9]+(\.[0-9]{1,2})?$/
   return reg.test(s)
 }
 
@@ -44,7 +44,7 @@ export function isDecimalTwo (s) {
  * @param {*} s
  */
 export function isDecimalThree (s) {
-  let reg = /^(([^0][0-9]+|0)\.([0-9]{1,3})$)|^([^0][0-9]+|0)$/
+  let reg = /^[0-9]+(\.[0-9]{1,3})?$/
   return reg.test(s)
 }
 
diff --git a/jshERP-web/src/views/system/modules/UnitModal.vue b/jshERP-web/src/views/system/modules/UnitModal.vue
index 4c8c5d2a..5b28751a 100644
--- a/jshERP-web/src/views/system/modules/UnitModal.vue
+++ b/jshERP-web/src/views/system/modules/UnitModal.vue
@@ -13,7 +13,7 @@
       @ok="handleOk"
       @cancel="handleCancel"
       cancelText="关闭"
-      style="top:100px; height:50%;">
+      style="top:100px; height:55%;">
       <template slot="footer">
         <a-button key="back" v-if="isReadOnly" @click="handleCancel">
           关闭