修复待审批模块数据问题，

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

@@ -135,7 +135,7 @@ public class PrjApproverecordController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "/list", method = RequestMethod.POST)
-    public BaseResult list(@RequestParam("page") Integer pageNum,
+    public BaseResult    list(@RequestParam("page") Integer pageNum,
                            @RequestParam("limit") Integer pageSize,
                            @RequestParam(required = false, defaultValue = "", value = "xm") String xm,
                            @RequestParam(required = false, defaultValue = "", value = "spzt") String zt,
@@ -168,8 +168,10 @@ public class PrjApproverecordController extends BaseController {
             Map<String, Object> maps = new HashMap<>();
             for (int i = 0 ;i<accounts.size();i++) {
                 maps.put("spzt", accounts.get(i).getUserPostName() + "审批");
-                maps.put("ssbmmc",getSysUserInfo().getDeptName());
-                maps.put("ssbm",getSysUserInfo().getDeptName());
+                if (accounts.get(i).getUserPostName().equals("部门主任")){
+                    maps.put("ssbmmc",getSysUserInfo().getDeptName());
+                    maps.put("ssbm",getSysUserInfo().getDeptName());
+                }
                 /*
                 maps.put("xmmc");
                 maps.put()*/
@@ -177,8 +179,6 @@ public class PrjApproverecordController extends BaseController {
                 List<StaBudgetapproval> fysq = staBudgetapprovalService.getAllApplyList(maps);
                 if (fysq.size() > 0) {
                     for (int j = 0; j < fysq.size(); j++) {
-
-
                         // 将 Date 转换为 String
                         String formattedDate = formatter.format(fysq.get(j).getSqsj());
                         PrjApproverecord prjApproverecord = new PrjApproverecord();
@@ -214,65 +214,74 @@ public class PrjApproverecordController extends BaseController {
                         prjApproverecords.add(prjApproverecord);
                     }
                 }
-                // 获取付款申请界面全部审批数据
-                List<StaPayapproval> fk = staPayapprovalService.getFksqList(maps);
-                if (fk.size() > 0) {
-                    for (int l = 0; l < fk.size(); l++) {
-                        String formattedDate = formatter.format(fk.get(l).getCjsj());
-                        PrjApproverecord prjApproverecord = new PrjApproverecord();
-                        prjApproverecord.setXmlxmc("付款申请");
-                        prjApproverecord.setXm(fk.get(l).getXmmc());
-                        prjApproverecord.setErpbh(fk.get(l).getErpbh());
-                        prjApproverecord.setTjrxm(fk.get(l).getCjrxm());
-                        prjApproverecord.setTjsj(formattedDate);
-                        prjApproverecord.setSpzt(fk.get(l).getSpzt());
-                        prjApproverecord.setTablename("sta_PayApproval");
-                        prjApproverecord.setXmid(fk.get(l).getId());
-                        prjApproverecord.setHtje(fk.get(l).getHtje());
-                        // 存入 付款数据至 list 集合
-                        prjApproverecords.add(prjApproverecord);
+                if (accounts.get(i).getUserPostName().equals("科技项目管理专责1") ||
+                        accounts.get(i).getUserPostName().equals("科技项目管理专责2") ||
+                accounts.get(i).getUserPostName().equals("科技部门部门主任审批")){
+                    // 获取付款申请界面全部审批数据
+                    List<StaPayapproval> fk = staPayapprovalService.getFksqList(maps);
+                    if (fk.size() > 0) {
+                        for (int l = 0; l < fk.size(); l++) {
+                            String formattedDate = formatter.format(fk.get(l).getCjsj());
+                            PrjApproverecord prjApproverecord = new PrjApproverecord();
+                            prjApproverecord.setXmlxmc("付款申请");
+                            prjApproverecord.setXm(fk.get(l).getXmmc());
+                            prjApproverecord.setErpbh(fk.get(l).getErpbh());
+                            prjApproverecord.setTjrxm(fk.get(l).getCjrxm());
+                            prjApproverecord.setTjsj(formattedDate);
+                            prjApproverecord.setSpzt(fk.get(l).getSpzt());
+                            prjApproverecord.setTablename("sta_PayApproval");
+                            prjApproverecord.setXmid(fk.get(l).getId());
+                            prjApproverecord.setHtje(fk.get(l).getHtje());
+                            // 存入 付款数据至 list 集合
+                            prjApproverecords.add(prjApproverecord);
+                        }
                     }
                 }
-                // 获取任务数据界面全部审批数据
-                List<PrjProject> rws = prjProjectService.getProjectList(maps);
-                if (rws.size() > 0) {
-                    for (int m = 0; m < rws.size(); m++) {
-                        String formattedDate = formatter.format(rws.get(m).getCjrq());
-                        PrjApproverecord prjApproverecord = new PrjApproverecord();
-                        prjApproverecord.setXmlxmc("任务书");
-                        prjApproverecord.setXm(rws.get(m).getZwmc());
-                        prjApproverecord.setErpbh(rws.get(m).getErpbh());
-                        prjApproverecord.setTjrxm(rws.get(m).getCjrxm());
-                        prjApproverecord.setTjsj(formattedDate);
-                        prjApproverecord.setSpzt(rws.get(m).getSpzt());
-                        prjApproverecord.setTablename("prj_Project");
-                        prjApproverecord.setXmid(rws.get(m).getId());
-                        if (rws.get(m).getYsje()!=null){
-                            prjApproverecord.setRysje(rws.get(m).getYsje().doubleValue());
+                if (accounts.get(i).getUserPostName().equals("科研计划专责 ")){
+                    // 获取任务数据界面全部审批数据
+                    List<PrjProject> rws = prjProjectService.getProjectList(maps);
+                    if (rws.size() > 0) {
+                        for (int m = 0; m < rws.size(); m++) {
+                            String formattedDate = formatter.format(rws.get(m).getCjrq());
+                            PrjApproverecord prjApproverecord = new PrjApproverecord();
+                            prjApproverecord.setXmlxmc("任务书");
+                            prjApproverecord.setXm(rws.get(m).getZwmc());
+                            prjApproverecord.setErpbh(rws.get(m).getErpbh());
+                            prjApproverecord.setTjrxm(rws.get(m).getCjrxm());
+                            prjApproverecord.setTjsj(formattedDate);
+                            prjApproverecord.setSpzt(rws.get(m).getSpzt());
+                            prjApproverecord.setTablename("prj_Project");
+                            prjApproverecord.setXmid(rws.get(m).getId());
+                            if (rws.get(m).getYsje()!=null){
+                                prjApproverecord.setRysje(rws.get(m).getYsje().doubleValue());
+                            }
+                            // 存入 付款数据至 list 集合
+                            prjApproverecords.add(prjApproverecord);
                         }
-                        // 存入 付款数据至 list 集合
-                        prjApproverecords.add(prjApproverecord);
                     }
                 }
-                // 获取年度预算界面审批数据
-                List<PrjAnnualbudget> ndys = prjAnnualbudgetService.getNdysList(maps);
-                if (ndys.size() > 0) {
-                    for (int n = 0; n < rws.size(); n++) {
-                        String formattedDate = formatter.format(ndys.get(n).getSqsj());
-                        PrjApproverecord prjApproverecord = new PrjApproverecord();
-                        prjApproverecord.setXmlxmc("年度预算");
-                        prjApproverecord.setXm(ndys.get(n).getXmmc());
-                        prjApproverecord.setErpbh(ndys.get(n).getErpbh());
-                        prjApproverecord.setTjrxm(ndys.get(n).getSqrxm());
-                        prjApproverecord.setTjsj(formattedDate);
-                        prjApproverecord.setSpzt(ndys.get(n).getSpzt());
-                        prjApproverecord.setTablename("prj_AnnualBudget");
-                        prjApproverecord.setXmid(ndys.get(n).getId());
-                        // 存入 付款数据至 list 集合
-                        prjApproverecords.add(prjApproverecord);
+                if (accounts.get(i).getUserPostName().equals("科技项目管理专责")){
+                    // 获取年度预算界面审批数据
+                    List<PrjAnnualbudget> ndys = prjAnnualbudgetService.getNdysList(maps);
+                    if (ndys.size() > 0) {
+                        for (int n = 0; n < ndys.size(); n++) {
+                            String formattedDate = formatter.format(ndys.get(n).getSqsj());
+                            PrjApproverecord prjApproverecord = new PrjApproverecord();
+                            prjApproverecord.setXmlxmc("年度预算");
+                            prjApproverecord.setXm(ndys.get(n).getXmmc());
+                            prjApproverecord.setErpbh(ndys.get(n).getErpbh());
+                            prjApproverecord.setTjrxm(ndys.get(n).getSqrxm());
+                            prjApproverecord.setTjsj(formattedDate);
+                            prjApproverecord.setSpzt(ndys.get(n).getSpzt());
+                            prjApproverecord.setTablename("prj_AnnualBudget");
+                            prjApproverecord.setXmid(ndys.get(n).getId());
+                            // 存入 付款数据至 list 集合
+                            prjApproverecords.add(prjApproverecord);
+                        }
                     }
                 }
 
+
             }
         // 获取年度预算修改申请审批数据
         List<PrjApproverecord> prjAnnualBudgetRecordList= prjApproverecordService.getPrjAnnualBudgetRecordList(getUserId().toString());

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

@@ -290,6 +290,7 @@ public class StaBudgetapprovalController extends BaseController {
         budgetapproval.setSqrxm(getSysUserInfo().getName());
         budgetapproval.setSqr(getSysUserId());
         budgetapproval.setSfth(0);
+        budgetapproval.setSfbz(false);
         int num = staBudgetapprovalService.insert(budgetapproval);
         if (num > 0) {
             return BaseResult.success("费用申请成功!", budgetapproval);
@@ -588,12 +589,14 @@ public class StaBudgetapprovalController extends BaseController {
         // 项目使用费用
         String xmndjfysq = staBudgetapprovalService.getFyzz(maps).getXmndjfysq();
         Double byjje = staBudgetapprovalService.getByjzje(maps).getByj();
+        Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
         kmFyInfo.setXmndjfysq(xmndjfysq);
         kmFyInfo.setSqje(xxzje);
         kmFyInfo.setByj(byjzje);
         kmFyInfo.setXmzys(kmXmzys);
         kmFyInfo.setByjbzze(byjbzze);
         kmFyInfo.setBzje2(byjje);
+        kmFyInfo.setSqje(sqe);
         // 申请金额总额 结束
         if (kmFyInfo.getYsje() == null)
             kmFyInfo.setYsje(0.0);
@@ -641,12 +644,15 @@ public class StaBudgetapprovalController extends BaseController {
             Double byjbzze = staBudgetapprovalService.getByjze(maps).getBzje();
             String xmndjfysq = staBudgetapprovalService.getFyzz(maps).getXmndjfysq();
             Double byjje = staBudgetapprovalService.getByjzje(maps).getByj();
+            Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
+            kmFyInfo.setSqje(sqe);
             kmFyInfo.setXmndjfysq(xmndjfysq);
             kmFyInfo.setSqje(xxzje);
             kmFyInfo.setByj(byjzje);
             kmFyInfo.setByjbzze(byjbzze);
             kmFyInfo.setXmndjfysq(xmndjfysq);
             kmFyInfo.setBzje2(byjje);
+
             // 申请金额总额 结束
             if (kmFyInfo.getYsje() == null)
                 kmFyInfo.setYsje(0.0);
@@ -1808,11 +1814,17 @@ public class StaBudgetapprovalController extends BaseController {
             kmFyInfo.setSqje(xxzje);
             kmFyInfo.setByj(byjzje);
             kmFyInfo.setByjbzze(byjbzze);
+            Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
+            kmFyInfo.setSqje(sqe);
             // 申请金额总额 结束
         }
         //        获取科目费用小项xmzys
         Double kmXmzys=prjAnnualbudgetdetailService.getKmXmzys(nys,fymc);
-
+        Map<String, Object> maps = new HashMap<>();
+        maps.put("nys",nys);
+        maps.put("fymc",fymc);
+        Double sqe = staBudgetapprovalService.getSqe(maps).getSqje();
+        kmFyInfo.setSqje(sqe);
         if (kmFyInfo == null) {
             kmFyInfo = new StaBudgetapproval();
             kmFyInfo.setSqje(0.0);

src/main/java/com/liang/dao/StaBudgetapprovalDao.java

@@ -263,5 +263,10 @@ public interface StaBudgetapprovalDao {
     // 获取备用金
     PrjAnnualbudgetdetail getByjzje(Map map);
 
+    /**
+     * 获取申请额
+     */
+    StaBudgetapproval getSqe (Map map);
+
 }
 

src/main/java/com/liang/service/StaBudgetapprovalService.java

@@ -236,4 +236,7 @@ public interface StaBudgetapprovalService {
 
     // 获取备用金
     PrjAnnualbudgetdetail getByjzje(Map map);
+
+    // 获取申请额
+    StaBudgetapproval getSqe (Map map);
 }

src/main/java/com/liang/service/impl/StaBudgetapprovalServiceImpl.java

@@ -274,5 +274,10 @@ public class StaBudgetapprovalServiceImpl implements StaBudgetapprovalService {
         return this.staBudgetapprovalDao.getByjzje(map);
     }
 
+    @Override
+    public StaBudgetapproval getSqe(Map map) {
+        return this.staBudgetapprovalDao.getSqe(map);
+    }
+
 
 }

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -266,7 +266,7 @@
         insert into sta_BudgetApproval(SQMC, XMMC, XMID, BH, NF, FYLB, SQJE, SQSM, FJ, SQRXM, SQR, SQSJ, ERPBH, KYBG,
                                        XMLX, XMFZR, SSBM, SFBYJ, SFBZ, SPZT, NYS, BZ,SFTH)
         values (#{sqmc}, #{xmmc}, #{xmid}, #{bh}, #{nf}, #{fylb}, #{sqje}, #{sqsm}, #{fj}, #{sqrxm}, #{sqr}, GETDATE(),
-                #{erpbh}, #{kybg}, #{xmlx}, #{xmfzr}, #{ssbm}, 0, 0, '未提交', #{nys}, #{bz},#{sfth})
+                #{erpbh}, #{kybg}, #{xmlx}, #{xmfzr}, #{ssbm}, 0, #{sfbz}, '未提交', #{nys}, #{bz},#{sfth})
     </insert>
     <insert id="insertImprest" keyProperty="id" useGeneratedKeys="true">
         insert into sta_BudgetApproval(SQMC, BH, SQSM, NF, SQJE, SQRXM, SQR, SQSJ, SFBYJ, SFBZ, SPZT,SFTH)
@@ -344,7 +344,9 @@
             SQSM = #{sqsm}
             ,BZJE = #{bzje}
             ,BHSJE = #{bhsje}
-            ,SFBZ = #{sfbz}
+            <if test="sfbz != null and sfbz != ''">
+                ,SFBZ = #{sfbz}
+            </if>
             ,SF = #{sf}
         where ID = #{id}
     </update>
@@ -1208,4 +1210,20 @@
         </if>
     </select>
 
+    <select id="getSqe" resultType="com.liang.entity.StaBudgetapproval">
+        SELECT COALESCE
+                   ( SUM ( CASE WHEN a.SFBZ = 0 THEN a.SQJE ELSE a.BZJE END ), 0.00 ) AS SQJE
+        FROM
+            sta_BudgetApproval a
+                LEFT JOIN prj_AnnualBudgetDetail b ON a.FYLB = b.ID
+        WHERE
+            a.SPZT != '作废'
+            <if test="nys != null and nys !=''">
+                AND a.NYS = #{nys}
+            </if>
+            <if test="fymc != null and fymc != ''">
+                AND b.FYMC = #{fymc}
+            </if>
+    </select>
+
 </mapper>

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

@@ -42,7 +42,11 @@
                             <div class="layui-input-inline" style="width: 140px">
                                 <select name="spzt" id="spzt" lay-filter="status">
                                     <option value="">全部</option>
-                                    <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
+                                    <!--<option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>-->
+                                    <option value="未提交">未提交</option>
+                                    <option value="未提交(返回)">未提交(返回)</option>
+                                    <option value="科研计划专责审批">科技项目管理专责审批</option>
+                                    <option value="审批结束">审批结束</option>
                                 </select>
                             </div>
                         </div>

src/main/resources/templates/home/welcome-1.html

@@ -176,7 +176,7 @@
 <div class="layuimini-container">
     <div class="layuimini-main">
         <div class="layui-row layui-col-space15">
-            <div class="layui-col-md6" style="width: 60%">
+            <div class="layui-col-md6" style="width: 80%">
                 <div class="layui-row layui-col-space15">
                     <div class="layui-col-md12" style="padding-bottom: 10px">
                         <div class="layui-card">
@@ -244,7 +244,7 @@
                 </div>
             </div>
 
-            <div class="layui-col-md6" style="width: 40%">
+            <div class="layui-col-md6" style="width: 20%">
                 <div class="layui-card">
                     <div class="layui-card-header">
                         <div style="float: left">
@@ -255,7 +255,7 @@
                         </div>
                     </div>
                     <div class="layui-card-body layui-text" style="height: 500px">
-                        <div class="layuimini-notice">
+                        <!--<div class="layuimini-notice">
                             <div class="layuimini-notice-title">修改选项卡样式</div>
                             <div class="layuimini-notice-extra">2023-03-11 23:06</div>
                             <div class="layuimini-notice-content layui-hide">
@@ -268,7 +268,7 @@
                                 刷新页面会保留当前的窗口，并且会定位当前窗口对应左侧菜单栏。<br>
                                 移动端的友好支持。<br>
                             </div>
-                        </div>
+                        </div>-->
                     </div>
                 </div>
 

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

@@ -146,9 +146,9 @@
                     cols: [
                         [
                             {type: "radio", fixed: 'left'},
-                            {type: 'numbers', align: 'center'},
-                            {field: 'name', width: '40%', title: '姓名', align: 'left'},
-                            {field: 'account', title: '账号', align: 'left'}
+                            {type: 'numbers', align: 'center',title: '序号'},
+                            {field: 'name', width: '20%', title: '姓名', align: 'left'},
+                            {field: 'account', width:'20%',title: '账号', align: 'left'}
                         ]
                     ]
                 },

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

@@ -18,7 +18,7 @@
                     <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: 250px">
+                            <div class="layui-input-inline" style="width: 150px">
                                 <input type="text" name="zwmc" id="zwmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -46,8 +46,13 @@
                             <div class="layui-input-inline" style="width: 150px">
                                 <select name="spzt" lay-filter="status">
                                     <option value="">全部</option>
-                                    <option th:each="item:${dictList}" th:text="${item.name}"
-                                            th:value="${item.name}"></option>
+                                    <!--<option th:each="item:${dictList}" th:text="${item.name}"
+                                            th:value="${item.name}"></option>-->
+                                    <option value="未提交">未提交</option>
+                                    <option value="未提交(返回)">未提交(返回)</option>
+                                    <option value="科研计划专责审批">科研计划专责审批</option>
+                                    <option value="审批结束">审批结束</option>
+
                                 </select>
                             </div>
                         </div>

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

@@ -45,13 +45,13 @@
                                 <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline" style="margin-left: -10px;">
+                        <div class="layui-inline" >
                             <label class="layui-form-label" style="width: 70px;">ERP编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
+                        <div class="layui-inline" style="margin-left: -10px">
                             <label class="layui-form-label" style="width: 70px;">科研费号</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
@@ -68,7 +68,7 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">审批状态</label>
+                            <label class="layui-form-label" style="width: 70px;">审批状态</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <select name="spzt" id="spzt" lay-filter="status">
                                     <option value="">全部</option>
@@ -80,13 +80,13 @@
                     </div>
 
                     <div class="layui-form-item">
-                        <div class="layui-inline">
+                        <!--<div class="layui-inline">
                             <label class="layui-form-label" style="width: 70px;">所属部门</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" id="ssbmmc" name="ssbmmc" autocomplete="off" class="layui-input">
                             </div>
-                        </div>
-                        <div class="layui-inline" style="margin-left: -10px;">
+                        </div>-->
+                        <div class="layui-inline" >
                             <label class="layui-form-label" style="width: 70px;">项目类型</label>
                             <div class="layui-input-inline" style="width: 140px;">
                                 <select name="xmlx" id="xmlx" lay-filter="status">

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

@@ -722,18 +722,23 @@
         $("#sqje").blur(function (e) {
             //获取input输入的值
             var sqje = parseInt(e.delegateTarget.value, 10);
+
             if (!isNaN(sqje)) {
-                var ysje = parseFloat(dataTj[0].ysje) * 10000;
-                var nysje = parseFloat(dataTj[1].ysje) * 10000;//年度预算金额
-                var ysqje = ysysq0;
-                var nysqje = parseInt(dataTj[1].ysqje);
+                let ysje = parseFloat(dataTj[0].ysje) * 10000;
+                let nysje = parseFloat(dataTj[1].ysje) * 10000;//年度预算金额
+                let ysqje = ysysq0;
+                let nysqje = parseInt(dataTj[1].ysqje);
+                let je = sqje+ysqje;
+                console.log('je'+je);
+                console.log('zje:'+ ysje * 1.2);
+                console.log('haha:'+sqje+ysqje);
                 // if (sqje+nysqje-sqje1 > nysje) {
                 if (sqje+ysqje > nysje) {
                     Message.error("费用申请的总金额，不能超过年度总预算!", 2000);
                     return false;
                 }
                 if ($("#fylbmc").val()==="（1）外委研究支出费") {
-                    if (sqje+ysqje>=ysje+1) {
+                    if ((sqje+ysqje) >= (ysje+1)) {
                         Message.error("外委研究支出费申请的费用总金额，不能超过预算金额%!", 2000);
                         return false;
                     }
@@ -742,7 +747,7 @@
                         return false;
                     }
 
-                }else if (sqje+ysqje>=ysje*1.2+1) {
+                }else if (je >=ysje*1.2) {
                     Message.error("该科目申请的费用总金额，不能超过预算金额120%!", 2000);
                     return false;
                 }
@@ -3559,7 +3564,9 @@
         // 监听确认按钮（常规）
         form.on('submit(saveBtn)', function (data) {
             var ysje = parseFloat(dataTj[0].ysje)*10000;
+            var ysqje = parseFloat(dataTj[0].ysqje);
             var sqje = parseFloat($("#sqje").val());
+            console.log('ysqje:'+ysqje);
             if ($("#fylbmc").val()==="（1）外委研究支出费") {
                 if (sqje+ysqje>=ysje+1) {
                     Message.error("外委研究支出费申请的费用总金额，不能超过预算金额%!", 2000);
@@ -3570,7 +3577,7 @@
                     return false;
                 }
 
-            }else if (sqje+ysqje>=ysje*1.2+1) {
+            }else if (ysqje >= (ysje*1.2)) {
                 Message.error("该科目申请的费用总金额，不能超过预算金额120%!", 2000);
                 return false;
             }

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

@@ -290,13 +290,22 @@
             url: AjaxUtil.ctx + 'userinfo/listDeptForSelect',
             success: function (res) {
                 layer.close(index2);
-
                 var datalist = [];
+                // 添加“全部”选项
+                datalist.push({
+                    value: '', // 空值
+                    label: '全部', // 显示文本
+                    children: [] // 需要子项以保持一致性
+                });
+
                 for (let item of res.data) {
                     item.value = item.deptName;
                     item.label = item.deptName;
+                    // 确保每个部门也有一个 children 属性
+                    item.children = [];
                     datalist.push(item);
                 }
+
                 // 扁平数据转树
                 var options = arrayToTree(datalist, "50");
                 // var options = arrayToTree(datalist, "0");
@@ -324,6 +333,7 @@
                 Message.error('获取部门信息失败！', 1000);
             }
         });
+
         //电科院负责人
         tableSelect.render({
             elem: '#dkyfzrxm',
@@ -364,15 +374,7 @@
                     {type: "radio", fixed: 'left',title: '😊'},
                     {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
                     {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
-                    {field: 'spzt', width: '9%', title: '审批状态'},
-                    {field: 'bh', width: '8%', title: '科研费号'},
-                    {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
-                    {field: 'xmlxmc', width: '10%', title: '项目类型'},
-                    {field: 'fylbmc', width: '7%', title: '费用类别'},
-                    {field: 'sqje', width: '7%', title: '申请金额(元)'},
-                    {field: 'bzje', width: '7%', title: '报账金额(元)'},
-                    {field: 'bhsje', width: '7%', title: '不含税金额(元)'},
                     {
                         field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
                             if (1 == d.sfbyj) {
@@ -382,11 +384,20 @@
                             }
                         }
                     },
+                    {field: 'sqje', width: '7%', title: '申请金额(元)'},
+                    {field: 'bzje', width: '7%', title: '报账金额(元)'},
+                    {field: 'bhsje', width: '7%', title: '不含税金额(元)'},
+                    {field: 'fylbmc', width: '15%', title: '费用类别'},
+                    {field: 'xmlxmc', width: '10%', title: '项目类型'},
+                    {field: 'spzt', width: '9%', title: '审批状态'},
                     {field: 'sqrxm', width: '5%', title: '申请人'},
+                    {field: 'bh', width: '8%', title: '科研费号'},
                     {field: 'dkyfzrxm', width: '8%', title: '电科院负责人'},
                     {field: 'ssbmmc', width: '8%', title: '所属部门'},
                     {field: 'nf', width: '4%', title: '年份'},
-                    {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'}
+                    {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'},
+
+                    {field: 'sqmc', width: '25%', title: '申请名称'}
                 ]
             ],
             autoSort: false,