From cc1ec46e09388e3cd0d97019177bb85e6a33dab5 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Mon, 5 Dec 2022 17:20:05 +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=E8=A1=A8=E5=8D=95=E6=A0=B7=E5=BC=8F=E8=B0=83=E6=95=B4?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/FundsApply/Form.cshtml              | 18 ++++++++---------
 .../Views/FundsApply/FormView.cshtml          | 20 +++++++++----------
 .../Views/FundsApply/Index.js                 |  6 +++---
 3 files changed, 22 insertions(+), 22 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 907fcd77e..32959c547 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	
@@ -6,7 +6,7 @@
     var NewEnCode = "@ViewBag.EnCode";
 </script>
 <div class="lr-form-wrap" id="form">
-
+    <div style="padding: 0px; padding-left:30px; line-height: 38px; text-align: center; font-size: 24px; font-weight: bold; color: rgb(51, 51, 51);">经费开支申报单</div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">申报单号</div>
         <input id="EnCode" type="text" readonly class="form-control" readonly="readonly" />
@@ -31,14 +31,6 @@
         <div class="lr-form-item-title">备注</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
-    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">总金额</div>
-        <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
-    </div>
-    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
-        <div class="lr-form-item-title">人民币（大写）</div>
-        <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
-    </div>
     <div class="col-xs-12 lr-form-item">
         <div class="lr-form-item-title">明细操作</div>
         <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
@@ -48,5 +40,13 @@
     <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="FundsApplyDetail"></div>
     </div>
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
+        <div class="lr-form-item-title">总金额</div>
+        <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
+    </div>
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
+        <div class="lr-form-item-title">人民币（大写）</div>
+        <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
+    </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/Form.js")
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 77e8a894a..971afdb82 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	
@@ -6,7 +6,7 @@
     var NewEnCode = "@ViewBag.EnCode";
 </script>
 <div class="lr-form-wrap" id="form">
-
+    <div style="padding: 0px; line-height: 38px; text-align: center; font-size: 20px; font-weight: bold; color: rgb(51, 51, 51);">经费开支申报单</div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">申报单号</div>
         <input id="EnCode" type="text" readonly class="form-control" readonly="readonly" />
@@ -31,6 +31,15 @@
         <div class="lr-form-item-title">备注</div>
         <input id="Remark" type="text" class="form-control" />
     </div>
+    @*<div class="col-xs-12 lr-form-item">
+            <div class="lr-form-item-title">明细操作</div>
+            <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
+            <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
+            <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
+        </div>*@
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
+        <div id="FundsApplyDetail"></div>
+    </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">总金额</div>
         <input id="SumAmount" type="text" class="form-control" readonly="readonly" />
@@ -39,14 +48,5 @@
         <div class="lr-form-item-title">人民币（大写）</div>
         <input id="UpperAmount" type="text" class="form-control" readonly="readonly" />
     </div>
-    @*<div class="col-xs-12 lr-form-item">
-        <div class="lr-form-item-title">明细操作</div>
-        <input id="detailadd" type="button" class="btn btn-success" value="新增明细" />
-        <input id="detailedit" type="button" class="btn btn-warning" value="编辑明细" />
-        <input id="detaildel" type="button" class="btn btn-danger" value="移除明细" />
-    </div>*@
-    <div class="col-xs-12 lr-form-item lr-form-item-grid">
-        <div id="FundsApplyDetail"></div>
-    </div>
 </div>
 @Html.AppendJsFile("/Areas/AssetManagementSystem/Views/FundsApply/FormView.js")
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 90f3fa408..0777b70a6 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: 600,
+                    height: 750,
                     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: 600,
+                        height: 750,
                         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: 600,
+                        height: 720,
                         callBack: function (id) {
 
                         }