修复bug 问题

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

@@ -2351,10 +2351,9 @@ public class PrjProjectController extends BaseController {
      * 在记录表中添加修改前的数据
      * @return
      */
+    @RequestMapping(value = "/addPrjProjectRecord/{xmid}",method =RequestMethod.POST)
     @ResponseBody
-    @PostMapping("/addPrjProjectRecord/{xmid}")
-//    @Transactional
-    public BaseResult addBudgetRecord(@PathVariable("xmid") Integer xmid) {
+    public BaseResult addBudgetRecord(@PathVariable  Integer xmid) {
 //        1.获取年度预算明细列表中的数据
         List<PrjBudget> xgjl = prjBudgetService.getXGJL(xmid);
 //        查询当前为第几次记录
@@ -2375,7 +2374,7 @@ public class PrjProjectController extends BaseController {
         if (prjProject.getSpzt().equals("审批结束")){
             prjProjectXgjlService.batchinsertXGJL(prjProjectXgjlList);
         }
-        return BaseResult.success();
+        return BaseResult.success("成功");
     }
 }
 

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

@@ -62,6 +62,10 @@ public class StaPayapprovalController extends BaseController {
     private BaseProjecttypeService projecttypeService;
 
 
+    @Resource
+    private  PrjAnnualbudgetService prjAnnualbudgetService;
+
+
     /**
      * 分页查询
      *
@@ -198,6 +202,10 @@ public class StaPayapprovalController extends BaseController {
         model.addAttribute("fysq",fysq);
         }
 
+        //年份
+        List<String> yearList = prjAnnualbudgetService.getYearList();
+        model.addAttribute("yearList", yearList);
+
         return "payapply/mylist";
     }
 
@@ -215,7 +223,11 @@ public class StaPayapprovalController extends BaseController {
                              @RequestParam(required = false, defaultValue = "", value = "cjsj1") String cjsj1,
                              @RequestParam(required = false, defaultValue = "", value = "cjsj2") String cjsj2,
                              @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
-                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
+                             @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
+                             @RequestParam(required = false, defaultValue = "", value = "erpbh")String erpbh,
+                             @RequestParam(required = false, defaultValue = "", value = "bh")String bh,
+                             @RequestParam(required = false, defaultValue = "", value = "xmmc") String xmmc,
+                             @RequestParam(required = false, defaultValue = "", value = "nf") String nf) {
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         String post = "";
@@ -242,6 +254,10 @@ public class StaPayapprovalController extends BaseController {
         paraMap.put("spzt", spzt);
         paraMap.put("cjsj1", cjsj1);
         paraMap.put("cjsj2", cjsj2);
+        paraMap.put("erpbh",erpbh);
+        paraMap.put("bh",bh);
+        paraMap.put("nf",nf);
+        paraMap.put("xmmc",xmmc);
 
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {

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

@@ -267,7 +267,7 @@
                 "sfbyj": '',
                 "xmmc": '',
                 "ssbmmc": '',
-                "nf": '',
+                "nf": '0',
                 "spzt": '',
                 "sfbz": '',
                 "dkyfzr": '',

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

@@ -18,35 +18,19 @@
                     <div class="layui-form-item">
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">项目名称</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <div class="layui-input-inline" style="width: 145px">
                                 <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="xmlx" id="xmlx" lay-filter="status">
-                                    <option value="">全部</option>
-                                    <option th:each="item:${xmlxList}" th:text="${item.name}"
-                                            th:value="${item.code}"></option>
-                                </select>
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <div class="layui-input-inline" style="width: 145px">
                                 <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 145px">
                                 <select name="nf" id="nf" lay-filter="status">
                                     <option value="">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}"
@@ -54,15 +38,9 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">任务书</label>
-                            <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
-                            </div>
-                        </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <div class="layui-input-inline" style="width: 145px">
                                 <select name="spzt" id="spzt" lay-filter="status">
                                     <option value="">全部</option>
                                     <option th:each="item:${approveList}" th:text="${item.name}"
@@ -70,6 +48,31 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">项目类型</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <select name="xmlx" id="xmlx" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${xmlxList}" th:text="${item.name}"
+                                            th:value="${item.code}"></option>
+                                </select>
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">所属部门</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">任务书</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
                         <div class="layui-inline" style="margin-left: 0px">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
                                     class="layui-icon"></i> 搜 索

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

@@ -25,7 +25,7 @@
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 60px">任务书</label>
-            <div class="layui-input-inline" style="width: 855px">
+            <div class="layui-input-inline" style="width: 810px">
                 <input type="hidden" id="rws" name="rws" class="layui-input" lay-verify="required"
                        lay-reqtext="任务书不能为空">
                 <input type="hidden" id="rwsmc" name="rwsmc" class="layui-input">

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

@@ -234,6 +234,31 @@
             });
             return false;
         });
+        // 监听重置操作
+        form.on('submit(data-reset-btn)', function (data) {
+            form.val("search-form", {
+                "erpbh": '',
+                "xmmc": '',
+                "bh": '',
+                "nf": '0',
+                "spzt": '',
+                "cjr": '',
+                "cjsj1":'',
+                "cjsj2":'',
+                "mc":'',
+                "bzr":'',
+                "fysqmc":''
+            });
+            // 执行搜索重载
+            currTable.reload({
+                page: {
+                    curr: 1
+                },
+                where: form.val("search-form")
+            });
+            return false;
+        });
+
 
         // 监听工具栏事件
         table.on('toolbar(currentTableFilter)', function (obj) {

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

@@ -16,21 +16,57 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
-                        <label class="layui-form-label" style="width: 60px">审批状态</label>
-                        <div class="layui-input-inline" style="width: 150px">
-                            <select name="spzt" lay-filter="status">
-                                <option value="">全部</option>
-                                <option th:each="item:${approveList}" th:text="${item.name}"
-                                        th:value="${item.name}"></option>
-                            </select>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">项目名称</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" name="xmmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">ERP编号</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">科研费号</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" name="bh" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">年份</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <select name="nf" id="nf" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${yearList}" th:text="${item.nf}"
+                                            th:value="${item.nf}"></option>
+                                </select>
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">费用申请</label>
-                        <div class="layui-input-inline" style="width: 150px">
-                            <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">审批状态</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <select name="spzt" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option th:each="item:${approveList}" th:text="${item.name}"
+                                            th:value="${item.name}"></option>
+                                </select>
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">创建人</label>
-                        <div class="layui-input-inline" style="width: 150px">
-                            <input type="text" name="cjr" autocomplete="off" class="layui-input">
+                    </div>
+                    <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">费用申请</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 60px">创建人</label>
+                            <div class="layui-input-inline" style="width: 145px">
+                                <input type="text" name="cjr" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">创建时间</label>
@@ -44,14 +80,18 @@
                                        readonly>
                             </div>
                         </div>
-
-                        <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
-                                class="layui-icon"></i> 搜 索
-                        </button>
-                        <button type="submit" class="layui-btn layui-btn-primary" lay-submit
-                                lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
-                        </button>
+                        <div class="layui-inline">
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
+                                    class="layui-icon"></i> 搜 索
+                            </button>
+                        </div>
+                        <div class="layui-inline">
+                            <button type="submit" class="layui-btn layui-btn-primary" lay-submit
+                                    lay-filter="data-reset-btn"><i class="layui-icon layui-icon-refresh"></i> 重 置
+                            </button>
+                        </div>
                     </div>
+
                 </form>
             </div>
         </fieldset>
@@ -132,14 +172,18 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', fixed: 'left',title: '😊'},
-                    {field: 'spzt', width: '11%', title: '审批状态', fixed: 'left'},
+                    {field: 'xmmc',width: '15%',title: '项目名称', fixed: 'left'},
+                    {field: 'erpbh',width: '10%',title: 'ERP编号',fixed: 'left'},
+                    {field: 'bh',width: '10%',title: '科研费号',fixed: 'left'},
+                    {field: 'spzt', width: '11%', title: '审批状态'},
+                    {field: 'nf', width: '7%', title: '年份'},
                     {field: 'htmc', width: '11%', title: '合同'},
                     {field: 'fysqmc', width: '25%', title: '费用申请'},
-                    {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)'},
+                    {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)',align: 'right'},
                     {field: 'fkjhmc', width: '12%', title: '付款计划'},
                     {field: 'cjrxm', width: '7%', title: '创建人'},
-                    {field: 'cjrq', width: '8%', title: '创建时间', align: 'center'},
-                    {field: 'htje', title: '合同金额(万元)'}
+                    {field: 'cjrq', width: '15%', title: '创建时间', align: 'left'},
+                    {field: 'htje', width:'7%', title: '合同金额(万元)',align: 'right'}
                 ]
             ],
             autoSort: false,
@@ -173,6 +217,28 @@
             });
             return false;
         });
+        // 监听重置操作
+        form.on('submit(data-reset-btn)', function (data) {
+            form.val("search-form", {
+                "erpbh": '',
+                "xmmc": '',
+                "bh": '',
+                "nf": '',
+                "spzt": '',
+                "cjr": '',
+                "cjsj1":'',
+                "cjsj2":'',
+                "fysqmc":''
+            });
+            // 执行搜索重载
+            currTable.reload({
+                page: {
+                    curr: 1
+                },
+                where: form.val("search-form")
+            });
+            return false;
+        });
 
         // 监听工具栏事件
         table.on('toolbar(currentTableFilter)', function (obj) {

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

@@ -217,6 +217,29 @@
             });
             return false;
         });
+        // 监听重置操作
+        form.on('submit(data-reset-btn)', function (data) {
+            form.val("search-form", {
+                "erpbh": '',
+                "xmmc": '',
+                "bh": '',
+                "nf": '0',
+                "spzt": '',
+                "cjr": '',
+                "cjsj1":'',
+                "cjsj2":'',
+                "mc":'',
+                "bzr":''
+            });
+            // 执行搜索重载
+            currTable.reload({
+                page: {
+                    curr: 1
+                },
+                where: form.val("search-form")
+            });
+            return false;
+        });
 
         // 监听工具栏事件
         table.on('toolbar(currentTableFilter)', function (obj) {

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

@@ -157,6 +157,7 @@
                     {field: 'mc', width: '15%', title: '报账名称'},
                     {field: 'erpbh',width: '10%',title: 'ERP编号'},
                     {field: 'fysqbh', width: '10%',title: '科研费号'},
+                    {field: 'nf', width: '7%', title: '年份'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},
                     {field: 'bhsje', width: '8%', title: '不含税金额(元)'},
                     {field: 'sf', width: '6%', title: '税费(元)'},
@@ -196,6 +197,29 @@
             });
             return false;
         });
+        // 监听重置操作
+        form.on('submit(data-reset-btn)', function (data) {
+            form.val("search-form", {
+                "erpbh": '',
+                "xmmc": '',
+                "bh": '',
+                "nf": '0',
+                "spzt": '',
+                "cjr": '',
+                "cjsj1":'',
+                "cjsj2":'',
+                "mc":'',
+                "bzr":''
+            });
+            // 执行搜索重载
+            currTable.reload({
+                page: {
+                    curr: 1
+                },
+                where: form.val("search-form")
+            });
+            return false;
+        });
 
         // 监听工具栏事件
         table.on('toolbar(currentTableFilter)', function (obj) {

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

@@ -202,7 +202,7 @@
         "spzt": '',
         "erpbh": '',
         "bh": '',
-        "nf": ''
+        "nf": '0'
       });
       // 执行搜索重载
       currTable.reload({

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

@@ -387,7 +387,7 @@
                 "sfbyj": '',
                 "xmmc": '',
                 "ssbmmc": '',
-                "nf": '',
+                "nf": '0',
                 "spzt": '',
                 "sfbz": '',
                 "dkyfzr": '',

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

@@ -348,7 +348,7 @@
                 "sfbyj": '',
                 "xmmc": '',
                 "ssbmmc": '',
-                "nf": '',
+                "nf": '0',
                 "spzt": '',
                 "sfbz": '',
                 "dkyfzr": '',

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

@@ -244,7 +244,7 @@
                 "xmlx": '',
                 "xmfzrxm": '',
                 "ssbmmc": '',
-                "nf": ''
+                "nf": '0'
             });
             // 执行搜索重载
             currTable.reload({