From 6ad7f157a69d481edf206f7e705a6aae0fcfea91 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=AD=A3=E5=9C=A3=E5=8D=8E?= <752718920@qq.com>
Date: Tue, 18 Oct 2022 20:47:41 +0800
Subject: [PATCH] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E9=87=87=E8=B4=AD=E5=85=A5?=
 =?UTF-8?q?=E5=BA=93=E5=92=8C=E9=94=80=E5=94=AE=E5=87=BA=E5=BA=93=E7=9A=84?=
 =?UTF-8?q?=E6=94=B6=E4=BB=98=E6=AC=BE=E9=87=91=E9=A2=9D=E4=B8=BA=E7=A9=BA?=
 =?UTF-8?q?=E7=9A=84bug?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../src/views/bill/modules/PurchaseInModal.vue     | 14 ++++++++++----
 jshERP-web/src/views/bill/modules/SaleOutModal.vue | 14 ++++++++++----
 2 files changed, 20 insertions(+), 8 deletions(-)

diff --git a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
index 298db974..4f8c1e86 100644
--- a/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
+++ b/jshERP-web/src/views/bill/modules/PurchaseInModal.vue
@@ -163,7 +163,7 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次付款">
-              <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount', validatorRules.price ]" @keyup="onKeyUpChangeAmount"/>
+              <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" @keyup="onKeyUpChangeAmount"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -291,17 +291,23 @@
         validatorRules:{
           operTime:{
             rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请输入单据日期！' }
             ]
           },
           organId:{
             rules: [
-              { required: true, message: '请选择供应商!' }
+              { required: true, message: '请选择供应商！' }
             ]
           },
           accountId:{
             rules: [
-              { required: true, message: '请选择结算账户!' }
+              { required: true, message: '请选择结算账户！' }
+            ]
+          },
+          changeAmount:{
+            rules: [
+              { required: true, message: '请输入金额，如果为空请填0！' },
+              { pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }
             ]
           }
         },
diff --git a/jshERP-web/src/views/bill/modules/SaleOutModal.vue b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
index aeaa8f1c..452163c7 100644
--- a/jshERP-web/src/views/bill/modules/SaleOutModal.vue
+++ b/jshERP-web/src/views/bill/modules/SaleOutModal.vue
@@ -164,7 +164,7 @@
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
             <a-form-item :labelCol="labelCol" :wrapperCol="wrapperCol" label="本次收款">
-              <a-input placeholder="请输入本次付款" v-decorator.trim="[ 'changeAmount', validatorRules.price ]" @keyup="onKeyUpChangeAmount"/>
+              <a-input placeholder="请输入本次收款" v-decorator.trim="[ 'changeAmount', validatorRules.changeAmount ]" @keyup="onKeyUpChangeAmount"/>
             </a-form-item>
           </a-col>
           <a-col :lg="6" :md="12" :sm="24">
@@ -307,17 +307,23 @@
         validatorRules:{
           operTime:{
             rules: [
-              { required: true, message: '请输入单据日期!' }
+              { required: true, message: '请输入单据日期！' }
             ]
           },
           organId:{
             rules: [
-              { required: true, message: '请选择客户!' }
+              { required: true, message: '请选择客户！' }
             ]
           },
           accountId:{
             rules: [
-              { required: true, message: '请选择结算账户!' }
+              { required: true, message: '请选择结算账户！' }
+            ]
+          },
+          changeAmount:{
+            rules: [
+              { required: true, message: '请输入金额，如果为空请填0！' },
+              { pattern: /^(([0-9][0-9]*)|([0]\.\d{0,4}|[0-9][0-9]*\.\d{0,4}))$/, message: '金额格式不正确!' }
             ]
           }
         },