项目经费管理

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

@@ -150,18 +150,27 @@ public class PrjAnnualbudgetController extends BaseController {
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder) {
         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("xmmc", xmmc);
         paraMap.put("erpbh", erpbh);
         paraMap.put("xmlx", xmlx);
-
         paraMap.put("ssbmmc", ssbmmc);
         paraMap.put("spzt", spzt);
         paraMap.put("rwsmc", rwsmc);
-        paraMap.put("nf", nf);
+
         List<PrjAnnualbudget> list = prjAnnualbudgetService.getNdysList(paraMap);
 
         PageInfo<PrjAnnualbudget> pageinfo = new PageInfo<>(list);

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

@@ -182,7 +182,8 @@ public class StaBudgetapprovalController extends BaseController {
                                  @RequestParam(required = false, defaultValue = "", value = "dkyfzr") String dkyfzr,
                                  @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                                  @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 = "xmmc")String xmmc) {
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         String post = "";
@@ -196,6 +197,15 @@ 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("sqmc", sqmc);
@@ -207,7 +217,7 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("xmlx", xmlx);
         paraMap.put("ssbmmc", ssbmmc);
         paraMap.put("dkyfzr", dkyfzr);
-        paraMap.put("nf", nf);
+        paraMap.put("xmmc",xmmc);
 
         if (!userInfo.getAccount().equals("admin")) {
             if (!"过".equals(post)) {
@@ -949,6 +959,14 @@ 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("bh", bh);
@@ -957,7 +975,6 @@ 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("sfbz", sfbz);
         paraMap.put("dkyfzr", dkyfzr);
@@ -1310,6 +1327,10 @@ public class StaBudgetapprovalController extends BaseController {
         List<String> yearList = staBudgetapprovalService.getYearList();
         model.addAttribute("yearList", yearList);
 
+        //审批状态
+        List<Map<String, String>> approveList = sysDictInfoService.queryByCode("pay_status");
+        model.addAttribute("approveList", approveList);
+
         return "stafeemanage/list_feemanage";
     }
 
@@ -1324,10 +1345,21 @@ public class StaBudgetapprovalController extends BaseController {
                                      @RequestParam(required = false, defaultValue = "", value = "ssbmmc") String ssbmmc,
                                      @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
                                      @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 = "spzt")String spzt,
+                                     @RequestParam(required = false, defaultValue = "", value = "bh")String bh
+    ) {
         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("xmmc", xmmc);
@@ -1335,7 +1367,9 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("xmlx", xmlx);
         paraMap.put("xmfzrxm", xmfzrxm);
         paraMap.put("ssbmmc", ssbmmc);
-        paraMap.put("nf", nf);
+        paraMap.put("spzt",spzt);
+        paraMap.put("bh",bh);
+
         List<FeeManagemant> list = prjProjectService.getFyglList(paraMap);
 
         PageInfo<FeeManagemant> pageinfo = new PageInfo<>(list);

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

@@ -8,6 +8,7 @@ import com.liang.common.base.BaseResult;
 import com.liang.common.enums.PostInfoEnum;
 import com.liang.common.exception.CustomException;
 import com.liang.common.utils.ExcelPoiUtil;
+import com.liang.dao.StaReimbursementDao;
 import com.liang.entity.*;
 import com.liang.service.*;
 //import com.liang.vo.service.*;
@@ -91,6 +92,9 @@ public class StaPayapprovalController extends BaseController {
         return ResponseEntity.ok(this.staPayapprovalService.deleteById(id));
     }
 
+
+    @Resource
+    private StaReimbursementDao staReimbursementDao;
     /**
      * 列表初始化
      *
@@ -105,6 +109,9 @@ public class StaPayapprovalController extends BaseController {
         model.addAttribute("approveList", approveList);
         //当前用户ID
         model.addAttribute("userId", getSysUserId());
+        //年份
+        List<String> yearList = staReimbursementDao.getYearList();
+        model.addAttribute("yearList", yearList);
 
         return "payapply/list";
     }
@@ -122,7 +129,9 @@ public class StaPayapprovalController extends BaseController {
                            @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 = "rwsmc") String rwsmc) {
+                           @RequestParam(required = false, defaultValue = "", value = "rwsmc") String rwsmc,
+                           @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
+                           @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc) {
         PageHelper.startPage(pageNum, pageSize);
         if (cjsj1 != "" && cjsj2 != "" && cjsj1.compareTo(cjsj2) > 0) {
             String cjsj = cjsj1;
@@ -131,6 +140,14 @@ public class StaPayapprovalController extends BaseController {
         }
 
         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("fysqmc", fysqmc);
@@ -141,8 +158,9 @@ public class StaPayapprovalController extends BaseController {
         paraMap.put("cjsj2", cjsj2);
         paraMap.put("cjr", cjr);
         paraMap.put("rwsmc", rwsmc);
-        List<StaPayapproval> list = staPayapprovalService.getFksqList(paraMap);
+        paraMap.put("xmmc",xmmc);
 
+        List<StaPayapproval> list = staPayapprovalService.getFksqList(paraMap);
         PageInfo<StaPayapproval> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<StaPayapproval> rows = pageinfo.getList();
@@ -150,7 +168,6 @@ public class StaPayapprovalController extends BaseController {
         Map<String, Object> result = new HashMap<>();
         result.put(RESULT_ROWS, rows);
         result.put(RESULT_TOTAL, total);
-
         return BaseResult.success(result);
     }
 

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

@@ -128,6 +128,7 @@ public class StaReimbursementController extends BaseController {
         List<Map<String, String>> approveList = sysDictInfoService.queryByCode("xm_status");
         model.addAttribute("approveList", approveList);
         model.addAttribute("userId", getUserId());
+
         //年份
         List<String> yearList = staReimbursementDao.getYearList();
         model.addAttribute("yearList", yearList);

src/main/java/com/liang/entity/FeeManagemant.java

@@ -43,6 +43,25 @@ public class FeeManagemant implements Serializable {
     private Double byjye;//备用金余额
     private Double rzbfb;//入账百分比
 
+    private String spzt;
+    private String bh;
+
+    public String getSpzt() {
+        return spzt;
+    }
+
+    public void setSpzt(String spzt) {
+        this.spzt = spzt;
+    }
+
+    public String getBh() {
+        return bh;
+    }
+
+    public void setBh(String bh) {
+        this.bh = bh;
+    }
+
     public Integer getId() {
         return id;
     }

src/main/java/com/liang/entity/StaPayapproval.java

@@ -80,6 +80,36 @@ public class StaPayapproval implements Serializable {
     private String sqmc;
     private String bh;
 
+    private String xmmc;
+
+    private String erpbh;
+
+    private String nf;
+
+    public String getNf() {
+        return nf;
+    }
+
+    public void setNf(String nf) {
+        this.nf = nf;
+    }
+
+    public String getErpbh() {
+        return erpbh;
+    }
+
+    public void setErpbh(String erpbh) {
+        this.erpbh = erpbh;
+    }
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
     public String getBh() {
         return bh;
     }

src/main/java/com/liang/entity/StaReimbursement.java

@@ -83,6 +83,16 @@ public class StaReimbursement implements Serializable {
 
     private String nf;
 
+    private String erpbh;
+
+    public String getErpbh() {
+        return erpbh;
+    }
+
+    public void setErpbh(String erpbh) {
+        this.erpbh = erpbh;
+    }
+
     public String getNf() {
         return nf;
     }

src/main/resources/mapper/PrjAnnualbudgetDao.xml

@@ -337,14 +337,23 @@
 
     <!--获取年度预算列表-->
     <select id="getNdysList" resultMap="PrjAnnualbudgetMap" parameterType="map">
-        select a.*, t.XMLXMC, r.XM as XMFZRXM, d.dept_name as SSBMMC, u.name as SQRXM, bd.XMZYS
-        from prj_AnnualBudget a
-        left join base_ProjectType t on t.XMLX = a.XMLX
-        left join base_Person r on r.ID = a.XMFZR
-        left join sys_user_info u on u.user_id = a.SQR
-        left join sys_dept_info d on d.dept_id = a.SSBM
-        left join prj_AnnualBudgetDetail bd on bd.NYS = a.ID and bd.FJ = ''
-        where 1 = 1
+        SELECT
+        a.*,
+        t.XMLXMC,
+        r.XM AS XMFZRXM,
+        d.dept_name AS SSBMMC,
+        u.name AS SQRXM,
+        bd.XMZYS
+        FROM
+        prj_AnnualBudget a
+        LEFT JOIN base_ProjectType t ON t.XMLX = a.XMLX
+        LEFT JOIN base_Person r ON r.ID = a.XMFZR
+        LEFT JOIN sys_user_info u ON u.user_id = a.SQR
+        LEFT JOIN sys_dept_info d ON d.dept_id = a.SSBM
+        LEFT JOIN prj_AnnualBudgetDetail bd ON bd.NYS = a.ID
+        AND bd.FJ = ''
+        WHERE
+        1 = 1
         <if test="userId != null and userId != ''">
             and (a.SQR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = a.ID))
         </if>

src/main/resources/mapper/PrjProjectDao.xml

@@ -60,6 +60,8 @@
         <result property="ye" column="YE" jdbcType="NUMERIC"/>
         <result property="byjye" column="BYJYE" jdbcType="NUMERIC"/>
         <result property="rzbfb" column="RZBFB" jdbcType="NUMERIC"/>
+        <result property="bh" column="BH" jdbcType="VARCHAR"/>
+        <result property="spzt" column="SPZT" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -710,32 +712,123 @@
     </select>
     <!--     获取费用管理列表 -->
     <select id="getFyglList" resultMap="FeeManagementMap" parameterType="map">
-        select * from(
-        select p.ID,p.ZWMC,p.ERPBH,p.XMLX,t.XMLXMC,b.XMFZRXM,d.dept_name as SSBMMC,b.NF, case when aa.NF=b.NF then
-        aa.YSJE else 0 end as YSJE, case when aa.NF=b.NF then aa.XMZ else 0 end as XMZ, (SUM(case when b.BZJE is null
-        and b.SFBYJ =0 then b.SQJE else 0 end)/10000+SUM(case when b.BZJE is not null and b.SFBYJ =0 then b.BZJE else 0
-        end)/10000) as SQJE, (SUM(case when b.BZJE is not null and b.SFBYJ =0 then b.BZJE else 0 end)/10000) as BZJE,
-        case when aa.NF=b.NF then aa.BYJ else 0 end as BYJ, (SUM(case when b.BZJE is null and b.SFBYJ =1 then b.SQJE
-        else 0 end)/10000+SUM(case when b.BZJE is not null and b.SFBYJ =1 then b.BZJE else 0 end)/10000) as BYJSQJE,
-        (SUM(case when b.BZJE is not null and b.SFBYJ =1 then b.BZJE else 0 end)/10000) as BYJBZJE, ((case when
-        aa.NF=b.NF then aa.XMZ else 0 end)-(SUM(case when b.BZJE is null and b.SFBYJ =0 then b.SQJE else 0
-        end)/10000+SUM(case when b.BZJE is not null and b.SFBYJ =0 then b.BZJE else 0 end)/10000)) as YE, ((case when
-        aa.NF=b.NF then aa.BYJ else 0 end)-(SUM(case when b.BZJE is null and b.SFBYJ =1 then b.SQJE else 0
-        end)/10000+SUM(case when b.BZJE is not null and b.SFBYJ =1 then b.BZJE else 0 end)/10000)) as BYJYE, (((SUM(case
-        when b.BZJE is not null and b.NYS=aa.ID and b.SFBYJ =0 then b.BZJE else 0 end)/10000)+(SUM(case when b.BZJE is
-        not null and b.NYS=aa.ID and b.SFBYJ =1 then b.BZJE else 0 end)/10000))/(case when aa.NF=b.NF then aa.YSJE else
-        1 end)) as RZBFB from prj_Project p left join (select s.*,r.XM as XMFZRXM from sta_BudgetApproval s left join
-        base_Person r on r.ID=s.XMFZR where s.SPZT != '作废') b on b.XMID=p.ID left join base_ProjectType t on
-        t.XMLX=p.XMLX left join sys_dept_info d on d.dept_id=p.SSBM left join (select a.*,bd.YSJE,bd.XMZ,bd.BYJ from
-        prj_AnnualBudget a left join prj_AnnualBudgetDetail bd on bd.NYS = a.ID and bd.FJ = '' where a.SPZT != '作废')
-        aa
-        on aa.RWS=p.ID where 1 = 1
-        <if test="xmmc != null and xmmc != ''">and p.ZWMC like '%'+#{xmmc}+'%'</if>
-        <if test="erpbh != null and erpbh != ''">and p.ERPBH like '%'+#{erpbh}+'%'</if>
-        <if test="xmlx != null and xmlx != ''">and p.XMLX = #{xmlx}</if>
-        <if test="xmfzrxm != null and xmfzrxm != ''">and b.XMFZRXM like '%'+#{xmfzrxm}+'%'</if>
-        <if test="ssbmmc != null and ssbmmc != ''">and d.dept_name like '%'+#{ssbmmc}+'%'</if>
-        <if test="nf != null and nf != ''">and b.NF = #{nf}</if>
+        SELECT
+        *
+        FROM
+        (
+        SELECT
+        p.ID,
+        p.ZWMC,
+        p.ERPBH,
+        p.XMLX,
+        t.XMLXMC,
+        b.XMFZRXM,
+        d.dept_name AS SSBMMC,
+        b.NF,
+        CASE
+
+        WHEN aa.NF= b.NF THEN
+        aa.YSJE ELSE 0
+        END AS YSJE,
+        CASE
+        WHEN aa.NF= b.NF THEN
+        aa.XMZ ELSE 0
+        END AS XMZ,
+        (
+        SUM ( CASE WHEN b.BZJE IS NULL AND b.SFBYJ = 0 THEN b.SQJE ELSE 0 END ) / 10000+SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 0 THEN b.BZJE ELSE 0 END ) / 10000
+        ) AS SQJE,
+        ( SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 0 THEN b.BZJE ELSE 0 END ) / 10000 ) AS BZJE,
+        CASE
+
+        WHEN aa.NF= b.NF THEN
+        aa.BYJ ELSE 0
+        END AS BYJ,
+        (
+        SUM ( CASE WHEN b.BZJE IS NULL AND b.SFBYJ = 1 THEN b.SQJE ELSE 0 END ) / 10000+SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 1 THEN b.BZJE ELSE 0 END ) / 10000
+        ) AS BYJSQJE,
+        ( SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 1 THEN b.BZJE ELSE 0 END ) / 10000 ) AS BYJBZJE,
+        (
+        ( CASE WHEN aa.NF= b.NF THEN aa.XMZ ELSE 0 END ) - (
+        SUM ( CASE WHEN b.BZJE IS NULL AND b.SFBYJ = 0 THEN b.SQJE ELSE 0 END ) / 10000+SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 0 THEN b.BZJE ELSE 0 END ) / 10000
+        )
+        ) AS YE,
+        (
+        ( CASE WHEN aa.NF= b.NF THEN aa.BYJ ELSE 0 END ) - (
+        SUM ( CASE WHEN b.BZJE IS NULL AND b.SFBYJ = 1 THEN b.SQJE ELSE 0 END ) / 10000+SUM ( CASE WHEN b.BZJE IS NOT NULL AND b.SFBYJ = 1 THEN b.BZJE ELSE 0 END ) / 10000
+        )
+        ) AS BYJYE,
+        (
+        (
+        (
+        SUM (
+        CASE
+
+        WHEN b.BZJE IS NOT NULL
+        AND b.NYS= aa.ID
+        AND b.SFBYJ = 0 THEN
+        b.BZJE ELSE 0
+        END
+        ) / 10000
+        ) + (
+        SUM (
+        CASE
+
+        WHEN b.BZJE IS NOT NULL
+        AND b.NYS= aa.ID
+        AND b.SFBYJ = 1 THEN
+        b.BZJE ELSE 0
+        END
+        ) / 10000
+        )
+        ) / ( CASE WHEN aa.NF= b.NF THEN aa.YSJE ELSE 1 END )
+        ) AS RZBFB
+        FROM
+        prj_Project p
+        LEFT JOIN (
+        SELECT
+        s.*,
+        r.XM AS XMFZRXM
+        FROM
+        sta_BudgetApproval s
+        LEFT JOIN base_Person r ON r.ID= s.XMFZR
+        WHERE
+        s.SPZT != '作废'
+        ) b ON b.XMID= p.ID
+        LEFT JOIN base_ProjectType t ON t.XMLX= p.XMLX
+        LEFT JOIN sys_dept_info d ON d.dept_id= p.SSBM
+        LEFT JOIN (
+        SELECT
+        a.*,
+        bd.YSJE,
+        bd.XMZ,
+        bd.BYJ
+        FROM
+        prj_AnnualBudget a
+        LEFT JOIN prj_AnnualBudgetDetail bd ON bd.NYS = a.ID
+        AND bd.FJ = ''
+        WHERE
+        a.SPZT != '作废'
+        ) aa ON aa.RWS= p.ID
+        WHERE
+        1 = 1
+        <if test="xmmc != null and xmmc != ''">
+          and p.ZWMC like '%'+#{xmmc}+'%'</if>
+        <if test="erpbh != null and erpbh != ''">
+          and p.ERPBH like '%'+#{erpbh}+'%'</if>
+        <if test="xmlx != null and xmlx != ''">
+          and p.XMLX = #{xmlx}</if>
+        <if test="xmfzrxm != null and xmfzrxm != ''">
+          and b.XMFZRXM like '%'+#{xmfzrxm}+'%'</if>
+        <if test="ssbmmc != null and ssbmmc != ''">
+          and d.dept_name like '%'+#{ssbmmc}+'%'</if>
+        <if test="nf != null and nf != ''">
+          and b.NF = #{nf}</if>
+        <if test="bh != null and bh != ''">
+            and s.BH like '%'+#{bh}+'%'
+        </if>
+        <if test="spzt != null and spzt != ''">
+            and s.SPZT = #{spzt}
+        </if>
         group by p.ID,p.ZWMC,p.ERPBH,p.XMLX,t.XMLXMC,b.XMFZRXM,d.dept_name,b.NF,aa.NF,aa.YSJE,aa.XMZ,aa.BYJ
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">order by</when>

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -388,19 +388,59 @@
 
     <!--获取费用申请列表-->
     <select id="getFysqList" resultMap="StaBudgetapprovalMap" parameterType="map">
-        select b.*, t.XMLXMC, d.dept_name as SSBMMC, g.FYMC as FYLBMC, r.XM as XMFZRXM,
-        (SELECT STUFF((SELECT ','+XM from (select xm from base_Person
-        where id in (select dkyfzrid from
-        (select DISTINCT zwmc,SUBSTRING(dkyfzr, number,CHARINDEX(',',dkyfzr+',',number)-number) as dkyfzrid
-        from prj_Project WITH(nolock) ,master..spt_values with(nolock) where number >= 1 and len(DKYFZR) > number
-        and SUBSTRING(','+DKYFZR,number,1)=',' and ID = b.XMID) t)) B for xml path('')),1,1,'')) as DKYFZRXM
-        from sta_BudgetApproval b
-        left join base_ProjectType t on t.XMLX = b.XMLX
-        left join prj_Project p on p.ID = b.XMID
-        left join sys_dept_info d on d.dept_id = b.SSBM
-        left join prj_AnnualBudgetDetail g on g.ID = b.FYLB
-        left join base_Person r on r.ID = b.XMFZR
-        where b.SFBYJ = 0
+        SELECT
+        b.*,
+        t.XMLXMC,
+        d.dept_name AS SSBMMC,
+        g.FYMC AS FYLBMC,
+        r.XM AS XMFZRXM,
+        (
+        SELECT
+        STUFF(
+        (
+        SELECT
+        ',' + XM
+        FROM
+        (
+        SELECT
+        xm
+        FROM
+        base_Person
+        WHERE
+        id IN (
+        SELECT
+        dkyfzrid
+        FROM
+        (
+        SELECT DISTINCT
+        zwmc,
+        SUBSTRING ( dkyfzr, number, CHARINDEX( ',', dkyfzr + ',', number ) - number ) AS dkyfzrid
+        FROM
+        prj_Project WITH ( nolock ),
+        master..spt_values WITH ( nolock )
+        WHERE
+        number >= 1
+        AND len( DKYFZR ) > number
+        AND SUBSTRING ( ',' + DKYFZR, number, 1 ) = ','
+        AND ID = b.XMID
+        ) t
+        )
+        ) B FOR xml path ( '' )
+        ),
+        1,
+        1,
+        ''
+        )
+        ) AS DKYFZRXM
+        FROM
+        sta_BudgetApproval b
+        LEFT JOIN base_ProjectType t ON t.XMLX = b.XMLX
+        LEFT JOIN prj_Project p ON p.ID = b.XMID
+        LEFT JOIN sys_dept_info d ON d.dept_id = b.SSBM
+        LEFT JOIN prj_AnnualBudgetDetail g ON g.ID = b.FYLB
+        LEFT JOIN base_Person r ON r.ID = b.XMFZR
+        WHERE
+        b.SFBYJ = 0
         -- and b.SPZT != '审批结束'
         <if test="userId != null and userId != ''">
             and (b.SQR = #{userId} or #{userId} in (select SHR from prj_ApproveRecord where XMID = b.ID))
@@ -435,6 +475,9 @@
         <if test="nf != null and nf != ''">
             and b.NF = #{nf}
         </if>
+        <if test="xmmc != null and xmmc != ''">
+            and b.XMMC = #{xmmc}
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

src/main/resources/mapper/StaPayapprovalDao.xml

@@ -16,6 +16,9 @@
         <result property="fkjh" column="FKJH" jdbcType="INTEGER"/>
         <result property="sqmc" column="SQMC" jdbcType="VARCHAR"/>
         <result property="bh" column="BH" jdbcType="VARCHAR"/>
+        <result property="erpbh" column="ERPBH" jdbcType="VARCHAR"/>
+        <result property="xmmc" column="XMMC" jdbcType="VARCHAR"/>
+        <result property="nf" column="NF" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--查询单个-->
@@ -202,14 +205,27 @@
 
     <!--获取付款申请列表-->
     <select id="getFksqList" resultMap="StaPayapprovalMap" parameterType="map">
-        select b.*,g.bh, u.name as CJRXM, FORMAT(b.CJSJ, 'yyyy-MM-dd') as CJRQ, c.HTMC, c.WJ as HTWJ, p.JHMC as FKJHMC,
-        g.SQMC as FYSQMC, g.XMMC as RWSMC
-        from sta_PayApproval b
-        left join prj_PayPlan p on p.ID = b.FKJH
-        left join prj_Contract c on c.ID = b.HT
-        left join sta_BudgetApproval g on g.ID = b.FYSQ
-        left join sys_user_info u on u.user_id = b.CJR
-        where 1 = 1
+        SELECT
+        b.*,
+        g.BH,
+        g.XMMC,
+        g.ERPBH,
+        g.NF,
+        u.name AS CJRXM,
+        b.CJSJ AS CJRQ,
+        c.HTMC,
+        c.WJ AS HTWJ,
+        p.JHMC AS FKJHMC,
+        g.SQMC AS FYSQMC,
+        g.XMMC AS RWSMC
+        FROM
+        sta_PayApproval b
+        LEFT JOIN prj_PayPlan p ON p.ID = b.FKJH
+        LEFT JOIN prj_Contract c ON c.ID = b.HT
+        LEFT JOIN sta_BudgetApproval g ON g.ID = b.FYSQ
+        LEFT JOIN sys_user_info u ON u.user_id = b.CJR
+        WHERE
+        1 = 1
         <if test=" rwsmc != null and rwsmc != ''">
             and g.XMMC like '%'+#{rwsmc}+'%'
         </if>
@@ -237,6 +253,12 @@
         <if test="cjsj2 != null and cjsj2 != ''">
             and b.CJSJ &lt;= #{cjsj2}
         </if>
+        <if test="xmmc != null and xmmc != ''">
+            and g.XMMC like '%'+#{xmmc}+'%'
+        </if>
+        <if test="nf != null and nf != ''">
+            and g.nf = #{nf}
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}
@@ -256,7 +278,7 @@
         WHEN b.SPZT = '作废' THEN 999
         END
         ASC,
-        p.CJSJ DESC
+            b.CJSJ DESC
     </select>
 
     <!--批量删除付款申请-->

src/main/resources/mapper/StaReimbursementDao.xml

@@ -16,6 +16,7 @@
         <result property="spzt" column="SPZT" jdbcType="VARCHAR"/>
         <result property="sfbyj" column="SFBYJ" jdbcType="VARCHAR"/>
         <result property="nf" column="NF" jdbcType="VARCHAR"/>
+        <result property="erpbh" column="ERPBH" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--id查询单个-->
@@ -172,14 +173,26 @@
 
     <!--获取报账列表-->
     <select id="getReimburseList" resultMap="StaReimbursementMap" parameterType="map">
-        select r.*, a.BH as FYSQBH, a.SQMC as FYSQMC, u.name as BZRXM, a.XMID, a.XMMC,a.NF,
+        SELECT
+        r.*,
+        a.BH AS FYSQBH,
+        a.SQMC AS FYSQMC,
+        u.name AS BZRXM,
+        a.XMID,
+        a.XMMC,
+        a.NF,
+        a.ERPBH,
         CASE
-        WHEN a.SFBYJ = 1 THEN '是' ELSE '否'
+
+        WHEN a.SFBYJ = 1 THEN
+        '是' ELSE '否'
         END AS SFBYJ
-        from sta_Reimbursement r
-        inner join sta_BudgetApproval a on a.ID = r.FYSQ
-        left join sys_user_info u on u.user_id = r.BZR
-        where 1 = 1
+        FROM
+        sta_Reimbursement r
+        INNER JOIN sta_BudgetApproval a ON a.ID = r.FYSQ
+        LEFT JOIN sys_user_info u ON u.user_id = r.BZR
+        WHERE
+        1 = 1
         <if test="nf != null and nf != ''">
             and a.NF = #{nf}
         </if>

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

@@ -17,20 +17,20 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <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">
+                            <label class="layui-form-label" style="width: 70px">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <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">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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">
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <label class="layui-form-label" style="width: 70px">年份</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <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>
@@ -38,8 +38,8 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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>
                                     <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
@@ -47,8 +47,8 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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">
                                     <option value="">全部</option>
                                     <option th:each="item:${xmlxList}" th:text="${item.name}" th:value="${item.code}"></option>
@@ -57,15 +57,15 @@
                         </div>
 
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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">
-                            <label class="layui-form-label" style="width: 60px">任务书</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <label class="layui-form-label" style="width: 70px">任务书名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <input type="text" id="rwsmc" name="rwsmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
@@ -118,6 +118,24 @@
                 </button>
             </div>
         </script>
+        <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>
 
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
@@ -137,10 +155,10 @@
         var form = layui.form
         table = layui.table;
         var userId = $("#userId").val();
-
+        var selectedYear = $('#nf').val();
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'prjAnnualbudget/list',
+            url: AjaxUtil.ctx + 'prjAnnualbudget/list/?nf='+selectedYear,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -148,9 +166,9 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', align: 'center'},
-                    {field: 'spzt', width: '13%', title: '审批状态'},
+                    {field: 'spzt', width: '7%', title: '审批状态'},
                     {field: 'xmmc', width: '20%', title: '项目名称'},
-                    // {field: 'mc', width: '20%', title: '名称'},
+                    {field: 'rwsmc', width: '20%', title: '任务书名称'},
                     {field: 'mc', width: '20%', title: '年度预算名称'},
                     {field: 'erpbh', width: '8%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '12%', title: '项目类型'},

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

@@ -16,61 +16,86 @@
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
                     <div class="layui-form-item">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="rwsmc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
 
-                        <label class="layui-form-label" style="width: 60px">项目名称</label>
-                        <div class="layui-input-inline"  style="width: 250px">
-                            <input type="text" name="rwsmc" autocomplete="off" class="layui-input">
+                        <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" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">ERP编号</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="erpbh" autocomplete="off" class="layui-input">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 90px;">编号</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="bh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 90px;left: 5px">费用申请编号</label>
-                        <div class="layui-input-inline"  style="width: 225px">
-                            <input type="text" name="bh" autocomplete="off" class="layui-input">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">年份</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="nf" id="nf" lay-filter="status" class="layui-select">
+                                    <option value="">全部</option>
+                                    <!-- Assume 'yearList' is populated with options -->
+                                    <option th:each="item: ${yearList}" th:text="${item}" th:value="${item}"></option>
+                                </select>
+                            </div>
                         </div>
-                        <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: 150px;">
+                                <select name="spzt" lay-filter="status" class="layui-select">
+                                    <option value="">全部</option>
+                                    <!-- Assume 'approveList' is populated with options -->
+                                    <option th:each="item: ${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
+                                </select>
+                            </div>
                         </div>
-                        <tr>
-                        <div class="layui-inline" style="top: 10px;left: 0px">
-                            <label class="layui-form-label" style="width: 60px">费用申请</label>
-                            <div class="layui-input-inline"  style="width: 250px">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">费用申请</label>
+                            <div class="layui-input-inline" style="width: 140px;">
                                 <input type="text" name="fysqmc" autocomplete="off" class="layui-input">
                             </div>
-                        <label class="layui-form-label" style="width: 60px">创建人</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="cjr" autocomplete="off" class="layui-input">
                         </div>
 
-
-
-                            <div class="layui-inline">
-                                <label class="layui-form-label" style="width: 90px">创建时间</label>
-                                <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" name="cjsj1" id="cjsj1" placeholder="开始日期" class="layui-input" readonly>
-                                </div>
-                                <div class="layui-form-mid">-</div>
-                                <div class="layui-input-inline" style="width: 100px">
-                                    <input type="text" name="cjsj2" id="cjsj2" placeholder="结束日期" class="layui-input" readonly>
-                                </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">创建人</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="cjr" autocomplete="off" class="layui-input">
                             </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" style="margin-left: 20px">
+                            <label class="layui-form-label" style="width: 70px;">创建时间</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="cjsj1" id="cjsj1" placeholder="开始日期" class="layui-input" readonly>
+                            </div>
+                            <div class="layui-form-mid">-</div>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="cjsj2" id="cjsj2" placeholder="结束日期" class="layui-input" readonly>
+                            </div>
                         </div>
-                        </tr>
+
+                        <div class="layui-inline">
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</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>
+                    </div>
+
                 </form>
             </div>
         </fieldset>
 
+
+
         <script type="text/html" id="toolbarDemo">
             <div class="layui-btn-container">
 
@@ -108,6 +133,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>
@@ -123,7 +166,7 @@
             laydate = layui.laydate,
             table = layui.table;
         var userId = $("#userId").val();
-
+        var selectYear = $("#nf").val();
 
 
         //日期
@@ -136,7 +179,7 @@
 
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staPayapproval/list',
+            url: AjaxUtil.ctx + 'staPayapproval/list/?nf='+ selectYear,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -145,8 +188,10 @@
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', fixed: 'left'},
                     {field: 'spzt', width: '11%',title: '审批状态', fixed: 'left'},
-                    {field: 'rwsmc', width: '11%', title: '项目名称'},
+                    {field: 'rwsmc', width: '11%', title: '项目名称', fixed: 'left'},
                     {field: 'bh', width: '11%', title: '费用申请编号'},
+                    {field: 'erpbh', width: '10%', title: 'ERP编号'},
+                    {field: 'nf',width: '7%',title: '年份'},
                     {field: 'htmc', width: '11%', title: '合同'},
                     {field: 'fysqmc', width: '15%',title: '费用申请'},
                     {field: 'bcfkje', width: '10%', title: '本次付款金额(万元)'},

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

@@ -16,40 +16,73 @@
             <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: 200px">
-                            <input type="text" name="mc" autocomplete="off" class="layui-input">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="xmmc" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 90px">费用申请编号</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
+
+                        <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" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 30px">年份</label>
-                        <div class="layui-input-inline" style="width: 150px">
-                            <select name="nf" id="nf" lay-filter="status">
-                                <option value="">全部</option>
-                                <option th:each="item:${yearList}" th:text="${item}" th:value="${item}"></option>
-                            </select>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 100px;">费用申请编号</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <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: 70px;">年份</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="nf" id="nf" lay-filter="status" class="layui-select">
+                                    <option value="">全部</option>
+                                    <!-- Assume 'yearList' is populated with options -->
+                                    <option th:each="item: ${yearList}" th:text="${item}" th:value="${item}"></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="bzr" autocomplete="off" class="layui-input">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">审批状态</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="spzt" lay-filter="status" class="layui-select">
+                                    <option value="">全部</option>
+                                    <!-- Assume 'approveList' is populated with options -->
+                                    <option th:each="item: ${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
+                                </select>
+                            </div>
                         </div>
 
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">报账名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="mc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
 
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">报账人</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="bzr" autocomplete="off" class="layui-input">
+                            </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">&#xe615;</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>
                     </div>
+
                 </form>
             </div>
         </fieldset>
@@ -121,9 +154,12 @@
                 [
                     {type: "radio", fixed: 'left'},
                     {type: 'numbers', fixed: 'left',title: '序号'},
+                    {field: 'spzt', width: '10%',title: '审批状态',fixed: 'left'},
+                    {field: 'xmmc', width: '20%', title: '项目名称', fixed: 'left'},
                     {field: 'mc', width: '20%', title: '报账名称', fixed: 'left'},
-                    {field: 'spzt', width: '10%',title: '审批状态'},
                     {field: 'fysqbh', width: '10%',title: '费用申请编号'},
+                    {field: 'nf',title: '年份',width: '10%'},
+                    {field: 'erpbh', width: '10%',title: 'ERP编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},
                     {field: 'bhsje', width: '8%', title: '不含税金额(元)'},
                     {field: 'sf', width: '6%', title: '税费(元)'},
@@ -131,7 +167,7 @@
                     {field: 'cjsj', width: '8%', title: '创建时间', align: 'center'},
                     {field: 'fysqmc', title: '费用申请'},
                     {field: 'sfbyj', title: '是否备用金',width: '6%'},
-                    {field: 'nf',title: '年份',width: '10%'}
+
                 ]
             ],
             autoSort: false,

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

@@ -16,47 +16,73 @@
             <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: 200px">
-                            <input type="text" name="xmmc" autocomplete="off" class="layui-input">
-                        </div>
-                        <label class="layui-form-label" style="width: 60px">审批状态</label>
-                        <div class="layui-input-inline" style="width: 100px">
-                            <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: 70px;">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="xmmc" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">申请编号</label>
-                        <div class="layui-input-inline"  style="width: 150px">
-                            <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
+
+                        <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" name="erpbh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 50px">报账人</label>
-                        <div class="layui-input-inline"  style="width: 100px">
-                            <input type="text" name="bzr" autocomplete="off" class="layui-input">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">编号</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="fysqbh" autocomplete="off" class="layui-input">
+                            </div>
                         </div>
-                        <label class="layui-form-label" style="width: 60px">报账名称</label>
-                        <div class="layui-input-inline"  style="width: 200px">
-                            <input type="text" name="mc" autocomplete="off" class="layui-input">
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">年份</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="nf" id="nf" lay-filter="status" class="layui-select">
+                                    <option value="">全部</option>
+                                    <!-- Assume 'yearList' is populated with options -->
+                                    <option th:each="item: ${yearList}" th:text="${item}" th:value="${item}"></option>
+                                </select>
+                            </div>
                         </div>
+
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <select name="nf" id="nf" lay-filter="status">
+                            <label class="layui-form-label" style="width: 70px;">审批状态</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <select name="spzt" lay-filter="status" class="layui-select">
                                     <option value="">全部</option>
-                                    <option th:each="item:${yearList}" th:text="${item}"
-                                            th:value="${item}"></option>
+                                    <!-- Assume 'approveList' is populated with options -->
+                                    <option th:each="item: ${approveList}" th:text="${item.name}" th:value="${item.name}"></option>
                                 </select>
                             </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">
+                            <label class="layui-form-label" style="width: 70px;">报账名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="mc" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px;">报账人</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" name="bzr" autocomplete="off" class="layui-input">
+                            </div>
+                        </div>
+
+                        <div class="layui-inline">
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
+                                <i class="layui-icon">&#xe6b2;</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>
                     </div>
+
                 </form>
             </div>
         </fieldset>
@@ -126,16 +152,17 @@
                 [
                     {type: "checkbox", fixed: 'left'},
                     {type: 'numbers', fixed: 'left',title: '序号'},
-                    {field: 'mc', width: '15%', title: '报账名称', fixed: 'left'},
+                    {field: 'spzt', width: '10%',title: '审批状态',fixed: 'left'},
                     {field: 'xmmc',width: '15%',title: '项目名称',fixed: 'left'},
-                    {field: 'spzt', width: '10%',title: '审批状态'},
-                    {field: 'fysqbh', width: '10%',title: '费用申请编号'},
+                    {field: 'mc', width: '15%', title: '报账名称'},
+                    {field: 'erpbh',width: '10%',title: 'ERP编号'},
+                    {field: 'fysqbh', width: '10%',title: '编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},
                     {field: 'bhsje', width: '8%', title: '不含税金额(元)'},
                     {field: 'sf', width: '6%', title: '税费(元)'},
                     {field: 'bzrxm', width: '7%', title: '报账人'},
                     {field: 'cjsj', width: '8%', title: '创建时间', align: 'center'},
-                    {field: 'fysqmc', title: '费用申请'}
+                    {field: 'fysqmc', title: '费用申请',width: '18%'}
                 ]
             ],
             autoSort: false,

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

@@ -7,6 +7,29 @@
     <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
     <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
     <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
+<style>
+    .layui-form-item {
+        margin-bottom: 10px; /* 调整每个表单项之间的间距 */
+    }
+
+    .layui-inline {
+        display: inline-block;
+        margin-bottom: 10px; /* 调整每行表单项之间的间距 */
+    }
+
+    .layui-form-label {
+        width: 70px;
+        text-align: right; /* 标签右对齐 */
+        margin-right: 10px; /* 调整标签和输入框之间的距离 */
+    }
+
+    .layui-input-inline {
+        width: 140px;
+        margin-right: 10px; /* 调整输入框之间的距离 */
+    }
+</style>
+
+
 </head>
 <body>
 <div class="layuimini-container">
@@ -17,29 +40,36 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <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: 450px">
-                                <input type="text" id="sqmc" name="sqmc" autocomplete="off" class="layui-input">
-
+                            <label class="layui-form-label" style="width: 70px;">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <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; margin-left: -10px">费用类别</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="fylb" name="fylb" autocomplete="off" class="layui-input">
-
+                        <div class="layui-inline" style="margin-left: -10px;">
+                            <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">
-                            <label class="layui-form-label" style="width: 60px;margin-left: -10px">申请人</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="sqr" name="sqr" autocomplete="off" class="layui-input">
-
+                            <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">
+                            </div>
+                        </div>
+                        <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;">
+                                <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>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 180px">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">审批状态</label>
+                            <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}"
@@ -47,73 +77,58 @@
                                 </select>
                             </div>
                         </div>
+                    </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: 150px">
-                                <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
+                            <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">
-                            <label class="layui-form-label" style="width: 95px;">电科院负责人</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="hidden" id="dkyfzr" name="dkyfzr" class="layui-input">
-                                <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" autocomplete="off"
-                                       class="layui-input" readonly>
+                        <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;">
+                                <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>
-                        <br>
+
                         <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">
+                            <label class="layui-form-label" style="width: 70px;">申请名称</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="sqmc" name="sqmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 95px;">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">费用类别</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="fylb" name="fylb" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">项目类型</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>
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px;">申请人</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="text" id="sqr" name="sqr" autocomplete="off" class="layui-input">
                             </div>
                         </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
-                                <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 class="layui-inline" style="margin-left: -20px;margin-top: 10px">
+                            <label class="layui-form-label" style="width: 90px;">电科院负责人</label>
+                            <div class="layui-input-inline" style="width: 140px;">
+                                <input type="hidden" id="dkyfzr" name="dkyfzr" class="layui-input">
+                                <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" autocomplete="off" class="layui-input" readonly>
                             </div>
                         </div>
-                        <!--                        <div class="layui-inline">-->
-                        <!--                            <label class="layui-form-label" style="width: 60px; margin-left: -12px">是否报账</label>-->
-                        <!--                            <div class="layui-input-inline" style="width: 100px">-->
-                        <!--                                <select name="sfbz" id="sfbz" lay-filter="status">-->
-                        <!--                                    <option value="">全部</option>-->
-                        <!--                                    <option value="1">是</option>-->
-                        <!--                                    <option value="0">否</option>-->
-                        <!--                                </select>-->
-                        <!--                            </div>-->
-                        <!--                        </div>-->
-
                         <div class="layui-inline">
-                            <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>
+                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i class="layui-icon">&#xe615;</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>
                     </div>
+
+
                 </form>
             </div>
         </fieldset>
@@ -157,11 +172,29 @@
                 </button>
             </div>
         </script>
-
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
         <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>
@@ -206,10 +239,10 @@
                 $("#dkyfzr").val(NEWJSON1.join(","));
             }
         });
-
+        var selectedYear = $('#nf').val();
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staBudgetapproval/list_apply',
+            url: AjaxUtil.ctx + 'staBudgetapproval/list_apply/?nf='+selectedYear,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -219,6 +252,7 @@
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'bh', width: '8%', title: '编号'},
+                    {field: 'xmmc', width: '25%', title: '项目名称'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '10%', title: 'ERP编号'},
                     {field: 'fylbmc', width: '8%', title: '费用类别'},

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

@@ -17,36 +17,26 @@
                 <form class="layui-form" action="" lay-filter="search-form">
                     <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">
+                            <label class="layui-form-label" style="width: 70px">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <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; margin-left: -10px">审批状态</label>
-                            <div class="layui-input-inline" style="width: 180px">
-                                <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>
-                                </select>
-                            </div>
-                        </div>
-                        <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px; margin-left: -10px">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">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">
-                            <label class="layui-form-label" style="width: 30px; margin-left: -10px">编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">编号</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <input type="text" id="bh" name="bh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 30px; margin-left: -10px">年份</label>
-                            <div class="layui-input-inline" style="width: 100px">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">年份</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <select name="nf" id="nf" lay-filter="status">
                                     <option value="">全部</option>
                                     <option th:each="item:${yearList}" th:text="${item.nf}"
@@ -54,6 +44,19 @@
                                 </select>
                             </div>
                         </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px; margin-left: -10px">审批状态</label>
+                            <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>
+                                </select>
+                            </div>
+                        </div>
+
+
+
 
                         <div class="layui-inline" style="margin-left: 0px">
                             <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn"><i
@@ -144,13 +147,14 @@
                     {type: 'numbers', align: 'center', fixed: 'left'},
                     {field: 'spzt', width: '10%', title: '审批状态', sort: true},
                     {field: 'bh', width: '9%', title: '编号'},
+                    {field: 'xmmc', width: '20%', title: '项目名称'},
                     {field: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'nf', width: '5%', title: '年份'},
                     {field: 'sqje', width: '7%', title: '申请金额(元)'},
                     {field: 'bzje', width: '7%', title: '报账金额(元)'},
                     // {field: 'bhsje', width: '9%', title: '不含税金额(元)'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
-                    {field: 'xmmc', width: '20%', title: '项目名称'},
+
                     {field: 'fylbmc', width: '7%', title: '费用类别'},
                     {field: 'sqrxm', width: '8%', title: '申请人'},
                     {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'}

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

@@ -90,19 +90,19 @@
 
                         <br>
                         <div class="layui-inline">
-                            <label class="layui-form-label required" style="width: 60px">所属部门</label>
-                            <div class="layui-input-block" style="width: 200px;left:-20px">
+                            <label class="layui-form-label" style="width: 60px">所属部门</label>
+                            <div class="layui-input-inline" style="width: 200px;">
                                 <input type="text" id="ssbmmc" name="ssbmmc">
                             </div>
                         </div>
                         <div class="layui-inline" style="left: -10px">
-                            <label class="layui-form-label" style="width: 60px">申请时间</label>
-                            <div class="layui-input-inline" style="width: 100px">
+                            <label class="layui-form-label" style="width: 70px">申请时间</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <input type="text" name="sqsj1" id="sqsj1" placeholder="开始时间" class="layui-input"
                                        readonly>
                             </div>
                             <div class="layui-form-mid">-</div>
-                            <div class="layui-input-inline" style="width: 100px">
+                            <div class="layui-input-inline" style="width: 140px">
                                 <input type="text" name="sqsj2" id="sqsj2" placeholder="终止时间" class="layui-input"
                                        readonly>
                             </div>
@@ -205,6 +205,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>
@@ -318,10 +336,11 @@
                 $("#dkyfzr").val(NEWJSON1.join(","));
             }
         });
-
+        var getYear = document.getElementById('nf').value;
         var currTable = table.render({
+
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staBudgetapproval/list_allApply',
+            url: AjaxUtil.ctx + 'staBudgetapproval/list_allApply/?nf='+getYear,
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -329,10 +348,10 @@
                 [
                     {type: "radio", 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: 'sqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '10%', title: '项目类型'},
                     {field: 'fylbmc', width: '7%', title: '费用类别'},

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

@@ -15,22 +15,28 @@
             <legend>搜索信息(<b>收起-展开</b>)</legend>
             <div id="search-div" style="margin: 5px 10px -10px 0px">
                 <form class="layui-form" action="" lay-filter="search-form">
-                    <div class="layui-form-item" >
+                    <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: 415px">
+                            <label class="layui-form-label" style="width: 70px">项目名称</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <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">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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">
-                            <label class="layui-form-label" style="width: 60px">年份</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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">
+                            </div>
+                        </div>
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px">年份</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <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>
@@ -38,34 +44,42 @@
                             </div>
                         </div>
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 60px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                            <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>
+                                    <option th:each="item:${approveList}" th:text="${item.name}" th:value="${item.code}"></option>
+                                </select>
+                            </div>
+                        </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">
                                     <option value="">全部</option>
                                     <option th:each="item:${xmlxList}" th:text="${item.name}" th:value="${item.code}"></option>
                                 </select>
                             </div>
                         </div>
-                        <div class="layui-inline" style="left: -35px">
-                            <label class="layui-form-label" style="width: 95px">项目负责人</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                        <div class="layui-inline">
+                            <label class="layui-form-label" style="width: 70px">项目负责人</label>
+                            <div class="layui-input-inline" style="width: 140px">
                                 <input type="hidden" id="xmfzr" name="xmfzr" class="layui-input">
                                 <input type="text" id="xmfzrxm" name="xmfzrxm" placeholder="可多选" autocomplete="off" class="layui-input" readonly>
                             </div>
                         </div>
-                        <div class="layui-inline" style="left: -35px">
-                            <label class="layui-form-label" style="width: 60px">所属部门</label>
-                            <div class="layui-input-inline" style="width: 150px">
+                        <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: 0px">
-                            <button type="submit" class="layui-btn" lay-submit lay-filter="data-search-btn">
-                                <i class="layui-icon"></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>
                             <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>
@@ -82,6 +96,25 @@
         </button>
     </div>
 </script>
+
+<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>
@@ -94,10 +127,10 @@
         var form = layui.form,
             table = layui.table,
             tableSelect = layui.tableSelect;
-
+        var year = document.getElementById('nf').value;
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staBudgetapproval/list_feemanage',
+            url: AjaxUtil.ctx + 'staBudgetapproval/list_feemanage/?nf='+year,
             method: 'post',
             toolbar: '#toolbarDemo', // 自定义模板
             // toolbar: '#toolbarDemo',
@@ -107,10 +140,12 @@
                     {type: "radio", title:'😊' ,fixed: 'left'},
                     {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
                     // {field: 'id', title: 'ID',hide:true},
-                    {field: 'zwmc', width: '20%', title: '项目名称'},
+                    {field: 'zwmc', width: '20%', title: '项目名称',fixed: "left"},
                     {field: 'erpbh', width: '8%', title: 'ERP编号'},
                     {field: 'xmlxmc', width: '10%', title: '项目类型'},
                     {field: 'xmfzrxm', width: '6%', title: '项目负责人'},
+                    {field: 'bh', width: '10%', title: '编号' },
+                    {field: 'spzt', width: '10%', title: '状态'},
                     {field: 'ssbmmc', width: '8%', title: '所属部门'},
                     {field: 'nf', width: '5%', title: '年份', align: 'center'},
                     {field: 'ysje', width: '6%', title: '可用预算'},