Merge branch '娄底高职分支' of 123.57.209.16:bjquanjiang/DigitalScholl into 娄底高职分支

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">

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Form.js

@@ -150,7 +150,7 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Info_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Info_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_Info_applydetailsList = JSON.stringify($('#Purchase_Info_applydetails').jfGridGet('rowdatas'));
         postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Info"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Info_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Form.js

@@ -150,7 +150,7 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Logistic_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Logistic_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_Logistic_applydetailsList = JSON.stringify($('#Purchase_Logistic_applydetails').jfGridGet('rowdatas'));
         postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Logistic"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Logistic_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Form.js

@@ -150,8 +150,8 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Other_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Other_applydetails').jfGridGet('rowdatas'));
-        postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Other"]').lrGetFormData());
+        postData.strpurchase_Other_applydetailsList = JSON.stringify($('#Purchase_Other_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_OtherEntity = JSON.stringify($('[data-table="Purchase_Other"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Other_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Form.js

@@ -150,8 +150,8 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Print_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Print_applydetails').jfGridGet('rowdatas'));
-        postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Print"]').lrGetFormData());
+        postData.strpurchase_Print_applydetailsList = JSON.stringify($('#Purchase_Print_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_PrintEntity = JSON.stringify($('[data-table="Purchase_Print"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Print_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

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,

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,

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">

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/FormView.js

@@ -30,21 +30,6 @@ var bootstrap = function ($, learun) {
             page.initData();
         },
         bind: function () {
-            ////加载部门、用户
-            //$('#DepartmentId')[0].lrvalue = userinfo.departmentId;
-            //learun.clientdata.getAsync('department', {
-            //    key: userinfo.departmentId,
-            //    callback: function (_data) {
-            //        $('#DepartmentId').val(_data.name);
-            //        $('#DepartmentName')[0].lrvalue = _data.name;
-            //    }
-            //});
-            ////加载用户
-            //$('#CreatorId')[0].lrvalue = userinfo.userId;
-            //$('#CreatorName')[0].lrvalue = userinfo.realName;
-            //$('#CreatorId').val(userinfo.realName);
-
-
             $('#FilePath').lrUploader({ isUpload: false });
             $('#Purchase_Student_Details').jfGrid({
                 headData: [

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js

@@ -150,8 +150,8 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Student_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Student_applydetails').jfGridGet('rowdatas'));
-        postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Student"]').lrGetFormData());
+        postData.strpurchase_Student_applydetailsList = JSON.stringify($('#Purchase_Student_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_StudentEntity = JSON.stringify($('[data-table="Purchase_Student"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Student_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

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,

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Form.js

@@ -150,8 +150,8 @@ var bootstrap = function ($, learun) {
         }
         var postData = {};
         postData.strEntity = JSON.stringify($('[data-table="Purchase_Work_apply"]').lrGetFormData());
-        postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Work_applydetails').jfGridGet('rowdatas'));
-        postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Work"]').lrGetFormData());
+        postData.strpurchase_Work_applydetailsList = JSON.stringify($('#Purchase_Work_applydetails').jfGridGet('rowdatas'));
+        postData.strpurchase_WorkEntity = JSON.stringify($('[data-table="Purchase_Work"]').lrGetFormData());
         $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Work_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) {
             // 保存成功后才回调
             if (!!callBack) {

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,

Learun.Framework.Ultimate V7/Learun.Application.Web/XmlConfig/ioc.config

@@ -35,6 +35,7 @@
 		<typeAlias alias="MeetingManagementApplyMethod" type="Learun.Application.WorkFlow.MeetingManagementApplyMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="DispatchMethod" type="Learun.Application.WorkFlow.DispatchMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="ArrangeLessonTermAttemperMethod" type="Learun.Application.WorkFlow.ArrangeLessonTermAttemperMethod,Learun.Application.WorkFlow" />
+    
 		<typeAlias alias="PurchaseWorkMethod" type="Learun.Application.WorkFlow.PurchaseWorkMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchaseLogisticMethod" type="Learun.Application.WorkFlow.PurchaseLogisticMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchaseInfoMethod" type="Learun.Application.WorkFlow.PurchaseInfoMethod,Learun.Application.WorkFlow" />
@@ -42,7 +43,18 @@
 		<typeAlias alias="PurchaseOtherMethod" type="Learun.Application.WorkFlow.PurchaseOtherMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchaseEduMethod" type="Learun.Application.WorkFlow.PurchaseEduMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchasePrintMethod" type="Learun.Application.WorkFlow.PurchasePrintMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseServiceMethod" type="Learun.Application.WorkFlow.PurchaseServiceMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseTravelMethod" type="Learun.Application.WorkFlow.PurchaseTravelMethod,Learun.Application.WorkFlow" />
+    
+    <typeAlias alias="PurchaseWorkApplyMethod" type="Learun.Application.WorkFlow.PurchaseWorkApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseLogisticApplyMethod" type="Learun.Application.WorkFlow.PurchaseLogisticApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseInfoApplyMethod" type="Learun.Application.WorkFlow.PurchaseInfoApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseStudentApplyMethod" type="Learun.Application.WorkFlow.PurchaseStudentApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseOtherApplyMethod" type="Learun.Application.WorkFlow.PurchaseOtherApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseEduApplyMethod" type="Learun.Application.WorkFlow.PurchaseEduApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchasePrintApplyMethod" type="Learun.Application.WorkFlow.PurchasePrintApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseServiceApplyMethod" type="Learun.Application.WorkFlow.PurchaseServiceApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseTravelApplyMethod" type="Learun.Application.WorkFlow.PurchaseTravelApplyMethod,Learun.Application.WorkFlow" />
     
     
 		<typeAlias alias="StuLeaveManagementMethod" type="Learun.Application.WorkFlow.StuLeaveManagementMethod,Learun.Application.WorkFlow" />
@@ -96,14 +108,26 @@
 			<type type="IWorkFlowMethod" mapTo="MeetingManagementApplyMethod" name="MeetingManagementApplyMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="DispatchMethod" name="DispatchMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="ArrangeLessonTermAttemperMethod" name="ArrangeLessonTermAttemperMethod"></type>
+      
 			<type type="IWorkFlowMethod" mapTo="PurchaseWorkMethod" name="PurchaseWorkMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseLogisticMethod" name="PurchaseLogisticMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseInfoMethod" name="PurchaseInfoMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseStudentMethod" name="PurchaseStudentMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseOtherMethod" name="PurchaseOtherMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseEduMethod" name="PurchaseEduMethod"></type>
-			<type type="IWorkFlowMethod" mapTo="PurchasePrintMethod" name="PurchasePrintMethod"></type>
+			<type type="IWorkFlowMethod" mapTo="PurchaseServiceMethod" name="PurchaseServiceMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseTravelMethod" name="PurchaseTravelMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchasePrintMethod" name="PurchasePrintMethod"></type>
+      
+      <type type="IWorkFlowMethod" mapTo="PurchaseWorkApplyMethod" name="PurchaseWorkApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseLogisticApplyMethod" name="PurchaseLogisticApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseInfoApplyMethod" name="PurchaseInfoApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseStudentApplyMethod" name="PurchaseStudentApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseOtherApplyMethod" name="PurchaseOtherApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PurchaseEduApplyMethod" name="PurchaseEduApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseServiceApplyMethod" name="PurchaseServiceApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseTravelApplyMethod" name="PurchaseTravelApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchasePrintApplyMethod" name="PurchasePrintApplyMethod"></type>
       
       
 			<type type="IWorkFlowMethod" mapTo="StuLeaveManagementMethod" name="StuLeaveManagementMethod"></type>

Learun.Framework.Ultimate V7/Learun.Application.WebApi/XmlConfig/ioc.config

@@ -17,6 +17,8 @@
 		<typeAlias alias="PurchaseOtherMethod" type="Learun.Application.WorkFlow.PurchaseOtherMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchaseEduMethod" type="Learun.Application.WorkFlow.PurchaseEduMethod,Learun.Application.WorkFlow" />
 		<typeAlias alias="PurchasePrintMethod" type="Learun.Application.WorkFlow.PurchasePrintMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseTravelMethod" type="Learun.Application.WorkFlow.PurchaseTravelMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseServiceMethod" type="Learun.Application.WorkFlow.PurchaseServiceMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseEduApplyMethod" type="Learun.Application.WorkFlow.PurchaseEduApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseInfoApplyMethod" type="Learun.Application.WorkFlow.PurchaseInfoApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseLogisticApplyMethod" type="Learun.Application.WorkFlow.PurchaseLogisticApplyMethod,Learun.Application.WorkFlow" />
@@ -24,6 +26,8 @@
     <typeAlias alias="PurchasePrintApplyMethod" type="Learun.Application.WorkFlow.PurchasePrintApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseStudentApplyMethod" type="Learun.Application.WorkFlow.PurchaseStudentApplyMethod,Learun.Application.WorkFlow" />
     <typeAlias alias="PurchaseWorkApplyMethod" type="Learun.Application.WorkFlow.PurchaseWorkApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseTravelApplyMethod" type="Learun.Application.WorkFlow.PurchaseTravelApplyMethod,Learun.Application.WorkFlow" />
+    <typeAlias alias="PurchaseServiceApplyMethod" type="Learun.Application.WorkFlow.PurchaseServiceApplyMethod,Learun.Application.WorkFlow" />
 
 		<!--任务调度器-->
 		<typeAlias alias="ITSMethod" type="Learun.Application.Extention.TaskScheduling.ITsMethod,Learun.Application.Extention" />
@@ -49,6 +53,9 @@
 			<type type="IWorkFlowMethod" mapTo="PurchaseOtherMethod" name="PurchaseOtherMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchaseEduMethod" name="PurchaseEduMethod"></type>
 			<type type="IWorkFlowMethod" mapTo="PurchasePrintMethod" name="PurchasePrintMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseTravelMethod" name="PurchaseTravelMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseServiceMethod" name="PurchaseServiceMethod"></type>
+      
 			<type type="IWorkFlowMethod" mapTo="PurchaseEduApplyMethod" name="PurchaseEduApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PurchaseInfoApplyMethod" name="PurchaseInfoApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PurchaseLogisticApplyMethod" name="PurchaseLogisticApplyMethod"></type>
@@ -56,7 +63,9 @@
       <type type="IWorkFlowMethod" mapTo="PurchasePrintApplyMethod" name="PurchasePrintApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PurchaseStudentApplyMethod" name="PurchaseStudentApplyMethod"></type>
       <type type="IWorkFlowMethod" mapTo="PurchaseWorkApplyMethod" name="PurchaseWorkApplyMethod"></type>
-		</container>
+      <type type="IWorkFlowMethod" mapTo="PurchaseTravelApplyMethod" name="PurchaseTravelApplyMethod"></type>
+      <type type="IWorkFlowMethod" mapTo="PurchaseServiceApplyMethod" name="PurchaseServiceApplyMethod"></type>
+    </container>
 		<container name="TsIOCcontainer">
 			<!--<type type="ITSMethod" mapTo="TestTask" name="taskioc"></type>-->
 		</container>

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

@@ -326,7 +326,6 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     {
                         entity.Status = status;
                     }
-
                     //更新课程异动表的审核状态
                     entity.CheckStatus = status;
                     entity.CheckUserId = loginUserInfo.userId;

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;

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; }
     }
 }