统计报表（材料费），材料费录入 重构，材料费数据字段增加，批量/条件导出逻辑调整

pom.xml

@@ -28,7 +28,7 @@
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <project.reporting.outputEncoding>UTF-8</project.reporting.outputEncoding>
         <mybatis.version>2.2.0</mybatis.version>
-        <pagehelper.version>1.2.13</pagehelper.version>
+        <pagehelper.version>1.3.0</pagehelper.version>
         <druid.version>1.2.8</druid.version>
         <knife4j.version>2.0.5</knife4j.version>
         <swagger-ui>2.9.2</swagger-ui>

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

@@ -126,7 +126,7 @@ public class StaBudgetapprovalController extends BaseController {
 
     @ResponseBody
     @RequestMapping(value = "/exportExcel/{fromdata}", method = RequestMethod.POST)
-    public BaseResult exportExcel(@PathVariable String fromdata)throws Exception{
+    public BaseResult exportExcel(@PathVariable(required = false) String fromdata)throws Exception{
         SysUserInfo userInfo = getSysUserInfo();
         List<String> postName = sysUserInfoService.getPostNameByUserId(userInfo.getUserId());
         ObjectMapper objectMapper = new ObjectMapper();

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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 材料费(StaMaterial)表数据库访问层
@@ -111,5 +112,5 @@ public interface StaMaterialDao {
      * @param JZRQ 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchMaterialCost(String MC, String CLMC, String WLBM, String BZ, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchMaterialCost(Map map);
 }

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

@@ -24,6 +24,37 @@ public class StaMaterial implements Serializable {
     private Double hsje;
     //备注
     private String bz;
+    // 申请金额
+    private Double sqje;
+    // 税率
+    private Double sl;
+
+    private String xh;
+
+
+    public String getXh() {
+        return xh;
+    }
+
+    public void setXh(String xh) {
+        this.xh = xh;
+    }
+
+    public Double getSqje() {
+        return sqje;
+    }
+
+    public void setSqje(Double sqje) {
+        this.sqje = sqje;
+    }
+
+    public Double getSl() {
+        return sl;
+    }
+
+    public void setSl(Double sl) {
+        this.sl = sl;
+    }
 
     public int getId() {
         return id;

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

@@ -0,0 +1,109 @@
+package com.liang.entity;
+
+import com.fasterxml.jackson.annotation.JsonProperty;
+
+import java.io.Serializable;
+
+/**
+ * @Author ly
+ * @Date 2024/7/3 23:29
+ * @Version 1.0
+ */
+public class UtilEntity implements Serializable {
+    @JsonProperty("XMMC")
+    private String xmmc;
+
+    @JsonProperty("QSRQ")
+    private String qsrq;
+
+    @JsonProperty("JSRQ")
+    private String jsrq;
+
+    @JsonProperty("ERPBH")
+    private String erpbh;
+    @JsonProperty("NF")
+    private String nf;
+    @JsonProperty("FYSQBH")
+    private String fysqbh;
+
+    @JsonProperty("WLBM")
+    private  String wlbm;
+
+    @JsonProperty("CLMC")
+    private  String clmc;
+    @JsonProperty("BZ")
+    private  String bz;
+
+
+    public String getXmmc() {
+        return xmmc;
+    }
+
+    public void setXmmc(String xmmc) {
+        this.xmmc = xmmc;
+    }
+
+    public String getQsrq() {
+        return qsrq;
+    }
+
+    public void setQsrq(String qsrq) {
+        this.qsrq = qsrq;
+    }
+
+    public String getJsrq() {
+        return jsrq;
+    }
+
+    public void setJsrq(String jsrq) {
+        this.jsrq = jsrq;
+    }
+
+    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 getFysqbh() {
+        return fysqbh;
+    }
+
+    public void setFysqbh(String fysqbh) {
+        this.fysqbh = fysqbh;
+    }
+
+    public String getWlbm() {
+        return wlbm;
+    }
+
+    public void setWlbm(String wlbm) {
+        this.wlbm = wlbm;
+    }
+
+    public String getClmc() {
+        return clmc;
+    }
+
+    public void setClmc(String clmc) {
+        this.clmc = clmc;
+    }
+
+    public String getBz() {
+        return bz;
+    }
+
+    public void setBz(String bz) {
+        this.bz = bz;
+    }
+}

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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.PageRequest;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 材料费(StaMaterial)表服务接口
@@ -94,5 +95,5 @@ public interface StaMaterialService {
      * @param jzrq 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchMaterialCost(String mc, String clmc, String wlbm, String bz, String qsrq, String jzrq);
+    List<HashMap<String, Object>> searchMaterialCost(Map map);
 }

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

@@ -11,6 +11,7 @@ import org.springframework.stereotype.Service;
 import javax.annotation.Resource;
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 材料费(StaMaterial)表服务实现类
@@ -98,7 +99,7 @@ public class StaMaterialServiceImpl implements StaMaterialService {
     }
 
     @Override
-    public List<HashMap<String, Object>> searchMaterialCost(String mc, String clmc, String wlbm, String bz, String qsrq, String jzrq) {
-        return this.staMaterialDao.searchMaterialCost(mc, clmc, wlbm, bz, qsrq, jzrq);
+    public List<HashMap<String, Object>> searchMaterialCost(Map map) {
+        return this.staMaterialDao.searchMaterialCost(map);
     }
 }

src/main/resources/mapper/StaMaterialDao.xml

@@ -107,11 +107,11 @@
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_Material(ZB, FYSQ, CLMC, WLBM, CGDJ, BHSJE, HSJE, BZ)
+        insert into sta_Material(ZB, FYSQ, CLMC, WLBM, CGDJ, BHSJE, HSJE, BZ,SQJE,SL,XH)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.zb}, #{entity.fysq}, #{entity.clmc}, #{entity.wlbm}, #{entity.cgdj}, #{entity.bhsje},
-            #{entity.hsje}, #{entity.bz})
+            #{entity.hsje}, #{entity.bz},#{entity.sqje},#{entity.sl},#{entity.xh})
         </foreach>
     </insert>
 
@@ -196,51 +196,67 @@
     </delete>
 
     <!--统计报表（材料费）查询 -->
-    <select id="searchMaterialCost" resultType="Map">
-        SELECT sta_Material.ID,
-        sys_dept_info.dept_name AS BM,
-        prj_Project.BM AS XMBH,
-        sta_BudgetApproval.XMMC,
-        base_ProjectType.XMLXMC,
-        sta_Material.FYSQ,
-        sta_Material.CLMC,
-        sta_Material.WLBM,
-        sta_Material.CGDJ,
-        sta_Material.BHSJE,
-        sta_Material.HSJE,
+    <select id="searchMaterialCost" resultType="HashMap">
+        SELECT
+        m.ID,
+        d.dept_name AS BM,
+        p.ERPBH AS XMBH,
+        b.XMMC,
+        pt.XMLXMC,
+        b.ERPBH,
+        b.BH,
+        b.NF,
+        m.FYSQ,
+        m.CLMC,
+        m.WLBM,
+        m.CGDJ,
+        m.BHSJE,
+        m.HSJE,
         CASE
-        WHEN sta_BudgetApproval.SFBYJ = 0 THEN '否'
-        WHEN sta_BudgetApproval.SFBYJ = 1 THEN '是'
-        ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
+        WHEN b.SFBYJ = 0 THEN '否'
+        WHEN b.SFBYJ = 1 THEN '是'
+        ELSE CAST(b.SFBYJ AS varchar(11))
         END AS SFBYJ,
-        sta_Material.BZ,
-        CAST(sta_BudgetApproval.SQSJ AS date) AS SQSJ
-        FROM sta_Material,
-        sta_BudgetApproval,
-        prj_Project,
-        base_ProjectType,
-        sys_dept_info
-        WHERE sta_Material.ZB = sta_BudgetApproval.ID
-        AND sta_BudgetApproval.XMID = prj_Project.ID
-        AND sta_BudgetApproval.SSBM = sys_dept_info.dept_id
-        AND sta_BudgetApproval.XMLX = base_ProjectType.XMLX
-        <if test="MC != null and MC != ''">
-            AND sta_BudgetApproval.XMMC LIKE '%${MC}%'
+        m.BZ,
+        CAST(b.SQSJ AS date) AS SQSJ
+        FROM
+        sta_Material m
+        LEFT JOIN
+        sta_BudgetApproval b ON m.ZB = b.ID
+        LEFT JOIN
+        prj_Project p ON b.XMID = p.ID
+        LEFT JOIN
+        base_ProjectType pt ON b.XMLX = pt.XMLX
+        LEFT JOIN
+        sys_dept_info d ON b.SSBM = d.dept_id
+        WHERE
+        b.SPZT != '作废'
+        <if test="xmmc != null and xmmc != ''">
+            AND b.XMMC LIKE '%'+#{xmmc}+'%'
+        </if>
+        <if test="clmc != null and clmc != ''">
+            AND m.CLMC LIKE '%'+#{clmc}+'%'
+        </if>
+        <if test="wlbm != null and wlbm != ''">
+            AND m.WLBM LIKE '%'+#{wlbm}+'%'
+        </if>
+        <if test="bz != null and bz != ''">
+            AND m.BZ LIKE '%'+#{bz}+'%'
         </if>
-        <if test="CLMC != null and CLMC != ''">
-            AND sta_Material.CLMC LIKE '%${CLMC}%'
+        <if test="qsrq != null and qsrq != ''">
+            AND b.SQSJ  <![CDATA[>= ]]> #{qsrq}
         </if>
-        <if test="WLBM != null and WLBM != ''">
-            AND sta_Material.WLBM LIKE '%${WLBM}%'
+        <if test="jsrq != null and jsrq != ''">
+            AND b.SQSJ  <![CDATA[<= ]]> #{jsrq}
         </if>
-        <if test="BZ != null and BZ != ''">
-            AND sta_Material.BZ LIKE '%${BZ}%'
+        <if test="erpbh != null and erpbh !=''">
+            AND b.ERPBH LIKE '%'+#{erpbh}+'%'
         </if>
-        <if test="QSRQ != null and QSRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[>= ]]> #{QSRQ}
+        <if test="fysqbh != null and fysqbh != ''">
+            AND b.BH LIKE '%'+#{fysqbh}+'%'
         </if>
-        <if test="JZRQ != null and JZRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[<= ]]> #{JZRQ}
+        <if test="nf != null and nf !=''">
+            AND b.NF = #{nf}
         </if>
     </select>
 

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

@@ -72,7 +72,7 @@
                 <button class="layui-btn layui-btn-sm data-add-btn" lay-event="add" style="background-color: #00a2d4">
                     <i class="layui-icon layui-icon-addition" style="font-size: 10px;"></i>新增
                 </button>
-                <button class="layui-btn layui-btn-sm" lay-event="export" >
+                <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
                     <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
                 </button>
                 <button class="layui-btn layui-btn-sm" lay-event="download"  style="background-color: purple">

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

@@ -152,8 +152,8 @@
                 <button class="layui-btn layui-btn-sm layui-btn-danger" lay-event="nullify">
                     <i class="layui-icon layui-icon-delete" style="font-size: 10px;"></i>作废
                 </button>
-                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">
-                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出
+                <button class="layui-btn layui-btn-sm" lay-event="exportExcel" style="background-color: #2f363c" >
+                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
                 </button>
             </div>
         </script>
@@ -683,12 +683,13 @@
                 AjaxUtil.post({
                     url: AjaxUtil.ctx + "staBudgetapproval/exportExcel/" + formDataString,
                     contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
                     success: function (res) {
+                        console.log(res);
                         table.exportFile('currentTableId', res.data, 'xlsx');
                     },
                     error: function (error) {
-
-
+                        layui.error('服务器睡着了！');
                     }
                 });
                 console.log('进来了');

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

@@ -2767,10 +2767,13 @@
                     {type: "checkbox", align: 'center'},
                     {field: 'xh', title: '序号', align: 'center', width: '7%'},
                     {field: 'clmc', title: '材料名称', width: '30%'},
-                    {field: 'gghxh', title: '规格或型号', width: '20%'},
-                    {field: 'jldw', title: '计量单位', width: '11%'},
-                    {field: 'dj', title: '单价(万元)', width: '13%'},
-                    {field: 'clfy', title: '材料费用', width: '15%'}
+                    {field: 'wlbm', title: '物料编码', width: '20%'},
+                    {field: 'cgdj', title: '采购单价(万元)', width: '11%'},
+                    {field: 'bhsje', title: '不含税金额（元））', width: '13%'},
+                    {field: 'hsje', title: '含税金额（元））', width: '13%'},
+                    {field: 'sqje', title: '申请金额', width: '15%'},
+                    {field: 'sl',title: '税率',width: '10%'},
+                    {field: 'bz', title: '备注', width: '15%'}
                 ]
             ],
             autoSort: false,
@@ -2822,11 +2825,13 @@
                 materialCost = {
                     "xh": data[0].xh,
                     "clmc": data[0].clmc,
-                    "gghxh": data[0].gghxh,
-                    "jldw": data[0].jldw,
-                    "dj": data[0].dj,
-                    "clfy": data[0].clfy,
-                    "jflz": data[0].jflz
+                    "sqje": data[0].sqje,
+                    "bhsje": data[0].bhsje,
+                    "cgdj": data[0].cgdj,
+                    "hsje": data[0].hsje,
+                    "sl": data[0].sl,
+                    "bz":data[0].bz,
+                    "wlbm":data[0].wlbm
                 };
                 layer.open({
                     title: '编辑材料费',
@@ -2873,11 +2878,13 @@
                 materialCost = {
                     "xh": data[0].xh,
                     "clmc": data[0].clmc,
-                    "gghxh": data[0].gghxh,
-                    "jldw": data[0].jldw,
-                    "dj": data[0].dj,
-                    "clfy": data[0].clfy,
-                    "jflz": data[0].jflz
+                    "sqje": data[0].sqje,
+                    "bhsje": data[0].bhsje,
+                    "cgdj": data[0].cgdj,
+                    "hsje": data[0].hsje,
+                    "sl": data[0].sl,
+                    "bz":data[0].bz,
+                    "wlbm":data[0].wlbm
                 };
                 layer.open({
                     title: '浏览材料费',
@@ -3793,6 +3800,9 @@
                                 for (const item of curData) {
                                     var cost = {
                                         "zb": fyId,
+                                        "xh": item.xh,
+                                        "sqje": item.sqje,
+                                        "sl":item.sl,
                                         "clmc": item.clmc,
                                         "wlbm": item.wlbm,
                                         "fysq": item.fysq,

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

@@ -707,11 +707,15 @@
             cols: [
                 [
                     {type: "checkbox", align: 'center'},
-                    {type: 'numbers', align: 'center'},
-                    {field: 'clmc', title: '材料名称', width: '11%'},
-                    {field: 'wlbm', title: '物料编码', width: '11%'},
-                    {field: 'cgdj', title: '单价(万元)', width: '13%'},
-                    {field: 'bz', title: '备注', width: '50%'}
+                    {field: 'xh', title: '序号', align: 'center', width: '7%'},
+                    {field: 'clmc', title: '材料名称', width: '30%'},
+                    {field: 'wlbm', title: '物料编码', width: '20%'},
+                    {field: 'cgdj', title: '采购单价(万元)', width: '11%'},
+                    {field: 'bhsje', title: '不含税金额（元））', width: '13%'},
+                    {field: 'hsje', title: '含税金额（元））', width: '13%'},
+                    {field: 'sqje', title: '申请金额', width: '15%'},
+                    {field: 'sl',title: '税率',width: '10%'},
+                    {field: 'clfy', title: '备注', width: '15%'}
                 ]
             ],
             autoSort: false,

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

@@ -19,44 +19,50 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">材料名称</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="设备名称不能为空"
+                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="材料名称不能为空"
                        class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">物料编码</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="设备型号不能为空"
+                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="物料编码不能为空"
                        class="layui-input">
             </div>
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label required" style="width: 70px">序号</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input">-->
-        <!--            </div>-->
-        <!--            <label class="layui-form-label required" style="width: 70px">申请金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="text" id="fysq" name="fysq" lay-verify="required" lay-reqtext="申请金额" autocomplete="off" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
+                <div class="layui-form-item layui-inline" style="width: 100%">
+                    <label class="layui-form-label required" style="width: 70px">序号</label>
+                    <div class="layui-input-inline" style="width: 265px">
+                        <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input">
+                    </div>
+                    <label class="layui-form-label required" style="width: 70px">申请金额</label>
+                    <div class="layui-input-inline" style="width: 265px">
+                        <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input">
+                    </div>
+                </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
             <div class="layui-input-inline" style="width: 265px">
                 <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
                        autocomplete="off" class="layui-input">
             </div>
-            <!--            <label class="layui-form-label required" style="width: 70px">不含税金额</label>-->
-            <!--            <div class="layui-input-inline" style="width: 265px">-->
-            <!--                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="材料费用不能为空" autocomplete="off">-->
-            <!--            </div>-->
+                        <label class="layui-form-label required" style="width: 70px">不含税金额</label>
+                        <div class="layui-input-inline" style="width: 265px">
+                            <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
+                        </div>
+        </div>
+                <div class="layui-form-item layui-inline" style="width: 100%">
+                    <label class="layui-form-label required" style="width: 70px">含税金额</label>
+                    <div class="layui-input-inline" style="width: 640px">
+                        <input type="number" id="hsje" name="hsje" class="layui-input" min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
+                    </div>
+                </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            </div>
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label" style="width: 70px">含税金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 640px">-->
-        <!--                <input type="text" id="hsje" name="hsje" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">

src/main/resources/templates/stamaterial/update.html

@@ -19,44 +19,50 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">材料名称</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="设备名称不能为空"
+                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="材料名称不能为空"
                        class="layui-input">
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">物料编码</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="设备型号不能为空"
+                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="物料编码不能为空"
                        class="layui-input">
             </div>
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label required" style="width: 70px">序号</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input">-->
-        <!--            </div>-->
-        <!--            <label class="layui-form-label required" style="width: 70px">申请金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="text" id="fysq" name="fysq" lay-verify="required" lay-reqtext="申请金额" autocomplete="off" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">序号</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input">
+            </div>
+            <label class="layui-form-label required" style="width: 70px">申请金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input">
+            </div>
+        </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
             <div class="layui-input-inline" style="width: 265px">
                 <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
                        autocomplete="off" class="layui-input">
             </div>
-            <!--            <label class="layui-form-label required" style="width: 70px">不含税金额</label>-->
-            <!--            <div class="layui-input-inline" style="width: 265px">-->
-            <!--                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="材料费用不能为空" autocomplete="off">-->
-            <!--            </div>-->
+            <label class="layui-form-label required" style="width: 70px">不含税金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">含税金额</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="number" id="hsje" name="hsje" class="layui-input" min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
+            </div>
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label" style="width: 70px">含税金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 640px">-->
-        <!--                <input type="text" id="hsje" name="hsje" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">
@@ -85,15 +91,18 @@
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     layui.use(['form', 'tableSelect', 'laydate'], function () {
         var form = layui.form;
-
         var materialCost = parent.getMatCost();
+        console.log(materialCost);
+
         $("#clmc").val(materialCost.clmc);
         $("#wlbm").val(materialCost.wlbm);
-        $("#fysq").val(materialCost.fysq);
+        $("#sqje").val(materialCost.sqje);
         $("#cgdj").val(materialCost.cgdj);
         $("#bhsje").val(materialCost.bhsje);
         $("#hsje").val(materialCost.hsje);
         $("#bz").val(materialCost.bz);
+        $("#xh").val(materialCost.xh);
+        $("#sl").val(materialCost.sl);
 
         //监听提交
         form.on('submit(saveBtn)', function (data) {

src/main/resources/templates/stamaterial/view.html

@@ -19,44 +19,50 @@
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">材料名称</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="设备名称不能为空"
-                       class="layui-input">
+                <input type="text" id="clmc" name="clmc" lay-verify="required" lay-reqtext="材料名称不能为空"
+                       class="layui-input" disabled >
             </div>
         </div>
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">物料编码</label>
             <div class="layui-input-inline" style="width: 640px">
-                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="设备型号不能为空"
-                       class="layui-input">
+                <input type="text" id="wlbm" name="wlbm" lay-verify="required" lay-reqtext="物料编码不能为空"
+                       class="layui-input" disabled>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">序号</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input" disabled>
+            </div>
+            <label class="layui-form-label required" style="width: 70px">申请金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="text" id="sqje" name="sqje" lay-verify="required" lay-reqtext="申请金额不能为空" autocomplete="off" class="layui-input" disabled>
             </div>
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label required" style="width: 70px">序号</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="number" id="xh" name="xh" min = "0" autocomplete="off" lay-verify="required" lay-reqtext="序号不能为空" class="layui-input">-->
-        <!--            </div>-->
-        <!--            <label class="layui-form-label required" style="width: 70px">申请金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 265px">-->
-        <!--                <input type="text" id="fysq" name="fysq" lay-verify="required" lay-reqtext="申请金额" autocomplete="off" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label required" style="width: 70px">单价(万元)</label>
             <div class="layui-input-inline" style="width: 265px">
                 <input type="number" id="cgdj" name="cgdj" min="0" lay-verify="required" lay-reqtext="单价不能为空"
-                       autocomplete="off" class="layui-input">
+                       autocomplete="off" class="layui-input" disabled>
+            </div>
+            <label class="layui-form-label required" style="width: 70px">不含税金额</label>
+            <div class="layui-input-inline" style="width: 265px">
+                <input type="number" id="bhsje" name="bhsje" class="layui-input" disabled min = "0" lay-verify="required" lay-reqtext="不含税金额不能为空" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">含税金额</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="number" id="hsje" name="hsje" class="layui-input" disabled min="0" lay-verify="requird" lay-reqtext="含税金额不能为空" autocomplete="off">
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label required" style="width: 70px">税率</label>
+            <div class="layui-input-inline" style="width: 640px">
+                <input type="text" id="sl" name="sl" class="layui-input" disabled min="0" lay-verify="requird" lay-reqtext="税率不能为空" autocomplete="off">
             </div>
-            <!--            <label class="layui-form-label required" style="width: 70px">不含税金额</label>-->
-            <!--            <div class="layui-input-inline" style="width: 265px">-->
-            <!--                <input type="number" id="bhsje" name="bhsje" class="layui-input" min = "0" lay-verify="required" lay-reqtext="材料费用不能为空" autocomplete="off">-->
-            <!--            </div>-->
         </div>
-        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
-        <!--            <label class="layui-form-label" style="width: 70px">含税金额</label>-->
-        <!--            <div class="layui-input-inline" style="width: 640px">-->
-        <!--                <input type="text" id="hsje" name="hsje" class="layui-input">-->
-        <!--            </div>-->
-        <!--        </div>-->
         <div class="layui-form-item layui-inline" style="width: 100%">
             <label class="layui-form-label" style="width: 70px">备注</label>
             <div class="layui-input-inline" style="width: 640px">
@@ -65,8 +71,11 @@
         </div>
         <!-- 右侧悬浮按钮 -->
         <div class="right-bottom-btn">
+            <button type="button" class="layui-btn" lay-submit lay-filter="saveBtn">
+                <i class="layui-icon layui-icon-ok"></i>确定
+            </button>
             <button class="layui-btn" lay-filter="cancleBtn">
-                <i class="layui-icon layui-icon-close"></i>关闭
+                <i class="layui-icon layui-icon-close"></i>取消
             </button>
         </div>
     </div>
@@ -84,14 +93,16 @@
         var form = layui.form;
 
         var materialCost = parent.getMatCost();
+        console.log(materialCost);
         $("#clmc").val(materialCost.clmc);
         $("#wlbm").val(materialCost.wlbm);
-        $("#fysq").val(materialCost.fysq);
+        $("#sqje").val(materialCost.sqje);
         $("#cgdj").val(materialCost.cgdj);
         $("#bhsje").val(materialCost.bhsje);
         $("#hsje").val(materialCost.hsje);
         $("#bz").val(materialCost.bz);
-
+        $("#xh").val(materialCost.xh);
+        $("#sl").val(materialCost.sl);
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
             var iframeIndex = parent.layer.getFrameIndex(window.name);

src/main/resources/templates/statistical/material.html

@@ -27,26 +27,31 @@
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">项目名称</label>
                             <div class="layui-input-inline" style="width: 224px;">
-                                <input type="text" id="xmmc" name="xmmc" autocomplete="off" class="layui-input">
+                                <input type="text" id="XMMC" name="XMMC" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">erp编号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="erpbh" name="erpbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="ERPBH" name="ERPBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
                             <label class="layui-form-label" style="width: 80px;">费用申请号</label>
                             <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="fysqbh" name="fysqbh" autocomplete="off" class="layui-input">
+                                <input type="text" id="FYSQBH" name="FYSQBH" autocomplete="off" class="layui-input">
                             </div>
                         </div>
                         <div class="layui-inline" style="margin-right: 10px;">
-                            <label class="layui-form-label" style="width: 60px;">年度</label>
-                            <div class="layui-input-inline" style="width: 140px;">
-                                <input type="text" id="nf" name="nf" autocomplete="off" class="layui-input">
+                            <label class="layui-form-label" style="width: 60px">年份</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>
+
                         </div>
                     </div>
 
@@ -58,7 +63,7 @@
                             </div>
                             <div class="layui-form-mid">-</div>
                             <div class="layui-input-inline" style="width: 100px;">
-                                <input type="text" name="JZRQ" id="JZRQ" placeholder="结束日期" class="layui-input" readonly>
+                                <input type="text" name="JSRQ" id="JSRQ" placeholder="结束日期" class="layui-input" readonly>
                             </div>
                         </div>
                         <div class="layui-inline">
@@ -97,7 +102,9 @@
         </fieldset>
 
         <script type="text/html" id="toolbarDemo">
-
+            <button class="layui-btn layui-btn-sm" lay-event="export" style="background-color: #2f363c" >
+                <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>批量导出
+            </button>
         </script>
 
         <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userId}">
@@ -139,7 +146,7 @@
             elem: '#QSRQ'
         });
         laydate.render({
-            elem: '#JZRQ'
+            elem: '#JSRQ'
         });
 
         var currTable = table.render({
@@ -154,6 +161,8 @@
                     {type: 'numbers', align: 'center',title: '序号'},
                     {field: 'BM', width: '7%', title: '所属部门'},
                     {field: 'XMBH', width: '7%', title: '项目编号'},
+                    {field: 'NF',width: '5%',title:'年份'},
+                    {field: 'BH',width: '7%',title: '费用申请编号'},
                     {field: 'XMMC', width: '15%', title: '项目名称', sort: true},
                     {field: 'XMLXMC', width: '10%', title: '项目类型'},
                     {field: 'CLMC', width: '10%', title: '材料名称'},
@@ -207,11 +216,15 @@
         form.on('submit(data-reset-btn)', function (data) {
             form.val("search-form", {
                 "XMMC": '',
-                "CLMC": '',
-                'WLBM': '',
-                'BZ': '',
+                "ERPBH": '',
+                'NF': '',
                 'QSRQ': '',
-                'JZRQ': ''
+                'JSSJ': '',
+                'CLMC':'',
+                'WLBM':'',
+                'FYSQBH':'',
+                'BZ':''
+
             });
             // 执行搜索重载
             currTable.reload({
@@ -233,10 +246,29 @@
                 }
             });
         });
-        var cancelIndex;
-        /**
-         * toolbar监听事件
-         */
+
+
+        table.on('toolbar(currentTableFilter)', function (obj) {
+            if (obj.event ==='export'){
+                var formData = form.val('search-form');
+                console.log(formData);
+                var formDataString = JSON.stringify(formData);
+                AjaxUtil.post({
+                    url:AjaxUtil.ctx +'staMaterial/getAll/'+formDataString,
+                    contentType: "application/json",
+                    timeout: 15000, //大批量导出时会出现超时问题
+                    success: function(res){
+                        console.log(res);
+                        table.exportFile('currentTableId',res.data,'xlsx');
+                    },
+                    error:function (error) {
+                        Message.error(error,2000)
+
+                    }
+                });
+            }
+
+        });
     });