From 159549756308eec327d60d30331fca737360f6eb Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Wed, 2 Aug 2023 16:54:26 +0800
Subject: [PATCH] =?UTF-8?q?=E6=89=93=E5=8D=B0bug=E4=BF=AE=E5=A4=8D?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml    | 2 +-
 .../Views/Purchase_Edu_Apply/FormView.js                  | 6 +++---
 .../Views/Purchase_Info_Apply/FormView.js                 | 6 +++---
 .../Views/Purchase_Logistic_Apply/FormView.js             | 6 +++---
 .../Views/Purchase_Other_Apply/FormView.js                | 6 +++---
 .../Views/Purchase_Print_Apply/FormView.js                | 6 +++---
 .../Views/Purchase_Service_Apply/FormView.js              | 6 +++---
 .../Views/Purchase_Student/FormView.cshtml                | 6 +++---
 .../Views/Purchase_Student_Apply/FormView.js              | 6 +++---
 .../Views/Purchase_Travel_Apply/FormView.js               | 6 +++---
 .../Views/Purchase_Work_Apply/FormView.js                 | 6 +++---
 .../Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs | 2 +-
 .../Purchase_Travel_ApplydetailsEntity.cs                 | 8 +++++---
 13 files changed, 37 insertions(+), 35 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml
index 65d50ce89..a3f685c26 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.cshtml	
@@ -18,7 +18,7 @@
 </style>
 @Html.AppendCssFile("/Areas/LR_NewWorkFlow/Views/NWFProcess/MonitorForm.css")
 <div class="lr-layout-panel-btn">
-    <a id="print" class="btn btn-primary">打印表单</a>
+    @*<a id="print" class="btn btn-primary">打印表单</a>*@
 </div>
 <div class="lr-layout-panel">
     <div class="tab-pane" id="forminfo">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js
index 063974ed6..c90e0cb67 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js
index 1f5158728..abf0bca47 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js
index 66e22108c..2500cb01b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js
index c692e75cc..68dc62529 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js
index 42184039e..92f842ac1 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js
index c16033cff..63d84b98f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml
index 19c48867f..2cbca3b48 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.cshtml	
@@ -23,11 +23,11 @@
 </style>
 <div class="lr-form-wrap" id="form">
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Student" style="display:none">
-        <input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        @*<input id="Status" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="ApplyStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CheckStatus" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
         <input id="CreateTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
-        <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
+        <input id="SubmitTime" type="text" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />*@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
@@ -36,7 +36,7 @@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
         <div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
-        <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly />
+        <input id="CreatorId" type="text" readonly class="form-control currentInfo lr-currentInfo-user"  />
         @*<input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" readonly style="display:none" />*@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Student">
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js
index d67948fe4..c448c0e84 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js
index 971fe96c3..3a2ae2999 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js
index cad546f73..17bc6eeae 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FormView.js	
@@ -42,9 +42,9 @@ var bootstrap = function ($, learun) {
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
                     },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    }
+                    //{
+                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
+                    //}
                 ],
                 //isEdit:true,
                 isSubGrid: true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs
index b7a8ab0eb..5fac0338e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs	
@@ -101,7 +101,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         {
             try
             {
-                string sql = "select a.*,b.Remark,b.Createtime,b.totalamount from Purchase_Travel_Applydetails a left join Purchase_Travel b on b.id=a.purchaseid where applyid='"+keyValue+"'";
+                string sql = "select a.*,b.Follows,b.Reason,b.starttime,b.endtime  from Purchase_Travel_Applydetails a left join Purchase_Travel b on b.id=a.purchaseid where applyid='"+keyValue+"'";
                 var data = this.BaseRepository("CollegeMIS").FindList<Purchase_Travel_ApplydetailsEntity>(sql);// as List<Purchase_Travel_ApplydetailsEntity>;
                 //this.BaseRepository("CollegeMIS").FindList<Purchase_Travel_ApplydetailsEntity>(t => t.applyid == keyValue);
                 return data;
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs
index d0a4e3beb..038aed0d0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplydetailsEntity.cs	
@@ -50,11 +50,13 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         #endregion
 
         [NotMapped]
-        public string Remark { set; get; }
+        public string Reason { set; get; }
         [NotMapped]
-        public double TotalAmount { set; get; }
+        public double Follow { set; get; }
         [NotMapped]
-        public string CreateTime { set; get; }
+        public string Starttime { set; get; }
+        [NotMapped]
+        public string Endtime { set; get; }
     }
 }