完善数据检索

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Edu_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Info_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Logistic_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Other_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Print_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Student_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work/Index.cshtml

@@ -11,10 +11,22 @@
                         <div id="datesearch"></div>
                     </div>
                     <div class="lr-layout-tool-item">
-                        <input id="txt_Keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
-                    </div>
-                    <div class="lr-layout-tool-item">
-                        <a id="btn_Search" class="btn btn-primary btn-sm"><i class="fa fa-search"></i>&nbsp;<span class="lrlg">查询</span></a>
+                        <div id="multiple_condition_query">
+                            <div class="lr-query-formcontent">
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">备注关键字</div>
+                                    <input id="keyword" type="text" class="form-control" placeholder="请输入要查询关键字" />
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">报账状态</div>
+                                    <div id="ApplyStatus"></div>
+                                </div>
+                            </div>
+                        </div>
                     </div>
                 </div>
                 <div class="lr-layout-tool-right">

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

Learun.Framework.Ultimate V7/Learun.Application.Web/Areas/LogisticsManagement/Views/Purchase_Work_Apply/Index.cshtml

@@ -17,6 +17,10 @@
                                     <div class="lr-form-item-title">填报部门</div>
                                     <div id="DepartmentId"></div>
                                 </div>
+                                <div class="col-xs-12 lr-form-item">
+                                    <div class="lr-form-item-title">审核状态</div>
+                                    <div id="checkstatus"></div>
+                                </div>
                                 <div class="col-xs-12 lr-form-item">
                                     <div class="lr-form-item-title">收款人</div>
                                     <input id="Payee" type="text" class="form-control" />

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

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<Purchase_EduEntity>(strSql.ToString(),dp, pagination);
             }

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

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

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

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

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

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

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

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

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

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

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

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

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

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