修复，状态不变，添加申报时间字段

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml

@@ -28,17 +28,22 @@
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">开始时间</div>
         @*<input id="Starttime" type="text" class="form-control" />*@
-        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" />
+        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" autocomplete="off"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">结束时间</div>
         @*<input id="Endtime" type="text" class="form-control" />*@
-        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" />
+        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" autocomplete="off"/>
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">出差地点</div>
         <input id="TravelAddress" type="text" class="form-control" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">申报时间</div>
+        <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CreateTime').trigger('change'); } })" autocomplete="off"/>
+        @*<input id="CreateTime" type="text" class="form-control" />*@
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">附件上传</div>
         <div id="FilePath"></div>

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Form.cshtml

@@ -6,26 +6,31 @@
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
         <div class="lr-form-item-title">部门<font face="宋体">*</font></div>
         <input id="DepartmentId" type="text" readonly class="form-control currentInfo lr-currentInfo-department" isvalid="yes" checkexpession="NotNull" />
-        <input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" style="display:none"/>
+        <input id="DepartmentName" type="text" class="form-control currentInfo lr-currentInfo-department" style="display:none" />
+    </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">申报时间</div>
+        <input id="CreateTime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#CreateTime').trigger('change'); } })" autocomplete="off" />
+        @*<input id="CreateTime" type="text" class="form-control" />*@
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
         <div class="lr-form-item-title">申请人<font face="宋体">*</font></div>
         <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" style="display:none"/>
+        <input id="CreatorName" type="text" readonly class="form-control currentInfo lr-currentInfo-user" style="display:none" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Purchase_Work" >
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
         <div class="lr-form-item-title">总价格<font face="宋体">*</font></div>
         <input id="TotalAmount" type="number" readonly class="form-control" isvalid="yes" checkexpession="NotNull" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Purchase_Work" >
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
         <div class="lr-form-item-title">备注</div>
-        <input id="Remark" type="text" class="form-control"  />
+        <input id="Remark" type="text" class="form-control" />
     </div>
-    <div class="col-xs-12 lr-form-item"  data-table="Purchase_Work" >
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Work">
         <div class="lr-form-item-title">附件上传</div>
-        <div id="FilePath"  ></div>
+        <div id="FilePath"></div>
     </div>
-    <div class="col-xs-12 lr-form-item lr-form-item-grid" >
+    <div class="col-xs-12 lr-form-item lr-form-item-grid">
         <div id="Purchase_Work_Details"></div>
     </div>
 </div>

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs

@@ -378,7 +378,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceEntity.cs

@@ -108,7 +108,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
-            this.CreateTime = DateTime.Now;
+            //this.CreateTime = DateTime.Now;
             this.Status = 0;
             this.CheckStatus = 0;
             this.ApplyStatus = 0;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs

@@ -378,7 +378,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyEntity.cs

@@ -65,6 +65,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("APPROVALAMOUNT")]
         public decimal? Approvalamount { get; set; }
         /// <summary>
+        /// 核准金额编辑状态
+        /// </summary>
+        [Column("EDITSTATE")]
+        public int editstate { get; set; }
+        /// <summary>
         /// Status
         /// </summary>
         [Column("STATUS")]
@@ -108,6 +113,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
+            this.editstate = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs

@@ -122,7 +122,7 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
-            this.CreateTime = DateTime.Now;
+            //this.CreateTime = DateTime.Now;
             this.Status = 0;
             this.CheckStatus = 0;
             this.ApplyStatus = 0;

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs

@@ -322,7 +322,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyEntity.cs

@@ -65,6 +65,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         [Column("APPROVALAMOUNT")]
         public decimal? Approvalamount { get; set; }
         /// <summary>
+        /// 核准金额编辑状态
+        /// </summary>
+        [Column("EDITSTATE")]
+        public int editstate { get; set; }
+        /// <summary>
         /// Status
         /// </summary>
         [Column("STATUS")]
@@ -108,6 +113,9 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
+            this.editstate = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel_Apply/Purchase_Travel_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs

@@ -327,7 +327,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     //审核通过
                     if (status == 2)
                     {
-
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs

@@ -108,6 +108,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         public void Create()
         {
             this.Id = Guid.NewGuid().ToString();
+            this.Status = 0;
+            this.CheckStatus = 0;
         }
         /// <summary>
         /// 编辑调用

Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs

@@ -364,6 +364,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                             purchasemodel.ApplyStatus = 2;
                             db.Update(purchasemodel);
                         }
+                        if (entity.Status != 1)
+                        {
+                            entity.Status = 1;
+                        }
                     }
                     else
                     {