From f586ac3d4538551b4484bd5347ba11a4a866ecb2 Mon Sep 17 00:00:00 2001
From: ndbs <nabs@LAPTOP-FJ5VQJ6J>
Date: Tue, 13 Dec 2022 11:38:58 +0800
Subject: [PATCH] =?UTF-8?q?=E7=BB=8F=E8=B4=B9=E5=BC=80=E6=94=AF=E4=BC=98?=
 =?UTF-8?q?=E5=8C=96?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/FundsApply/Form.cshtml              | 18 +++++------
 .../Views/FundsApply/FormView.cshtml          | 30 +++++++++----------
 .../LearunApp-2.2.0/config.js                 |  8 ++---
 3 files changed, 28 insertions(+), 28 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 058520a7c..107033884 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	
@@ -23,7 +23,7 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">是否固定资产<font face="宋体">*</font></div>
-        <div id="IsFixedAssets" isvalid="yes" checkexpession="NotNull" ></div>
+        <div id="IsFixedAssets" isvalid="yes" checkexpession="NotNull"></div>
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">填报人</div>
@@ -33,6 +33,14 @@
         <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="新增明细" />
@@ -42,13 +50,5 @@
     <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 460a3e5d5..84b0fadcd 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	
@@ -5,23 +5,23 @@
 <script>
     var NewEnCode = "@ViewBag.EnCode";
 </script>
-<div class="lr-form-wrap" id="form"> 
+<div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item">
         <div style="padding: 10px 10px 20px 10px; text-align: center; font-size: 25px; font-weight: bold; color: rgb(51, 51, 51);">经费开支申报单</div>
-    </div> 
-    <div class="col-xs-6 lr-form-item"  data-table="FundsApply">
+    </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" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FundsApply">
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">申报部门</div>
         <div id="ApplyDept" readonly></div>
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FundsApply">
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">填报时间</div>
         <input id="ApplyTime" type="text" readonly class="form-control currentInfo lr-currentInfo-time" />
     </div>
-    <div class="col-xs-6 lr-form-item"  data-table="FundsApply">
+    <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">是否固定资产</div>
         <div id="IsFixedAssets" readonly="readonly"></div>
     </div>
@@ -31,7 +31,15 @@
     </div>
     <div class="col-xs-6 lr-form-item" data-table="FundsApply">
         <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" class="form-control"  readonly="readonly"/>
+        <input id="Remark" 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="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>
@@ -42,13 +50,5 @@
     <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/FormView.js")
diff --git a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js
index f9381f03d..42655f0d3 100644
--- a/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
+++ b/Learun.Framework.Ultimate V7/LearunApp-2.2.0/config.js	
@@ -21,13 +21,13 @@ export default {
   //   "http://192.168.2.98:8088/"
   // ],
   "apiHost": [
-    // "http://cyzjzx.gnway.cc:31218/"//测试地址接口
+    "http://cyzjzx.gnway.cc:31218/"//测试地址接口
 	// "http://219.139.155.38:8687/"//正式地址接口
-	 "http://192.168.10.175:8088/"
+	 // "http://192.168.10.175:8088/"
   ],
-  // "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
+  "webHost":"http://cyzjzx.gnway.cc:30549/",//测试地址
   // "webHost":"http://wxd3f.cyzjzx.com/",//正式地址
-  "webHost":"http://192.168.10.175:8087/",
+  // "webHost":"http://192.168.10.175:8087/",
   // 开发环境下自动填充登录账号密码，与接口地址一一对应，只在开发环境下显示
   "devAccount": [
 	  // 20201130230 21364200000400266 老师 420528196310072253 学生 420528200606205026      420528200507261428