From 87c72bf1b0385493ceb0db0f2923ab369cb15348 Mon Sep 17 00:00:00 2001
From: zhangli <1109134334@qq.com>
Date: Wed, 4 Aug 2021 16:39:53 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A2=E5=8A=A1=E9=A2=84=E7=AE=97=E8=B0=83?=
 =?UTF-8?q?=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/FD_IncomeManage/Form.cshtml                       | 4 ++--
 .../Views/FD_IncomeManage/Form2.cshtml                      | 6 +++---
 .../Views/FD_IncomeManage/Form3.cshtml                      | 4 ++--
 .../ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml | 2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.cshtml
index f8bb6ee63..6893a7d48 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form.cshtml	
@@ -23,11 +23,11 @@
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title" id="idIQuota">定额<font face="宋体">*</font></div>
-        <input id="IQuota" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="IQuota" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage">
         <div class="lr-form-item-title" id="idIAmount">金额<font face="宋体">*</font></div>
-        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
    
     <div class="col-xs-12 lr-form-item"  data-table="FD_IncomeManage" >
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form2.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form2.cshtml
index 2ee9585f4..b24b6df3b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form2.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form2.cshtml	
@@ -18,16 +18,16 @@
         </div>*@
 
     <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage" id="divIActual">
-        <div class="lr-form-item-title">年度实际收入<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">年度实际收入</div>
         <input id="IActual" type="number" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage" id="divIActual">
-        <div class="lr-form-item-title">年度预计收入<font face="宋体">*</font></div>
+        <div class="lr-form-item-title">年度预计收入</div>
         <input id="IQuota" type="number" class="form-control" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FD_IncomeManage">
         <div class="lr-form-item-title" id="idIAmount">金额<font face="宋体">*</font></div>
-        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="FD_IncomeManage">
         <div class="lr-form-item-title">备注</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form3.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form3.cshtml
index d18d5f34f..d2699719d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form3.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_IncomeManage/Form3.cshtml	
@@ -23,11 +23,11 @@
   
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage" >
         <div class="lr-form-item-title" id="idIQuota">申报金额<font face="宋体">*</font></div>
-        <input id="IQuota" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="IQuota" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-6 lr-form-item"  data-table="FD_IncomeManage">
         <div class="lr-form-item-title" id="idIAmount">批复金额<font face="宋体">*</font></div>
-        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="IAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
    
     <div class="col-xs-12 lr-form-item"  data-table="FD_IncomeManage" >
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml
index bb68cbe6f..bd9ae600f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/ReceiveSendFeeManagement/Views/FD_PayManage/Form.cshtml	
@@ -57,7 +57,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FD_PayManage" >
         <div class="lr-form-item-title">支出金额<font face="宋体">*</font></div>
-        <input id="PAmount" type="text" class="form-control" isvalid="yes" checkexpession="Num" />
+        <input id="PAmount" type="number" class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="FD_PayManage">
         <div class="lr-form-item-title">附件上传</div>