只看自己提交的数据

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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,

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,

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

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

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

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,

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

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>

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>

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

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

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);
 
     };
     // 保存数据

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 () {

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

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

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

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

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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)

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>

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)

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)

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)

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)