Merge remote-tracking branch 'origin/dev-lgl' into dev-lgl

src/main/java/com/liang/controller/PrjApproverecordController.java

@@ -492,8 +492,9 @@ public class PrjApproverecordController extends BaseController {
     }
 
     @ResponseBody
-    @RequestMapping(value = "/spList/{xmid}", method = RequestMethod.POST)
-    public BaseResult spList(@PathVariable String xmid,
+    @RequestMapping(value = "/spList/{xmid}/{tableName}", method = RequestMethod.POST)
+    public BaseResult spList(@PathVariable("xmid") String xmid,
+                             @PathVariable("tableName") String tableName,
                              @RequestParam("page") Integer pageNum,
                              @RequestParam("limit") Integer pageSize,
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
@@ -504,6 +505,7 @@ public class PrjApproverecordController extends BaseController {
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("xmid", xmid.toString());
+        paraMap.put("tableName", tableName.toString());
         List<PrjApproverecord> list = prjApproverecordService.getApproveByXmId2(paraMap);
 
         //判断备用金是否关联项目

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -509,7 +509,7 @@
         from prj_ApproveRecord a
         left join sys_user_info u1 on a.TJR = u1.user_id
         left join sys_user_info u2 on a.SHR = u2.user_id
-        where a.XMID = #{xmid}
+        where a.XMID = #{xmid} and a.TABLENAME = #{tableName}
         <if test="spzt != null and spzt != ''">
             and a.ZT = #{spzt}
         </if>

src/main/resources/templates/annualbudget/list_approve.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/prj_AnnualBudget',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/payapply/list_approve.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_PayApproval',
             method: 'post',
             toolbar: '#toolbarDemo',
             defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/prjproject/list_approve.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/prj_Project',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/reimburse/list_approve.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_Reimbursement',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/reportinfo/list_approve.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_FeasibilityReport',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/stabudgetapproval/list_approve.html

@@ -60,7 +60,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_BudgetApproval',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],

src/main/resources/templates/stabudgetapproval/list_approve1.html

@@ -47,7 +47,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid,
+            url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/sta_BudgetApproval',
             method: 'post',
             // toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'exports', 'print'],