diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml index 2ade3701f..715e76b72 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 91b273053..eb46e6a44 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 @@ -43,6 +43,20 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); + // 刷新 // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.js b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.js index 97f2f802d..abe3921db 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.js +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Form.js @@ -151,7 +151,7 @@ var bootstrap = function ($, learun) { var postData = {}; postData.strEntity = JSON.stringify($('[data-table="Purchase_Edu_apply"]').lrGetFormData()); postData.strpurchase_Edu_applydetailsList = JSON.stringify($('#Purchase_Edu_applydetails').jfGridGet('rowdatas')); - postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Edu"]').lrGetFormData()); + //postData.strpurchase_EduEntity = JSON.stringify($('[data-table="Purchase_Edu"]').lrGetFormData()); $.lrSaveForm(top.$.rootUrl + '/LogisticsManagement/Purchase_Edu_Apply/SaveForm?keyValue=' + keyValue, postData, function (res) { // 保存成功后才回调 if (!!callBack) { diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml index 68c8cf8a7..a4f4f5ad3 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 5bd2477eb..c2bc6fa65 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml index c4c08076c..dfc4ad85b 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 c646895ed..2ea8d6d9c 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml index f407956d7..815b9ecf7 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 24f3e6d2b..433c59ede 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml index 35a5c3af3..b51c5d1f4 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 a6c08bdcf..a73a13ff3 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml index 8105a217d..ff14011ff 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 c09b52105..1f6771441 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.cshtml index 339e5a3da..6cb2fbee0 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 c674f85b6..c9a1078aa 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml index 38c284168..a75d30e9a 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 13008974c..818fdc2a1 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml index f9e007185..ccdc4f77d 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 5f6f08063..5f7a30cf4 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml index c9a774c09..88fb6c2d8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 c7e98be01..4da03c204 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml index 332838cac..ecc3946ea 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 5328a5b5b..5cd119803 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml index 7773478ca..4896beb82 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 00de3bb60..86f6070a0 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,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml index 03138245e..bbeff6798 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml @@ -11,10 +11,22 @@
- -
-
-  查询 +
+
+
+
备注关键字
+ +
+
+
审核状态
+
+
+
+
报账状态
+
+
+
+
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 5c8d8545a..a597ced11 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 @@ -43,6 +43,19 @@ var bootstrap = function ($, learun) { page.search(); } }); + $('#multiple_condition_query').lrMultipleQuery(function (queryJson) { + page.search(queryJson); + }, 220, 400); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); + $('#ApplyStatus').lrselect({ + data: [{ text: '待报账', value: '0' }, { text: '报账中', value: '1' }, { text: '已报账', value: '2' }], + text: 'text', + value: 'value', + }); // 查询 $('#btn_Search').on('click', function () { var keyword = $('#txt_Keyword').val(); diff --git a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml index 809cd82ed..6a4d05f48 100644 --- a/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml +++ b/Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml @@ -17,6 +17,10 @@
填报部门
+
+
审核状态
+
+
收款人
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 68fb77fa9..e39538297 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 @@ -48,6 +48,11 @@ var bootstrap = function ($, learun) { page.search(queryJson); }, 220, 400); $('#DepartmentId').lrDepartmentSelect(); + $('#checkstatus').lrselect({ + data: [{ text: '待审核', value: '0' }, { text: '审核中', value: '1' }, { text: '已审核', value: '2' }], + text: 'text', + value: 'value', + }); // 刷新 $('#lr_refresh').on('click', function () { location.reload(); 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 9fc144ff1..72ea50e27 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 @@ -61,8 +61,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { //报账状态 //采购审批通过且报账状态为0的数据 - //dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); - strSql.Append(" AND (t.ApplyStatus=0 and CheckStatus=2)"); + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); } return this.BaseRepository("CollegeMIS").FindList(strSql.ToString(),dp, pagination); } 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 0336ded77..cb9259340 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Edu_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); diff --git a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs index 4561f5c06..4de6f2989 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Edu_Apply/Purchase_Edu_applyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 a6ac4e891..d04ee2f8a 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs index 0acba7105..bc8b63827 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Info_Apply/Purchase_Info_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 52d62a93c..654b12141 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Info_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); 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 36286cfde..378d24663 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs index d5c05b994..96dab2892 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Logistic_Apply/Purchase_Logistic_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 e4f74641d..9770d45c0 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Logistic_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); 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 6d7ce2609..0addacb25 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs index 4ee2f25b9..24074bf27 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Other_Apply/Purchase_Other_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 87e23727d..958b65c51 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Other_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); 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 5462301e9..ca0786aff 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs index b0de07c91..e11317722 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Print_Apply/Purchase_Print_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 106ef4865..53f32d62f 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Print_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); 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 e41fcb298..7bd5a929d 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs index 947ae37cf..323f30fa2 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Student_Apply/Purchase_Student_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 e73842001..b10e3c2be 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Student_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String); 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 39d00c7a7..1d3bafeee 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 @@ -57,6 +57,20 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("@remark", "%" + queryParam["keyword"].ToString() + "%", DbType.String); strSql.Append(" AND (t.remark Like @remark) "); } + if (!queryParam["ApplyStatus"].IsEmpty()) + { + //报账状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@ApplyStatus", queryParam["ApplyStatus"].ToString(), DbType.String); + strSql.Append(" AND (t.ApplyStatus=@ApplyStatus)"); + } + if (!queryParam["checkstatus"].IsEmpty()) + { + //审核状态 + //采购审批通过且报账状态为0的数据 + dp.Add("@CheckStatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND (t.CheckStatus=@CheckStatus)"); + } return this.BaseRepository("CollegeMIS").FindList(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_ApplyEntity.cs b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs index 7d873cad0..2d9e204a8 100644 --- a/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs +++ b/Learun.Framework.Ultimate V7/Learun.Framework.Module/Learun.Application.Module/Learun.Application.TwoDevelopment/LogisticsManagement/Purchase_Work_Apply/Purchase_Work_ApplyEntity.cs @@ -119,6 +119,10 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement } #endregion #region 扩展字段 + [NotMapped] + public string deptname { set; get; } + [NotMapped] + public string creatorname { set; get; } #endregion } } 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 58d2d7113..e6e2fe3cf 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 @@ -29,12 +29,15 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement { try { + var database = this.BaseRepository().getDbConnection().Database; var strSql = new StringBuilder(); strSql.Append("SELECT "); strSql.Append(@" t.Id, t.DepartmentId, + c.f_fullname as deptname, t.Creator, + b.f_realname as creatorname, t.Createtime, t.Payee, t.Attachcount, @@ -47,6 +50,8 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement t.checkstatus "); strSql.Append(" FROM Purchase_Work_Apply t "); + strSql.Append(" left join " + database + ".dbo.LR_Base_User b on b.F_UserId=t.creator "); + strSql.Append(" left join " + database + ".dbo.LR_Base_Department c on c.F_DepartmentId=t.departmentId"); strSql.Append(" WHERE 1=1 "); var queryParam = queryJson.ToJObject(); // 虚拟参数 @@ -62,6 +67,11 @@ namespace Learun.Application.TwoDevelopment.LogisticsManagement dp.Add("DepartmentId",queryParam["DepartmentId"].ToString(), DbType.String); strSql.Append(" AND t.DepartmentId = @DepartmentId "); } + if (!queryParam["checkstatus"].IsEmpty()) + { + dp.Add("checkstatus", queryParam["checkstatus"].ToString(), DbType.String); + strSql.Append(" AND t.checkstatus = @checkstatus "); + } if (!queryParam["Payee"].IsEmpty()) { dp.Add("Payee", "%" + queryParam["Payee"].ToString() + "%", DbType.String);