项目经费管理

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

@@ -772,13 +772,21 @@ public class StaBudgetapprovalController extends BaseController {
         PageHelper.startPage(pageNum, pageSize);
 
         Map<String, String> paraMap = new HashMap<>();
+        if (nf != null && !nf.isEmpty()){
+            String[] nfs = nf.split(",");
+            if (nfs.length > 1){
+                paraMap.put("nf", nfs[1]);
+            }else {
+                paraMap.put("nf", nf);
+            }
+        }
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("spzt", spzt);
         paraMap.put("erpbh", erpbh);
         paraMap.put("sqmc", sqmc);
         paraMap.put("bh", bh);
-        paraMap.put("nf", nf);
+
 
         List<StaBudgetapproval> list = staBudgetapprovalService.getByjsqList(paraMap);
 
@@ -1074,10 +1082,17 @@ public class StaBudgetapprovalController extends BaseController {
                                      @RequestParam(required = false, defaultValue = "", value = "sqsj2") String sqsj2,
                                      @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                                      @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
-
+        Map<String, String> paraMap = new HashMap<>();
         PageHelper.startPage(pageNum, pageSize);
+        if (nf != null && !nf.isEmpty()){
+            String[] nfs = nf.split(",");
+            if (nfs.length>1){
+                paraMap.put("nf", nfs[1]);
+            }else {
+                paraMap.put("nf", nf);
+            }
 
-        Map<String, String> paraMap = new HashMap<>();
+        }
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("bh", bh);
@@ -1086,7 +1101,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("sfbyj", sfbyj);
         paraMap.put("xmmc", xmmc);
         paraMap.put("ssbmmc", ssbmmc);
-        paraMap.put("nf", nf);
+
         paraMap.put("spzt", spzt);
         paraMap.put("dkyfzr", dkyfzr);
         paraMap.put("sqsj1", sqsj1);

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

@@ -146,15 +146,22 @@ public class StaReimbursementController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
                            @RequestParam(required = false, defaultValue = "", value = "nf") String nf) {
         PageHelper.startPage(pageNum, pageSize);
-
         Map<String, String> paraMap = new HashMap<>();
+        if (nf != null && !nf.isEmpty()){
+            String[] nfs = nf.split(",");
+            if (nfs.length >1){
+                paraMap.put("nf", nfs[1]);
+            }else {
+                paraMap.put("nf", nf);
+            }
+        }
         paraMap.put("sortName", sortName);
         paraMap.put("sortOrder", sortOrder);
         paraMap.put("fysqbh", fysqbh);
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
         paraMap.put("bzr", bzr);
-        paraMap.put("nf", nf);
+
         List<StaReimbursement> list = staReimbursementService.getReimburseList(paraMap);
 
         PageInfo<StaReimbursement> pageinfo = new PageInfo<>(list);

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

@@ -128,6 +128,24 @@
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
     </div>
 </div>
+<script>
+    // 当文档加载完成后执行以下操作
+    document.addEventListener('DOMContentLoaded', function() {
+        // 获取下拉框元素
+        var selectElement = document.getElementById('nf');
+        // 获取当前年份并转换为字符串
+        var currentYear = new Date().getFullYear().toString();
+
+        // 遍历下拉框选项
+        for (var i = 0; i < selectElement.options.length; i++) {
+            // 如果选项的值与当前年份相匹配，则将该选项设为被选中状态并结束循环
+            if (selectElement.options[i].value === currentYear) {
+                selectElement.options[i].selected = true;
+                break;
+            }
+        }
+    });
+</script>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
@@ -141,12 +159,10 @@
         var form = layui.form
             table = layui.table;
         var userId = $("#userId").val();
-
-
-
+        var year = document.getElementById('nf').value;
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staReimbursement/list',
+            url: AjaxUtil.ctx + 'staReimbursement/list/?nf='+year,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],

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

@@ -105,6 +105,24 @@
 
   </div>
 </div>
+<script>
+  // 当文档加载完成后执行以下操作
+  document.addEventListener('DOMContentLoaded', function() {
+    // 获取下拉框元素
+    var selectElement = document.getElementById('nf');
+    // 获取当前年份并转换为字符串
+    var currentYear = new Date().getFullYear().toString();
+
+    // 遍历下拉框选项
+    for (var i = 0; i < selectElement.options.length; i++) {
+      // 如果选项的值与当前年份相匹配，则将该选项设为被选中状态并结束循环
+      if (selectElement.options[i].value === currentYear) {
+        selectElement.options[i].selected = true;
+        break;
+      }
+    }
+  });
+</script>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
@@ -120,9 +138,10 @@
             table = layui.table;
     var userId = $("#userId").val();
 
+    var year = document.getElementById('nf').value;
     var currTable = table.render({
       elem: '#currentTableId',
-      url: AjaxUtil.ctx + 'staBudgetapproval/list_imprest1',
+      url: AjaxUtil.ctx + 'staBudgetapproval/list_imprest1/?nf='+year,
       method: 'post',
       toolbar: '#toolbarDemo',
       // defaultToolbar: ['filter', 'print'],
@@ -130,6 +149,7 @@
         [
           {type: "checkbox", fixed: 'left'},
           {type: 'numbers', align: 'center', fixed: 'left'},
+          {field: 'xmmc', width: '15%',title: '项目名称',fixed: "left"},
           {field: 'spzt', width: '10%',title: '审批状态', sort: true},
           {field: 'bh', width: '9%',title: '编号'},
           {field: 'sqmc', width: '25%', title: '申请名称'},

src/main/resources/templates/stafeemanage/list_approving.html

@@ -138,6 +138,25 @@
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
     </div>
 </div>
+
+<script>
+    // 当文档加载完成后执行以下操作
+    document.addEventListener('DOMContentLoaded', function() {
+        // 获取下拉框元素
+        var selectElement = document.getElementById('nf');
+        // 获取当前年份并转换为字符串
+        var currentYear = new Date().getFullYear().toString();
+
+        // 遍历下拉框选项
+        for (var i = 0; i < selectElement.options.length; i++) {
+            // 如果选项的值与当前年份相匹配，则将该选项设为被选中状态并结束循环
+            if (selectElement.options[i].value === currentYear) {
+                selectElement.options[i].selected = true;
+                break;
+            }
+        }
+    });
+</script>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
 <script th:src="@{/lib/layui/layui.js}" charset="utf-8"></script>
 <script th:src="@{/lib/coco-message/coco-message.js}" charset="utf-8"></script>
@@ -213,10 +232,11 @@
                 $("#dkyfzr").val(NEWJSON1.join(","));
             }
         });
+        var year = document.getElementById('nf').value;
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staBudgetapproval/list_approving',
+            url: AjaxUtil.ctx + 'staBudgetapproval/list_approving/?nf='+year,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -224,9 +244,10 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center', fixed: 'left'},
+                    {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
                     {field: 'spzt', width: '9%', title: '审批状态', sort: true},
                     {field: 'bh', width: '8%', title: '编号'},
-                    {field: 'xmmc', width: '20%', title: '项目名称'},
+
                     // {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '10%', title: '项目类型'},