From 111b87f042d13414ec3bd68567258e8b1c06e87d Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Thu, 8 Dec 2022 10:49:38 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF=E7=94=B3?=
 =?UTF-8?q?=E6=8A=A5=E5=8D=95=20=E9=87=91=E9=A2=9D=E8=BF=BD=E5=8A=A0?=
 =?UTF-8?q?=E4=BF=A9=E4=BD=8D=E5=B0=8F=E6=95=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../AssetManagementSystem/Views/FundsApply/Form.cshtml |  2 +-
 .../Views/FundsApply/FormView.cshtml                   |  2 +-
 .../AssetManagementSystem/Views/FundsApply/Index.js    |  8 ++++----
 .../Views/FundsApplyDetail/Form.cshtml                 |  2 +-
 .../Views/FundsApplyDetail/Form.js                     | 10 ++++++++++
 5 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml
index 4ca450c9a..3ca60a42f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Form.cshtml	
@@ -30,7 +30,7 @@
         <input id="ApplyUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">备注</div>
+        <div class="lr-form-item-title">申报人</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
     <div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml
index 9c99bb763..6fc7fc5a7 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/FormView.cshtml	
@@ -30,7 +30,7 @@
         <input id="ApplyUser" type="text" readonly class="form-control currentInfo lr-currentInfo-user" />
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">备注</div>
+        <div class="lr-form-item-title">申报人</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
     @*<div class="col-xs-12 lr-form-item">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js
index 0777b70a6..6d77f184f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApply/Index.js	
@@ -58,7 +58,7 @@ var bootstrap = function ($, learun) {
                     title: '申请',
                     url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/Form',
                     width: 860,
-                    height: 750,
+                    height: 780,
                     callBack: function (id) {
                         var res = false;
                         // 验证数据
@@ -90,7 +90,7 @@ var bootstrap = function ($, learun) {
                         title: '编辑',
                         url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/Form?keyValue=' + keyValue,
                         width: 860,
-                        height: 750,
+                        height: 780,
                         callBack: function (id) {
                             var res = false;
                             // 验证数据
@@ -156,7 +156,7 @@ var bootstrap = function ($, learun) {
                         title: '查看',
                         url: top.$.rootUrl + '/AssetManagementSystem/FundsApply/FormView?keyValue=' + keyValue,
                         width: 860,
-                        height: 720,
+                        height: 730,
                         callBack: function (id) {
 
                         }
@@ -193,7 +193,7 @@ var bootstrap = function ($, learun) {
                             });
                         }
                     },
-                    { label: "备注", name: "Remark", width: 100, align: "left" },
+                    { label: "申报人", name: "Remark", width: 100, align: "left" },
                     { label: "总金额", name: "SumAmount", width: 100, align: "left" },
                     { label: "人民币（大写）", name: "UpperAmount", width: 200, align: "left" },
                     {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml
index 4a76ed5f1..1fbb4ca22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.cshtml	
@@ -13,7 +13,7 @@
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
         <div class="lr-form-item-title">单价（元）<font face="宋体">*</font></div>
-        <input id="Price" type="text" class="form-control calcul" isvalid="yes" checkexpession="PositiveFloatintZero"  />
+        <input id="Price" type="text" class="form-control calcul"  isvalid="yes" checkexpession="NotNull" />
     </div>
     <div class="col-xs-12 lr-form-item"  data-table="FundsApplyDetail" >
         <div class="lr-form-item-title">金额（元）</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js
index ef5c48880..beefe134b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/AssetManagementSystem/Views/FundsApplyDetail/Form.js	
@@ -20,6 +20,16 @@ var bootstrap = function ($, learun) {
             $('.calcul').blur(function () {
                 var num = $('#Number').val();
                 var Price = $('#Price').val();
+                if (!!Price) {
+                    let regNeg = /^(0|[1-9]\d*|(0|[1-9]\d*)\.\d*[1-9])$/;
+                    if (regNeg.test(Price)) {
+                        $('#Price').val(parseFloat(Price).toFixed(2));
+                    } else {
+                        $('#Price').val('');
+                        learun.alert.warning("单价必须为整数或小数(不能为负数)!");
+                        return false;
+                    }
+                }
                 if (!!num && !!Price) {
                     $('#Amount').val((parseInt(num) * parseFloat(Price)).toFixed(2));
                 }