From 5a25d1e679d52201310736dbcfb4b45d645b6e16 Mon Sep 17 00:00:00 2001
From: hwh2023 <598694955@qq.com>
Date: Thu, 3 Aug 2023 15:23:40 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=AA=E7=9C=8B=E8=87=AA=E5=B7=B1=E6=8F=90?=
 =?UTF-8?q?=E4=BA=A4=E7=9A=84=E6=95=B0=E6=8D=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Views/Purchase_Edu/Index.js               |  1 +
 .../Views/Purchase_Edu_Apply/FindBack.js      |  1 +
 .../Views/Purchase_Edu_Apply/Index.js         |  1 +
 .../Views/Purchase_Info/Index.js              |  1 +
 .../Views/Purchase_Info_Apply/FindBack.js     |  1 +
 .../Views/Purchase_Info_Apply/Index.js        |  1 +
 .../Views/Purchase_Logistic/Index.js          |  1 +
 .../Views/Purchase_Logistic_Apply/FindBack.js |  1 +
 .../Views/Purchase_Logistic_Apply/Index.js    |  1 +
 .../Views/Purchase_Other/Index.js             |  1 +
 .../Views/Purchase_Other_Apply/FindBack.js    |  1 +
 .../Views/Purchase_Other_Apply/Index.js       |  1 +
 .../Views/Purchase_Print/Index.js             |  1 +
 .../Views/Purchase_Print_Apply/FindBack.js    |  1 +
 .../Views/Purchase_Print_Apply/Index.js       |  1 +
 .../Views/Purchase_Service/Index.js           |  1 +
 .../Views/Purchase_Service_Apply/FindBack.js  |  1 +
 .../Views/Purchase_Service_Apply/Form.js      | 16 ++----
 .../Views/Purchase_Service_Apply/FormView.js  | 18 +++---
 .../Views/Purchase_Service_Apply/Index.js     |  1 +
 .../Views/Purchase_Student/Index.js           |  1 +
 .../Views/Purchase_Student_Apply/FindBack.js  |  1 +
 .../Views/Purchase_Student_Apply/Form.js      |  3 -
 .../Views/Purchase_Student_Apply/Index.js     |  1 +
 .../Views/Purchase_Travel/Form.cshtml         |  8 +++
 .../Views/Purchase_Travel/FormView.cshtml     | 16 ++++--
 .../Views/Purchase_Travel/Index.js            |  1 +
 .../Views/Purchase_Travel_Apply/FindBack.js   |  1 +
 .../Views/Purchase_Travel_Apply/Form.js       | 55 ++++++-------------
 .../Views/Purchase_Travel_Apply/FormView.js   | 40 +++++---------
 .../Views/Purchase_Travel_Apply/Index.js      |  1 +
 .../Views/Purchase_Work/Index.js              |  1 +
 .../Views/Purchase_Work_Apply/FindBack.js     |  1 +
 .../Views/Purchase_Work_Apply/Index.js        |  1 +
 .../Purchase_Edu/Purchase_EduService.cs       |  6 ++
 .../Purchase_Edu_ApplyService.cs              |  6 ++
 .../Purchase_Info/Purchase_InfoService.cs     |  6 ++
 .../Purchase_Info_ApplyService.cs             |  6 ++
 .../Purchase_LogisticService.cs               |  6 ++
 .../Purchase_Logistic_ApplyService.cs         |  6 ++
 .../Purchase_Other/Purchase_OtherService.cs   |  6 ++
 .../Purchase_Other_ApplyService.cs            |  6 ++
 .../Purchase_Print/Purchase_PrintService.cs   |  6 ++
 .../Purchase_Print_ApplyService.cs            |  6 ++
 .../Purchase_ServiceService.cs                |  6 ++
 .../Purchase_Service_ApplyService.cs          |  6 ++
 .../Purchase_StudentService.cs                |  6 ++
 .../Purchase_Student_ApplyService.cs          |  6 ++
 .../Purchase_Travel/Purchase_TravelEntity.cs  | 10 ++++
 .../Purchase_Travel/Purchase_TravelService.cs |  8 +++
 .../Purchase_Travel_ApplyService.cs           |  6 ++
 .../Purchase_Work/Purchase_WorkService.cs     |  6 ++
 .../Purchase_Work_ApplyService.cs             |  6 ++
 53 files changed, 211 insertions(+), 92 deletions(-)

diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js
index 80875cf96..48cbb566f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.js	
@@ -251,6 +251,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js
index 5c899d11e..057bab5bb 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js
index e33a4f33e..dedf707a8 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js
index bddc4a4e3..505e8c958 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js
index 89ef0ff87..ac4e3a80f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js
index 07eed27a3..73ad89a47 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js
index 89e9aafbe..c970fb708 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js
index 8248fd650..5378e69f6 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js
index db3a29bb2..c2d1c693e 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js
index 1e02665bd..79364fd21 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js
index 5b5568cca..43aea8a93 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js
index 68fca83d7..5d5b4d99d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js
index 25f44f69d..e65707c22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js
index d3a3727b4..ff166f115 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js
index d74cba8f1..e7138fb53 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js
index b3c181dfe..e51f72e00 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service/Index.js	
@@ -251,6 +251,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js
index 10c2db425..61deb922f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/FindBack.js	
@@ -160,6 +160,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Form.js
index e2c773562..8a79cbb60 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Form.js	
@@ -65,20 +65,16 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Service_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '备注', name: 'Remark', width: 120, align: 'left'
                     },
                     {
                         label: '金额', name: 'TotalAmount', width: 120, align: 'left'
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
                     }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
                 mainId:'purchaseid',
                 height: 400,
                 isSubGrid: true,
@@ -86,11 +82,11 @@ var bootstrap = function ($, learun) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Purchase_Service/GetFormDetailData?keyValue=' + rowItem.purchaseid,
                         headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
+                            { label: "劳务维修内容", name: "ServiceContent", width: 100, align: "left" },
+                            { label: "估值", name: "Price", width: 130, align: "left" },
+                            { label: "人数", name: "Peoplecount", width: 100, align: "left" },
+                            { label: "天数", name: "Days", width: 150, align: "left" },
+                            { label: "标准", name: "Standar", width: 150, align: "left", },
                         ],
                         mainId: 'LessonNo',
                         isPage: false,
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 63d84b98f..dad264eca 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	
@@ -34,20 +34,16 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Service_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '备注', name: 'Remark', width: 120, align: 'left'
                     },
                     {
                         label: '金额', name: 'TotalAmount', width: 120, align: 'left'
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    //{
-                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    //}
+                    }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
                 mainId: 'purchaseid',
                 height: 400,
                 isSubGrid: true,
@@ -55,11 +51,11 @@ var bootstrap = function ($, learun) {
                     $('#' + subContentId).jfGrid({
                         url: top.$.rootUrl + '/LogisticsManagement/Purchase_Service/GetFormDetailData?keyValue=' + rowItem.purchaseid,
                         headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
+                            { label: "劳务维修内容", name: "ServiceContent", width: 100, align: "left" },
+                            { label: "估值", name: "Price", width: 130, align: "left" },
+                            { label: "人数", name: "Peoplecount", width: 100, align: "left" },
+                            { label: "天数", name: "Days", width: 150, align: "left" },
+                            { label: "标准", name: "Standar", width: 150, align: "left", },
                         ],
                         mainId: 'LessonNo',
                         isPage: false,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js
index ba5c2a22a..d9d7beeaa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Service_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js
index 77d478e4b..0640d279a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js
index 04d84237f..8d62a59bf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js
index 3dcb88fd8..9a175347a 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Form.js	
@@ -72,9 +72,6 @@ var bootstrap = function ($, learun) {
                     },
                     {
                         label: '时间', name: 'CreateTime', width: 120, align: 'left'
-                    },
-                    {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
                     }
                 ],
                 //isEdit:true,
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js
index 0054c2cbe..0f1ce3566 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml
index 273bfd193..4f2c473f0 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Form.cshtml	
@@ -13,6 +13,10 @@
         <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" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差人员<font face="宋体">*</font></div>
+        <input id="Traveler" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">随行人员<font face="宋体">*</font></div>
         <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" />
@@ -31,6 +35,10 @@
         @*<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'); } })" />
     </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>
         <div id="FilePath"></div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml
index 8a3195393..983b5fbb9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/FormView.cshtml	
@@ -31,23 +31,31 @@
         <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" />
     </div>
+    <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
+        <div class="lr-form-item-title">出差人员<font face="宋体">*</font></div>
+        <input id="Traveler" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
+    </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">随行人员<font face="宋体">*</font></div>
-        <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly/>
+        <input id="Follows" type="text" class="form-control" isvalid="yes" checkexpession="NotNull" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">出差原因</div>
-        <input id="Reason" type="text" class="form-control" readonly/>
+        <input id="Reason" type="text" class="form-control" readonly />
     </div>
     <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'); } })" readonly disabled/>
+        <input id="Starttime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Starttime').trigger('change'); } })" readonly disabled />
     </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'); } })" readonly disabled/>
+        <input id="Endtime" type="text" class="form-control lr-input-wdatepicker" onfocus="WdatePicker({ dateFmt:'yyyy-MM-dd',onpicked: function () { $('#Endtime').trigger('change'); } })" readonly disabled />
+    </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" readonly />
     </div>
     <div class="col-xs-12 lr-form-item" data-table="Purchase_Travel">
         <div class="lr-form-item-title">附件上传</div>
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js
index 6534b7981..a3573aef5 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel/Index.js	
@@ -246,6 +246,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload', { queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js
index a4a77eaa9..1934dd385 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/FindBack.js	
@@ -120,6 +120,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Form.js
index 1039dc9d2..edfd3261f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Form.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Form.js	
@@ -36,12 +36,7 @@ var bootstrap = function ($, learun) {
                 if (learun.checkrow(keyValue)) {
                     learun.layerConfirm('是否确认删除该项！', function (res, index) {
                         if (res) {
-                            $('#Purchase_Travel_applydetails').jfGridSet('removeRow', selectedRow.purchaseid);
-
-                            let totalamount = parseFloat($('#Totalamount').val());
-
-                            totalamount -= selectedRow.TotalAmount;
-                            $('#Totalamount').val(totalamount);
+                            $('#Purchase_Travel_applydetails').jfGridSet('removeRow', selectedRow.purchaseid);                            
                         }
                     });
                 }
@@ -65,42 +60,28 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Travel_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '出差人员', name: 'Traveler', width: 120, align: 'left'
+                    },
+                    {
+                        label: '随行人员', name: 'Follows', width: 120, align: 'left'
                     },
                     {
-                        label: '金额', name: 'TotalAmount', width: 120, align: 'left'
+                        label: '出差原因', name: 'Reason', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'CreateTime', width: 120, align: 'left'
+                        label: '出差地点', name: 'TravelAddress', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide:true
+                        label: '开始时间', name: 'Starttime', width: 120, align: 'left', 
+                    },
+                    {
+                        label: '结束时间', name: 'Endtime', width: 120, align: 'left',
                     }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
+                //isSubGrid: true,
                 mainId:'purchaseid',
                 height: 400,
-                isSubGrid: true,
-                subGridExpanded: function (subContentId, rowItem) {
-                    $('#' + subContentId).jfGrid({
-                        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.purchaseid,
-                        headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
-                        ],
-                        mainId: 'LessonNo',
-                        isPage: false,
-                        sidx: 'ReviewTime desc'
-                    });
-                    var param;
-                    param = param || {};
-                    param.StuNo = rowItem.StuNo;
-                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
-                }
             });
         },
         initData: function () {
@@ -122,7 +103,6 @@ var bootstrap = function ($, learun) {
     refreshGirdData = function (e) {
         //console.log(e)
         //计算总金额
-        let totalamount = 0;
         //清楚所有
         var datas = $('#Purchase_Travel_applydetails').jfGridGet('rowdatas').length
         for (var i = 0; i < datas; i++) {
@@ -132,15 +112,16 @@ var bootstrap = function ($, learun) {
         for (var i = 0; i < e.length; i++) {
             var itemdata = {
                 'Id': '',
-                'Remark': e[i].Remark,
-                'TotalAmount': e[i].TotalAmount,
-                'CreateTime': e[i].CreateTime,
+                'Traveler': e[i].Traveler,
+                'Follows': e[i].Follows,
+                'Reason': e[i].Reason,
+                'TravelAddress': e[i].TravelAddress,
+                'Starttime': e[i].Starttime,
+                'Endtime': e[i].Endtime,
                 'purchaseid': e[i].Id
             };
             $('#Purchase_Travel_applydetails').jfGridSet('addRow', itemdata);
-            totalamount += e[i].TotalAmount;
         }
-        $('#Totalamount').val(totalamount);
 
     };
     // 保存数据
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 3a2ae2999..b0451a664 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	
@@ -34,42 +34,28 @@ var bootstrap = function ($, learun) {
             $('#Purchase_Travel_applydetails').jfGrid({
                 headData: [
                     {
-                        label: '采购单备注', name: 'Remark', width: 120, align: 'left'
+                        label: '出差人员', name: 'Traveler', width: 120, align: 'left'
                     },
                     {
-                        label: '金额', name: 'TotalAmount', width: 120, align: 'left'
+                        label: '随行人员', name: 'Follows', width: 120, align: 'left'
                     },
                     {
-                        label: '时间', name: 'CreateTime', width: 120, align: 'left'
+                        label: '出差原因', name: 'Reason', width: 120, align: 'left'
                     },
-                    //{
-                    //    label: '时间', name: 'purchaseid', width: 120, align: 'left', ishide: true
-                    //}
+                    {
+                        label: '出差地点', name: 'TravelAddress', width: 120, align: 'left'
+                    },
+                    {
+                        label: '开始时间', name: 'Starttime', width: 120, align: 'left',
+                    },
+                    {
+                        label: '结束时间', name: 'Endtime', width: 120, align: 'left',
+                    }
                 ],
                 //isEdit:true,
-                isSubGrid: true,
+                //isSubGrid: true,
                 mainId: 'purchaseid',
                 height: 400,
-                isSubGrid: true,
-                subGridExpanded: function (subContentId, rowItem) {
-                    $('#' + subContentId).jfGrid({
-                        url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.purchaseid,
-                        headData: [
-                            { label: "采购物品名称", name: "Name", width: 100, align: "left" },
-                            { label: "价格", name: "Price", width: 130, align: "left" },
-                            { label: "采购数量", name: "Quantity", width: 100, align: "left" },
-                            { label: "单位", name: "Unit", width: 150, align: "left" },
-                            { label: "用途", name: "UseTo", width: 150, align: "left", },
-                        ],
-                        mainId: 'LessonNo',
-                        isPage: false,
-                        sidx: 'ReviewTime desc'
-                    });
-                    var param;
-                    param = param || {};
-                    param.StuNo = rowItem.StuNo;
-                    $('#' + subContentId).jfGridSet('reload', { queryJson: JSON.stringify(param) });
-                }
             });
         },
         initData: function () {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js
index b93e34a15..5c72a567f 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js
index ee93f7542..eef038dc4 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.js	
@@ -249,6 +249,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = logbegin;
             param.EndTime = logend;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js
index eeb962dbd..2b116c034 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/FindBack.js	
@@ -124,6 +124,7 @@ var bootstrap = function ($, learun) {
             param.EndTime = endTime;
             param.ApplyStatus = 0;
             param.CheckStatus = 2;
+            param.CreatorId = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js
index 8fecd8cae..6a6235fe2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js	
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.js	
@@ -228,6 +228,7 @@ var bootstrap = function ($, learun) {
             param = param || {};
             param.StartTime = startTime;
             param.EndTime = endTime;
+            param.Creator = learun.clientdata.get(['userinfo']).userId;
             $('#gridtable').jfGridSet('reload',{ queryJson: JSON.stringify(param) });
         }
     };
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs
index 6471e5300..bf185001d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu/Purchase_EduService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_EduEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs
index 3f534f20b..53887c47b 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Edu_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs
index 67e253617..60516fe9d 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info/Purchase_InfoService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_InfoEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs
index 98b0ad044..d485bed22 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Info_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs
index 75ea27310..3780c2380 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic/Purchase_LogisticService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_LogisticEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs
index 59e0963cc..783bec9df 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Logistic_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs
index ad6bb464b..445afb295 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other/Purchase_OtherService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_OtherEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs
index bf13f4318..f9f126caa 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Other_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs
index 29ea028d4..aa8dc30ce 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print/Purchase_PrintService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_PrintEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs
index ff2bf94c7..a4cb1bdd3 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Print_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs
index 108c104bc..47669bccf 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service/Purchase_ServiceService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_ServiceEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs
index 821155d4f..9b1c34e62 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Service_Apply/Purchase_Service_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Service_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs
index c85796eaa..d46c6a776 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student/Purchase_StudentService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_StudentEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs
index 9781d677b..e80661714 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Student_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs
index 057b68233..83a63a3b2 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelEntity.cs	
@@ -56,6 +56,16 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
         /// </summary>
         [Column("ENDTIME")]
         public DateTime? Endtime { get; set; }
+        /// <summary>
+        /// 出差人员
+        /// </summary>
+        [Column("TRAVELER")]
+        public string Traveler { get; set; }
+        /// <summary>
+        /// 出差地点
+        /// </summary>
+        [Column("TRAVELADDRESS")]
+        public string TravelAddress { get; set; }
 
 
         /// <summary>
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs
index 23809a7fe..55f031d49 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Travel/Purchase_TravelService.cs	
@@ -35,6 +35,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                 t.Id,
                 t.CreatorId,
                 t.CreatorName,
+                t.Traveler,
+                t.TravelAddress,
                 t.Follows,
                 t.Reason,
                 t.Starttime,
@@ -71,6 +73,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_TravelEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
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 5fac0338e..51fdfbca4 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	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Travel_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs
index dce0ed7bb..09492cec9 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work/Purchase_WorkService.cs	
@@ -71,6 +71,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("@CheckStatus", queryParam["CheckStatus"].ToString(), DbType.String);
                     strSql.Append(" AND (t.CheckStatus=@CheckStatus)");
                 }
+                if (!queryParam["CreatorId"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@CreatorId", queryParam["CreatorId"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.CreatorId=@CreatorId)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_WorkEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)
diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs
index a4b7fa1ed..798b31c79 100644
--- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs	
+++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyService.cs	
@@ -77,6 +77,12 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement
                     dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);
                     strSql.Append(" AND t.Payee Like @Payee ");
                 }
+                if (!queryParam["Creator"].IsEmpty())
+                {
+                    //申请人id
+                    dp.Add("@Creator", queryParam["Creator"].ToString(), DbType.String);
+                    strSql.Append(" AND (t.Creator=@Creator)");
+                }
                 return this.BaseRepository("CollegeMIS").FindList<Purchase_Work_ApplyEntity>(strSql.ToString(),dp, pagination);
             }
             catch (Exception ex)