任务书页面UI 显示优化

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

@@ -994,16 +994,17 @@ public class StaBudgetapprovalController extends BaseController {
     @RequestMapping(value = "/list_allApply", method = RequestMethod.POST)
     public BaseResult list_allApply(@RequestParam("page") Integer pageNum,
                                     @RequestParam("limit") Integer pageSize,
-                                    @RequestParam(required = false, defaultValue = "", value = "bh") String bh,
+                                    @RequestParam(required = false, defaultValue = "", value = "xmmc") String xmmc,
                                     @RequestParam(required = false, defaultValue = "", value = "erpbh") String erpbh,
-                                    @RequestParam(required = false, defaultValue = "", value = "xmlx") String xmlx,
+                                    @RequestParam(required = false, defaultValue = "", value = "bh") String bh,
+                                    @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
+                                    @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                                     @RequestParam(required = false, defaultValue = "", value = "fylb") String fylb,
+                                    @RequestParam(required = false, defaultValue = "", value = "xmlx") String xmlx,
                                     @RequestParam(required = false, defaultValue = "", value = "sqr") String sqr,
                                     @RequestParam(required = false, defaultValue = "", value = "sfbyj") String sfbyj,
-                                    @RequestParam(required = false, defaultValue = "", value = "xmmc") String xmmc,
+
                                     @RequestParam(required = false, defaultValue = "", value = "ssbmmc") String ssbmmc,
-                                    @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
-                                    @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                                     @RequestParam(required = false, defaultValue = "", value = "sfbz") String sfbz,
                                     @RequestParam(required = false, defaultValue = "", value = "sfth") String sfth,
                                     @RequestParam(required = false, defaultValue = "", value = "dkyfzr") String dkyfzr,
@@ -1056,7 +1057,6 @@ public class StaBudgetapprovalController extends BaseController {
         paraMap.put("sqr", sqr);
 
         List<StaBudgetapproval> list = staBudgetapprovalService.getAllApplyList(paraMap);
-
         PageInfo<StaBudgetapproval> pageinfo = new PageInfo<>(list);
         //取出查询结果
         List<StaBudgetapproval> rows = pageinfo.getList();

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

@@ -155,14 +155,21 @@ public class StaReimbursementController extends BaseController {
     public BaseResult list(@RequestParam("page") Integer pageNum,
                            @RequestParam("limit") Integer pageSize,
                            @RequestParam(required = false, defaultValue = "", value = "fysqbh") String fysqbh,
-                           @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
                            @RequestParam(required = false, defaultValue = "", value = "mc") String mc,
                            @RequestParam(required = false, defaultValue = "", value = "sortName") String sortName,
                            @RequestParam(required = false, defaultValue = "", value = "bzr") String bzr,
                            @RequestParam(required = false, defaultValue = "", value = "sortOrder") String sortOrder,
-                           @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
+
+
                            @RequestParam(required = false, defaultValue = "", value = "xmmc")String xmmc,
-                           @RequestParam(required = false, defaultValue = "", value = "erpbh")String erpbh) {
+                           @RequestParam(required = false, defaultValue = "", value = "erpbh")String erpbh,
+                           @RequestParam(required = false, defaultValue = "", value = "bh")String bh,
+                           @RequestParam(required = false, defaultValue = "", value = "nf") String nf,
+                           @RequestParam(required = false, defaultValue = "", value = "spzt") String spzt,
+                           @RequestParam(required = false, defaultValue = "", value = "fylb")String fylb,
+                           @RequestParam(required = false, defaultValue = "", value = "xmlx")String xmlx,
+                           @RequestParam(required = false, defaultValue = "", value = "sqr")String sqr,
+                           @RequestParam(required = false, defaultValue = "", value = "sfbyj")String sfbyj) {
         PageHelper.startPage(pageNum, pageSize);
         Map<String, String> paraMap = new HashMap<>();
 
@@ -186,8 +193,14 @@ public class StaReimbursementController extends BaseController {
         paraMap.put("spzt", spzt);
         paraMap.put("mc", mc);
         paraMap.put("bzr", bzr);
+
         paraMap.put("xmmc",xmmc);
         paraMap.put("erpbh",erpbh);
+        paraMap.put("bh",bh);
+        paraMap.put("fylb",fylb);
+        paraMap.put("xmlx",xmlx);
+        paraMap.put("bzr",bzr);
+        paraMap.put("sfbyj",sfbyj);
 
         List<StaReimbursement> list = staReimbursementService.getReimburseList(paraMap);
 

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

@@ -1,5 +1,7 @@
 package com.liang.entity;
 
+import lombok.Data;
+
 import java.sql.Date;
 import java.io.Serializable;
 
@@ -9,6 +11,8 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-05-16 13:06:38
  */
+
+@Data
 public class StaReimbursement implements Serializable {
     private static final long serialVersionUID = -15614819846705555L;
 
@@ -87,188 +91,17 @@ public class StaReimbursement implements Serializable {
 
     private Integer fysqid;
 
-    public Integer getFysqid() {
-        return fysqid;
-    }
-
-    public void setFysqid(Integer fysqid) {
-        this.fysqid = fysqid;
-    }
-
-    public String getErpbh() {
-        return erpbh;
-    }
-
-    public void setErpbh(String erpbh) {
-        this.erpbh = erpbh;
-    }
-
-    public String getNf() {
-        return nf;
-    }
-
-    public void setNf(String nf) {
-        this.nf = nf;
-    }
-
-    public String getSfbyj() {
-        return sfbyj;
-    }
-
-    public void setSfbyj(String sfbyj) {
-        this.sfbyj = sfbyj;
-    }
-
-    public Integer getId() {
-        return id;
-    }
-
-    public void setId(Integer id) {
-        this.id = id;
-    }
-
-    public String getBxpz() {
-        return bxpz;
-    }
-
-    public void setBxpz(String bxpz) {
-        this.bxpz = bxpz;
-    }
-
-    public Integer getFysq() {
-        return fysq;
-    }
-
-    public void setFysq(Integer fysq) {
-        this.fysq = fysq;
-    }
-
-    public Double getBzje() {
-        return bzje;
-    }
-
-    public void setBzje(Double bzje) {
-        this.bzje = bzje;
-    }
-
-    public Double getBhsje() {
-        return bhsje;
-    }
-
-    public void setBhsje(Double bhsje) {
-        this.bhsje = bhsje;
-    }
-
-    public Double getSf() {
-        return sf;
-    }
-
-    public void setSf(Double sf) {
-        this.sf = sf;
-    }
-
-    public Integer getBzr() {
-        return bzr;
-    }
-
-    public void setBzr(Integer bzr) {
-        this.bzr = bzr;
-    }
-
-    public Date getCjsj() {
-        return cjsj;
-    }
-
-    public void setCjsj(Date cjsj) {
-        this.cjsj = cjsj;
-    }
-
-    public String getMc() {
-        return mc;
-    }
-
-    public void setMc(String mc) {
-        this.mc = mc;
-    }
-
-    public String getSpzt() {
-        return spzt;
-    }
-
-    public void setSpzt(String spzt) {
-        this.spzt = spzt;
-    }
-
-    public String getFysqmc() {
-        return fysqmc;
-    }
-
-    public void setFysqmc(String fysqmc) {
-        this.fysqmc = fysqmc;
-    }
-
-    public String getFysqbh() {
-        return fysqbh;
-    }
-
-    public void setFysqbh(String fysqbh) {
-        this.fysqbh = fysqbh;
-    }
-
-    public String getBzrxm() {
-        return bzrxm;
-    }
-
-    public void setBzrxm(String bzrxm) {
-        this.bzrxm = bzrxm;
-    }
-
-    public Integer getXmid() {
-        return xmid;
-    }
-
-    public void setXmid(Integer xmid) {
-        this.xmid = xmid;
-    }
-
-    public String getXmmc() {
-        return xmmc;
-    }
-
-    public void setXmmc(String xmmc) {
-        this.xmmc = xmmc;
-    }
-
-    public Integer getFylb() {
-        return fylb;
-    }
-
-    public void setFylb(Integer fylb) {
-        this.fylb = fylb;
-    }
+    private String sqrxm;
 
-    public String getFylbmc() {
-        return fylbmc;
-    }
+    private String ssbmmc;
 
-    public void setFylbmc(String fylbmc) {
-        this.fylbmc = fylbmc;
-    }
+    private String bh;
 
-    public Double getSqje() {
-        return sqje;
-    }
+    private String dkyfzr;
 
-    public void setSqje(Double sqje) {
-        this.sqje = sqje;
-    }
+    private String xmlx;
 
-    public Double getSl() {
-        return sl;
-    }
+    private Integer sfbyjs;
 
-    public void setSl(Double sl) {
-        this.sl = sl;
-    }
 }
 

src/main/resources/mapper/StaBudgetapprovalDao.xml

@@ -665,7 +665,6 @@
         g.FYMC AS FYLBMC,
         r.XM AS XMFZRXM,
         CASE
-
         WHEN b.SFBYJ = 1 THEN
         '是' ELSE '否'
         END AS SFBYJMC,

src/main/resources/mapper/StaReimbursementDao.xml

@@ -18,6 +18,16 @@
         <result property="nf" column="NF" jdbcType="VARCHAR"/>
         <result property="erpbh" column="ERPBH" jdbcType="VARCHAR"/>
         <result property="fysqid" column="FYSQID" jdbcType="INTEGER"/>
+        <result property="fylbmc" column="FYLBMC" jdbcType="VARCHAR"/>
+        <result property="sqrxm" column="SQR" jdbcType="VARCHAR"/>
+        <result property="ssbmmc" column="SSBMMC" jdbcType="VARCHAR"/>
+        <result property="fysqmc" column="FYSQMC" jdbcType="VARCHAR"/>
+        <result property="bh" column="FYSQBH" jdbcType="VARCHAR"/>
+        <result property="dkyfzr" column="DKYFZR" jdbcType="VARCHAR"/>
+        <result property="sqje" column="SQJE" jdbcType="VARCHAR"/>
+        <result property="fysqmc" column="SQMC" jdbcType="VARCHAR"/>
+        <result property="xmlx" column="XMLX" jdbcType="VARCHAR"/>
+        <result property="sfbyjs" column="SFBYJS" jdbcType="VARCHAR"/>
     </resultMap>
 
     <!--id查询单个-->
@@ -179,12 +189,20 @@
         r.*,
         a.BH AS FYSQBH,
         a.SQMC AS FYSQMC,
-        u.name AS BZRXM,
         a.XMID,
         a.XMMC,
         a.NF,
         a.ERPBH,
         a.ID AS FYSQID,
+        a.SQJE,
+        a.SQMC,
+        c.XM AS DKYFZR,
+        g.FYMC AS FYLBMC,
+        u.NAME AS SQR,
+        u.name AS BZRXM,
+        d.DEPT_NAME AS SSBMMC,
+        t.XMLXMC AS XMLX,
+        a.SFBYJ AS SFBYJS,
         CASE
 
         WHEN a.SFBYJ = 1 THEN
@@ -194,8 +212,14 @@
         sta_Reimbursement r
         LEFT JOIN sta_BudgetApproval a ON a.ID = r.FYSQ
         LEFT JOIN sys_user_info u ON u.user_id = r.BZR
+        LEFT JOIN prj_AnnualBudgetDetail g on a.FYLB = g.ID
+        LEFT JOIN sys_dept_info d ON d.dept_id = a.SSBM
+        LEFT JOIN base_Person c ON c.ID = a.XMFZR
+        LEFT JOIN base_ProjectType t ON t.XMLX = a.XMLX
         WHERE
         1 = 1
+          AND  r.SPZT IS NOT NULL
+          and r.SPZT !=  ''
         <if test="nf != null and nf != ''">
             and a.NF = #{nf}
         </if>
@@ -223,6 +247,21 @@
         <if test="fysq != null and fysq != ''">
         and r.FYSQ = #{fysq}
         </if>
+        <if test="sfbyj != null and sfbyj != ''">
+            AND a.SFBYJ = #{sfbyj}
+        </if>
+        <if test="bh != null and bh != ''">
+            and a.BH like '%'+#{bh}+'%'
+        </if>
+        <if test="fylb != null and fylb != ''">
+            and g.FYMC = #{fylb}
+        </if>
+        <if test="xmlx != null and xmlx != ''">
+            and t.XMLXMC = #{xmlx}
+        </if>
+        <if test="bzr != null and bzr != ''">
+            and u.NAME like '%'+#{bzr}+'%'
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder}

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

@@ -76,6 +76,21 @@
         </script>
     </div>
 </div>
+
+<script>
+    // 获取所有需要去除空格的输入框
+    const inputs = [
+        document.getElementById('MC'),
+        document.getElementById('DWQC')
+    ];
+    // 为每个输入框添加事件监听
+    inputs.forEach(input => {
+        input.addEventListener('input', function() {
+            this.value = this.value.replace(/\s+/g, ''); // 去除空格
+        });
+    });
+</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>
@@ -97,7 +112,7 @@
             cols: [
                 [
                     {type: "checkbox", fixed: 'left'},
-                    {type: 'numbers', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'mc', width: '20%', title: '名称', align: 'left'},
                     {field: 'dwqc', width: '25%', title: '单位全称', align: 'left'},
                     {field: 'szd', width: '25%', title: '所在地', align: 'left'},

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

@@ -20,19 +20,19 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 60px">公司/单位</label>
                             <div class="layui-input-inline" style="width: 300px">
-                                <input type="text" name="dwmc" autocomplete="off" class="layui-input">
+                                <input type="text" name="dwmc" id="dwmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 40px">姓名</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="xm" autocomplete="off" class="layui-input">
+                                <input type="text" name="xm" id="xm" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 40px">部门</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="bmmc" autocomplete="off" class="layui-input">
+                                <input type="text" name="bmmc" id="bmmc" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-left: 0px">
@@ -83,6 +83,20 @@
         </script>
     </div>
 </div>
+<script>
+    // 获取所有需要去除空格的输入框
+    const inputs = [
+        document.getElementById('dwmc'),
+        document.getElementById('xm'),
+        document.getElementById('bmmc')
+    ];
+    // 为每个输入框添加事件监听
+    inputs.forEach(input => {
+        input.addEventListener('input', function() {
+            this.value = this.value.replace(/\s+/g, ''); // 去除空格
+        });
+    });
+</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>

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

@@ -20,7 +20,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 40px;">姓名</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="xm" autocomplete="off" class="layui-input">
+                                <input type="text" name="xm" id="xm" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -37,7 +37,7 @@
                         <div class="layui-inline">
                             <label class="layui-form-label" style="width: 80px;">身份证号</label>
                             <div class="layui-input-inline">
-                                <input type="text" name="sfzh" autocomplete="off" class="layui-input">
+                                <input type="text" name="sfzh" id="sfzh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -102,6 +102,19 @@
         </script>
     </div>
 </div>
+<script>
+    // 获取所有需要去除空格的输入框
+    const inputs = [
+        document.getElementById('xm'),
+        document.getElementById('sfzh'),
+    ];
+    // 为每个输入框添加事件监听
+    inputs.forEach(input => {
+        input.addEventListener('input', function() {
+            this.value = this.value.replace(/\s+/g, ''); // 去除空格
+        });
+    });
+</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>

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

@@ -33,14 +33,14 @@
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label required" style="width: 80px">中文名称</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label required" style="width: 10%">中文名称</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <input type="hidden" id="id" name="id">
                                 <input type="text" id="zwmc" name="zwmc" lay-verify="required" lay-reqtext="中文名称不能为空"
                                        placeholder="项目名称（中文）不能超过30字（含字符）" autocomplete="off" class="layui-input">
                             </div>
-                            <label class="layui-form-label" style="width: 115px">学科分类1</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <label class="layui-form-label" style="width: 15%">学科分类1</label>
+                            <div class="layui-input-inline" style="width: 25%">
                                 <select name="xkfl1" id="xkfl1" lay-filter="xkfl">
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
@@ -48,13 +48,13 @@
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 80px">英文名称</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label" style="width: 10%">英文名称</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <input type="text" id="ywmc" name="ywmc" placeholder="项目名称（英文）不能超过30字（含字符）"
                                        autocomplete="off" class="layui-input">
                             </div>
-                            <label class="layui-form-label" style="width: 115px">学科分类2</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <label class="layui-form-label" style="width: 15%">学科分类2</label>
+                            <div class="layui-input-inline" style="width: 25%">
                                 <select name="xkfl2" id="xkfl2" lay-filter="xkfl">
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
@@ -62,13 +62,13 @@
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label required" style="width: 80px">ERP编号</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label required" style="width: 10%">ERP编号</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input"
                                        lay-verify="required" lay-reqtext="ERP编号不能为空">
                             </div>
-                            <label class="layui-form-label" style="width: 115px">学科分类3</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <label class="layui-form-label" style="width: 15%">学科分类3</label>
+                            <div class="layui-input-inline" style="width: 25%">
                                 <select name="xkfl3" id="xkfl3" lay-filter="xkfl">
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
@@ -76,8 +76,8 @@
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label required" style="width: 80px">项目类型</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label required" style="width: 10%">项目类型</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <select name="xmlx" id="xmlx" lay-filter="xmlx" lay-verify="required"
                                         lay-reqtext="项目类型不能为空">
                                     <option value="">-- 请选择 --</option>
@@ -86,8 +86,8 @@
                                 </select>
                                 <tip>此项只能新建时修改</tip>
                             </div>
-                            <label class="layui-form-label" style="width: 115px">所属国民经济行业</label>
-                            <div class="layui-input-inline" style="width: 300px">
+                            <label class="layui-form-label" style="width: 15%">所属国民经济行业</label>
+                            <div class="layui-input-inline" style="width: 25%">
                                 <select name="ssgmjjhy" id="ssgmjjhy" lay-filter="gmjjhy">
                                     <option value="">[无]</option>
                                     <option value="-1">[浏览]</option>
@@ -95,8 +95,8 @@
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 80px">可研报告</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label" style="width: 10%">可研报告</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <input type="hidden" id="bm" name="bm" class="layui-input">
                                 <input type="hidden" id="kybgmc" name="kybgmc" class="layui-input">
                                 <select name="kybg" id="kybg" lay-filter="kybg">
@@ -104,17 +104,17 @@
                                     <option value="-1">[浏览]</option>
                                 </select>
                             </div>
-                            <label class="layui-form-label" style="width: 143px">是否国家秘密技术项目</label>
+                            <label class="layui-form-label" style="width: 15%">是否国家秘密技术项目</label>
                             <div class="layui-input-inline">
                                 <input type="checkbox" name="sfgjmmjsxm" lay-skin="primary">
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 80px">费用来源</label>
-                            <div class="layui-input-inline" style="width: 460px">
+                            <label class="layui-form-label" style="width: 10%">费用来源</label>
+                            <div class="layui-input-inline" style="width: 35%">
                                 <input type="text" id="fyly" name="fyly" autocomplete="off" class="layui-input">
                             </div>
-                            <label class="layui-form-label required" style="width: 90px">项目起止时间</label>
+                            <label class="layui-form-label required" style="width: 15%">项目起止时间</label>
                             <div class="layui-form-item layui-inline" style="width: auto">
                                 <div class="layui-input-inline" style="width: 100px">
                                     <input type="text" name="qs" id="qs" lay-verify="required|date" placeholder="开始日期"
@@ -131,9 +131,9 @@
 
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label">项目总预算（万）</label>
-                            <div class="layui-input-inline" style="width: 100px">
-                                <input type="text" id="rwsys2" name="rwsys2" style="width: 460px; margin-left: -1px"
+                            <label class="layui-form-label" style="width: 10%">项目总预算（万）</label>
+                            <div class="layui-input-inline" style="width: 35%">
+                                <input type="text" id="rwsys2" name="rwsys2"
                                        class="layui-input" th:value="${rwsys}" readonly>
                             </div>
                         </div>
@@ -147,7 +147,7 @@
                                 <!--主要完成人开始-->
                                 <div class="layui-tab-item layui-show">
                                     <div class="layuimini-container">
-                                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                                             <button type="button"
                                                     class="layui-btn  layui-btn-primary layui-btn-sm upload"
                                                     lay-filter="subImport1" lay-data="{fileType:'memberFile'}"><i
@@ -179,7 +179,7 @@
                                 <!--主要完成单位开始-->
                                 <div class="layui-tab-item">
                                     <div class="layuimini-container">
-                                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                                     lay-filter="subAdd2"><i class="layui-icon"></i>新建
                                             </button>
@@ -203,31 +203,37 @@
                         </div>
 
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 90px">总人数</label>
-                            <div class="layui-input-inline" style="width: 120px">
+                            <label class="layui-form-label" style="width: 10%">总人数</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="text" id="zrs" name="zrs" class="layui-input" readonly>
                             </div>
-                            <label class="layui-form-label">高级职称</label>
-                            <div class="layui-input-inline" style="width: 120px">
+                            <label class="layui-form-label" style="width: 10%">高级职称</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="text" id="gjzc" name="gjzc" class="layui-input" readonly>
                             </div>
-                            <label class="layui-form-label">中级职称</label>
-                            <div class="layui-input-inline" style="width: 120px">
+                            <label class="layui-form-label" style="width: 10% ">中级职称</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="text" id="zjzc" name="zjzc" class="layui-input" readonly>
                             </div>
                         </div>
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 220px"></label>
-                            <label class="layui-form-label">初级职称</label>
-                            <div class="layui-input-inline" style="width: 120px">
+                            <label class="layui-form-label" style="width: 10%">所属部门</label>
+                            <div class="layui-input-inline" style="width: 18%">
+                                <input type="hidden" id="ssbm" name="ssbm" class="layui-input"
+                                       th:value="${userInfo.deptId}">
+                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input"
+                                       th:value="${userInfo.deptName}" readonly>
+                            </div>
+                            <label class="layui-form-label" style="width: 10%;">初级职称</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="text" id="cjzc" name="cjzc" class="layui-input" readonly>
                             </div>
-                            <label class="layui-form-label">研究生</label>
-                            <div class="layui-input-inline" style="width: 120px">
+                            <label class="layui-form-label" style="width: 10%">研究生</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="text" id="yjs" name="yjs" class="layui-input" readonly>
                             </div>
                         </div>
-                        <div class="layui-form-item">
+<!--                        <div class="layui-form-item">
                             <label class="layui-form-label" style="width: 90px">所属部门</label>
                             <div class="layui-input-inline" style="width: 600px">
                                 <input type="hidden" id="ssbm" name="ssbm" class="layui-input"
@@ -235,10 +241,10 @@
                                 <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input"
                                        th:value="${userInfo.deptName}" readonly>
                             </div>
-                        </div>
-                        <div class="layui-form-item">
-                            <label class="layui-form-label" style="width: 90px">电科院负责人</label>
-                            <div class="layui-input-inline" style="width: 600px">
+                        </div>-->
+                        <div class="layui-form-item" style="width: 100%">
+                            <label class="layui-form-label" style="width: 10%">电科院负责人</label>
+                            <div class="layui-input-inline" style="width: 18%">
                                 <input type="hidden" id="dkyfzr" name="dkyfzr" class="layui-input">
                                 <input type="text" id="dkyfzrxm" name="dkyfzrxm" placeholder="可多选" autocomplete="off"
                                        class="layui-input" lay-verify="required" lay-reqtext="电科院负责人不能为空" readonly>
@@ -263,8 +269,8 @@
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 65px">填写说明</label>
-                            <div class="layui-input-inline" style="width: 930px">
+                            <label class="layui-form-label" style="width: 10%">填写说明</label>
+                            <div class="layui-input-inline" style="width: 70%">
                                 <textarea id="txsm" name="txsm" class="layui-textarea"
                                           style="width: 100%;height: 510px"></textarea>
                             </div>
@@ -287,7 +293,7 @@
             <div class="layui-tab-item" style="min-height: 565px; padding-left: 30px; padding-right: 30px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                     lay-filter="btnAdd3"><i class="layui-icon"></i>新建
                             </button>
@@ -329,8 +335,8 @@
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 75px">研究内容及<br>考核指标</label>
-                            <div class="layui-input-inline" style="width: 920px">
+                            <label class="layui-form-label" style="width:10%">研究内容及<br>考核指标</label>
+                            <div class="layui-input-inline" style="width: 70%">
                                 <textarea id="yjnrjkhzb" name="yjnrjkhzb" class="layui-textarea"
                                           style="width: 100%;height: 510px"></textarea>
                             </div>
@@ -387,7 +393,7 @@
             <div class="layui-tab-item" style="min-height: 565px; padding-left: 30px; padding-right: 30px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layuimini-form" style="padding-bottom: 100px">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                     lay-filter="btnAdd6"><i class="layui-icon"></i>新建
                             </button>
@@ -429,8 +435,8 @@
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layui-form layuimini-form" style="padding-bottom: 100px">
                         <div class="layui-form-item layui-inline" style="width: 100%">
-                            <label class="layui-form-label" style="width: 90px">有关问题说明</label>
-                            <div class="layui-input-inline" style="width: 905px">
+                            <label class="layui-form-label" style="width: 10%">有关问题说明</label>
+                            <div class="layui-input-inline" style="width: 70%">
                                 <textarea id="ygwtsm" name="ygwtsm" class="layui-textarea"
                                           style="width: 100%;height: 510px"></textarea>
                             </div>
@@ -453,7 +459,7 @@
             <div class="layui-tab-item" style="min-height: 565px; padding-left: 30px; padding-right: 30px">
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layuimini-form" style="padding-bottom: 100px">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom:0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm"
                                     lay-filter="btnAdd8"><i class="layui-icon"></i>新建
                             </button>
@@ -484,7 +490,7 @@
                 <form class="layui-form" action="" lay-filter="formDemo">
                     <div class="layuimini-form" style="padding-bottom: 100px">
                         <input type="hidden" id="fj" name="fj" class="layui-input">
-                        <div class="layui-btn-group" style="margin-bottom: -8px">
+                        <div class="layui-btn-group" style="margin-bottom: 0.5%">
                             <button type="button" class="layui-btn  layui-btn-primary layui-btn-sm upload"
                                     lay-filter="upLoad" lay-data="{fileType:'project'}"><i class="layui-icon"></i>上传
                             </button>
@@ -658,13 +664,13 @@
             cols: [
                 [
                     {type: "checkbox"},
-                    {type: 'numbers', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号',width: '15%'},
                     {field: 'ryxm', width: '10%', title: '人员', align: 'left'},
                     {field: 'xmjsmc', width: '15%', title: '项目角色', align: 'left'},
                     {field: 'bxmfg', width: '20%', title: '本项目分工', align: 'left'},
                     {field: 'trgzzys', width: '15%', title: '投入工作总月数', align: 'center'},
                     {field: 'sxbh', width: '10%', title: '顺序编号', align: 'center'},
-                    {field: 'dwmc', title: '单位', align: 'left'}
+                    {field: 'dwmc', title: '单位', align: 'left',width: '20%'}
                 ]
             ],
             autoSort: true,
@@ -906,7 +912,7 @@
             cols: [
                 [
                     {type: "checkbox"},
-                    {type: 'numbers', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '序号',width: '15%'},
                     {field: 'dwmc', width: '30%', title: '单位', align: 'left'},
                     {field: 'dwqc', width: '30%', title: '单位全称', align: 'left'},
                     {field: 'sxbh', width: '10%', title: '顺序编号', align: 'center'},
@@ -1151,7 +1157,7 @@
                 cols: [
                     [
                         {type: "checkbox", fixed: 'left'},
-                        {type: 'numbers', align: 'center'},
+                        {type: 'numbers', align: 'center',title: '序号',width: '15%'},
                         {field: 'xm', width: '15%', title: '姓名', align: 'left'},
                         {field: 'dwmc', title: '公司/单位', align: 'left'}
                     ]
@@ -1352,7 +1358,7 @@
                 [
                     {type: "checkbox"},
 // {type: 'numbers', align: 'center'},
-                    {field: 'xh', title: '序号', width: '8%', align: 'center'},
+                    {field: 'xh', title: '序号', width: '15%', align: 'center'},
                     {field: 'ktmc', title: '课题名称', width: '30%'},
                     {field: 'fzrxm', title: '负责人', width: '10%'},
                     {field: 'fzrszdwmc', title: '负责人所在单位', width: '25%'},

src/main/resources/templates/prjsubtopic/add.html

@@ -218,10 +218,10 @@
                 url: AjaxUtil.ctx + 'prjMember/rylist/' + xmId,
                 cols: [
                     [
-                        {type: "radio", fixed: 'left'},
-                        {type: 'numbers', align: 'center'},
+                        {type: "radio", fixed: 'left',title: '😊'},
+                        {type: 'numbers', align: 'center',title: '序号',width: '10%'},
                         {field: 'ryxm', width: '15%', title: '姓名', align: 'left'},
-                        {field: 'dwmc', title: '公司/单位'}
+                        {field: 'dwmc', title: '公司/单位',width: '25%'}
                     ]
                 ],
                 done: function (res, curr, count) {
@@ -256,10 +256,10 @@
                 url: AjaxUtil.ctx + 'prjMember/rylist/' + xmId,
                 cols: [
                     [
-                        {type: "radio", fixed: 'left'},
-                        {type: 'numbers', align: 'center'},
+                        {type: "radio", fixed: 'left',title: '😊'},
+                        {type: 'numbers', align: 'center',title: '序号',width: '10%'},
                         {field: 'ryxm', width: '15%', title: '姓名', align: 'left'},
-                        {field: 'dwmc', title: '公司/单位'}
+                        {field: 'dwmc', title: '公司/单位',width: '25%'}
                     ]
                 ],
                 done: function (res, curr, count) {

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

@@ -33,7 +33,7 @@
                         <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" id="fysqbh" autocomplete="off" class="layui-input">
+                                <input type="text" name="bh" id="bh" autocomplete="off" class="layui-input">
                             </div>
                         </div>
 
@@ -67,9 +67,19 @@
                         </div>
 
                         <div class="layui-inline">
-                            <label class="layui-form-label" style="width: 70px;">报账人</label>
+                            <label class="layui-form-label" style="width: 70px;">申请人</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" name="bzr" id="bzr" autocomplete="off" class="layui-input">
+                                <input type="text" name="sqr" id="sqr" 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="sfbyj" id="sfbyj" lay-filter="status">
+                                    <option value="">全部</option>
+                                    <option value="1">是</option>
+                                    <option value="0">否</option>
+                                </select>
                             </div>
                         </div>
 
@@ -185,21 +195,33 @@
             // defaultToolbar: ['filter', 'print'],
             cols: [
                 [
-                    {type: "radio", fixed: 'left'},
+                    {type: "radio", fixed: 'left',title: '😊'},
                     {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: 'fysqbh', width: '10%',title: '科研编号'},
+
+                    {field: 'bh', width: '10%',title: '科研编号'},
                     {field: 'nf',title: '年份',width: '10%'},
+                    {
+                        field: 'sfbyjs', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
+                            if (1 == d.sfbyjs) {
+                                return '<span class="layui-badge layui-bg-blue">是</span>';
+                            } else {
+                                return '<span class="layui-badge layui-bg-orange">否</span>';
+                            }
+                        }
+                    },
                     {field: 'erpbh', width: '10%',title: 'ERP编号'},
                     {field: 'bzje', width: '8%', title: '报账金额(元)'},
+                    {field: 'sqje', width: '7%', title: '申请金额(元)'},
                     {field: 'bhsje', width: '8%', title: '不含税金额(元)'},
                     {field: 'sf', width: '6%', title: '税费(元)'},
-                    {field: 'bzrxm', width: '7%', title: '报账人'},
+                    {field: 'sqrxm', width: '7%', title: '申请人'},
                     {field: 'cjsj', width: '8%', title: '创建时间', align: 'center'},
-                    {field: 'fysqmc', title: '费用申请'},
-                    {field: 'sfbyj', title: '是否备用金',width: '6%'},
+                    {field: 'fysqmc', title: '费用申请',width: '25%'}
+
 
                 ]
             ],
@@ -246,7 +268,9 @@
                 "cjsj1":'',
                 "cjsj2":'',
                 "mc":'',
-                "bzr":''
+                "bzr":'',
+                "sqr":'',
+                "sfbyj":''
             });
             // 执行搜索重载
             currTable.reload({

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

@@ -211,7 +211,7 @@
         var userId = $("#userId").val();
         var currTable = table.render({
             elem: '#currentTableId',
-            url: AjaxUtil.ctx + 'staBudgetapproval/list_allApply?sfbz='+1+'&dlr='+0,
+            url: AjaxUtil.ctx + 'staReimbursement/list',
             method: 'post',
             toolbar: '#toolbarDemo',
             // defaultToolbar: ['filter', 'print'],
@@ -234,29 +234,31 @@
                     {type: "radio", fixed: 'left',title: '😊'},
                     {type: 'numbers', align: 'center', fixed: 'left',title: '序号'},
                     {field: 'xmmc', width: '20%', title: '项目名称',fixed: "left"},
-                    {field: 'spzt', width: '9%', title: '审批状态'},
-                    {field: 'bh', width: '8%', title: '科研费号'},
-                    {field: 'sqmc', width: '25%', title: '申请名称'},
+                    {field: 'spzt', width: '15%', title: '审批状态'},
+                    {field: 'bh', width: '13%', title: '科研费号'},
+                    {field: 'fysqmc', width: '25%', title: '申请名称'},
                     {field: 'erpbh', width: '9%', title: 'ERP编号'},
-                    {field: 'xmlxmc', width: '10%', title: '项目类型'},
+                    {field: 'xmlx', width: '10%', title: '项目类型'},
                     {field: 'fylbmc', width: '7%', title: '费用类别'},
                     {field: 'sqje', width: '7%', title: '申请金额(元)'},
                     {field: 'bzje', width: '7%', title: '报账金额(元)'},
                     {field: 'bhsje', width: '7%', title: '不含税金额(元)'},
+                    {field: 'sf', width: '6%', title: '税费(元)'},
                     {
-                        field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
-                            if (1 == d.sfbyj) {
+                        field: 'sfbyjs', width: '8%', title: '是否备用金', align: 'center', templet: function (d) {
+                            if (1 == d.sfbyjs) {
                                 return '<span class="layui-badge layui-bg-blue">是</span>';
                             } else {
                                 return '<span class="layui-badge layui-bg-orange">否</span>';
                             }
                         }
                     },
+                    /*{field: 'sfbyj', width: '8%', title: '是否备用金', align: 'center'},*/
                     {field: 'sqrxm', width: '5%', title: '申请人'},
-                    {field: 'dkyfzrxm', width: '8%', title: '电科院负责人'},
+                    {field: 'dkyfzr', width: '8%', title: '电科院负责人'},
                     {field: 'ssbmmc', width: '8%', title: '所属部门'},
                     {field: 'nf', width: '5%', title: '年份'},
-                    {field: 'sqsj', width: '8%', title: '申请时间', align: 'center'}
+                    {field: 'cjsj', width: '8%', title: '申请时间', align: 'center'}
                 ]
             ],
             autoSort: false,
@@ -302,7 +304,11 @@
                 "cjsj1":'',
                 "cjsj2":'',
                 "mc":'',
-                "bzr":''
+                "bzr":'',
+                "sfbyj":'',
+                "xmlx":'',
+                "fylb":'',
+                "sqr":''
             });
             // 执行搜索重载
             currTable.reload({

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

@@ -534,7 +534,7 @@
 </form>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
-<script th:src="@{/lib/layui-v2.6.3/layui.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>
 <script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
 <script th:src="@{/js/lay-config.js}" charset="utf-8"></script>