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 86f6070a0..bb85c7a69 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
@@ -48,7 +48,7 @@ var bootstrap = function ($, learun) {
page.search(queryJson);
}, 220, 400);
$('#DepartmentId').lrDepartmentSelect();
- $('#checkstatus').lrselect({
+ $('#CheckStatus').lrselect({
data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
text: 'text',
value: 'value',
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 477c86856..8a3195393 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
@@ -22,35 +22,36 @@
}
报账状态
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 7aadc3197..635d8eda4 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
@@ -46,7 +46,7 @@ var bootstrap = function ($, learun) {
$('#multiple_condition_query').lrMultipleQuery(function (queryJson) {
page.search(queryJson);
}, 220, 400);
- $('#checkstatus').lrselect({
+ $('#CheckStatus').lrselect({
data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }],
text: 'text',
value: 'value',
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 4c97f78ca..a4a77eaa9 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
@@ -58,20 +58,16 @@ var bootstrap = function ($, learun) {
$('#gridtable').jfGrid({
url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetPageList',
headData: [
- {
- label: "部门", name: "DepartmentId", width: 150, align: "left",
- formatter: function (cellvalue, row) {
- return row.DepartmentName;
- }
- },
{
label: "申请人", name: "CreatorId", width: 100, align: "left",
formatter: function (cellvalue, row) {
return row.CreatorName;
}
},
- { label: "总价格", name: "TotalAmount", width: 100, align: "left" },
- { label: "备注", name: "Remark", width: 100, align: "left" },
+ { label: "随行人员", name: "Follows", width: 100, align: "left" },
+ { label: "出差原因", name: "Reason", width: 100, align: "left" },
+ { label: "开始时间", name: "Starttime", width: 100, align: "left" },
+ { label: "结束时间", name: "Endtime", width: 100, align: "left" },
],
mainId: 'Id',
isPage: true,
@@ -96,26 +92,26 @@ var bootstrap = function ($, learun) {
}
console.log(list)
},
- isSubGrid: true,
- subGridExpanded: function (subContentId, rowItem) {
- $('#' + subContentId).jfGrid({
- url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.Id,
- 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) });
- }
+ //isSubGrid: true,
+ //subGridExpanded: function (subContentId, rowItem) {
+ // $('#' + subContentId).jfGrid({
+ // url: top.$.rootUrl + '/LogisticsManagement/Purchase_Travel/GetFormDetailData?keyValue=' + rowItem.Id,
+ // 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) });
+ //}
});
},
search: function (param) {
diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.cshtml
index 3dc1e733f..320ec3064 100644
--- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.cshtml
+++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Travel_Apply/Index.cshtml
@@ -19,7 +19,7 @@