费用申请间接费模块bug修改

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

@@ -1,10 +1,14 @@
 package com.liang.controller;
 
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.github.pagehelper.PageHelper;
 import com.github.pagehelper.PageInfo;
 import com.liang.common.JsonTool;
 import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
 import com.liang.entity.StaIndirectCosts;
+import com.liang.entity.baobiao.UtilEntity;
+import com.liang.service.PrjAnnualbudgetService;
 import com.liang.service.StaIndirectCostsService;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -105,14 +109,13 @@ public class StaIndirectCostsController extends BaseController {
     @ResponseBody
     @RequestMapping(value = "/batchInsert/{zb}", method = RequestMethod.POST)
     public BaseResult batchInsert(@RequestBody String data, @PathVariable Integer zb) {
-        //删除间接费
-        staIndirectCostsService.deleteByZb(zb);
-
         List<StaIndirectCosts> expenseList = JsonTool.parseArray(data, StaIndirectCosts.class);
         for (int i = 0; i < expenseList.size(); i++) {
             expenseList.get(i).setZb(zb);
         }
         if (expenseList.size() > 0) {
+            //删除间接费
+            staIndirectCostsService.deleteByZb(zb);
             int num = staIndirectCostsService.insertBatch(expenseList);
             if (num == expenseList.size()) {
                 return BaseResult.success("间接费保存成功！");
@@ -144,17 +147,38 @@ public class StaIndirectCostsController extends BaseController {
         return "staindirectcosts/view";
     }
 
+    @Resource
+    private PrjAnnualbudgetService prjAnnualbudgetService;
     //项目报表（间接费用）页面
     @RequestMapping("/search")
     public String search(Model model) {
+        List<String> yearList = prjAnnualbudgetService.getYearList();
+        model.addAttribute("yearList", yearList);
+
         return "statistical/indirectCosts";
     }
 
     //间接费用全部及条件查询
     @ResponseBody
     @RequestMapping(value = "/searchData", method = RequestMethod.POST)
-    public BaseResult searchData(@RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc, @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq, @RequestParam(required = false, defaultValue = "", value = "JZRQ") String jzrq) {
-        List<HashMap<String, Object>> staFeasibilityreport = staIndirectCostsService.searchIndirectCost(xmmc, qsrq, jzrq);
+    public BaseResult searchData(
+            @RequestParam(required = false, defaultValue = "", value = "XMMC") String xmmc,
+            @RequestParam(required = false, defaultValue = "", value = "QSRQ") String qsrq,
+            @RequestParam(required = false, defaultValue = "", value = "JSRQ") String jsrq,
+            @RequestParam(required = false, defaultValue = "", value = "FYSQBH") String fysqbh,
+            @RequestParam(required = false, defaultValue = "", value = "NF")String nf,
+            @RequestParam(required = false, defaultValue = "", value = "ERPBH")String erpbh,
+            @RequestParam("page")Integer pageNum,
+            @RequestParam("limit")Integer pageSize) {
+        PageHelper.startPage(pageNum,pageSize);
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",xmmc);
+        map.put("qsrq",qsrq);
+        map.put("jsrq",jsrq);
+        map.put("fysqbh",fysqbh);
+        map.put("nf",nf);
+        map.put("erpbh",erpbh);
+        List<HashMap<String, Object>> staFeasibilityreport = staIndirectCostsService.searchIndirectCost(map);
         PageInfo<HashMap<String, Object>> pageinfo = new PageInfo<>(staFeasibilityreport);
         List<HashMap<String, Object>> rows = pageinfo.getList();
         int total = (int) pageinfo.getTotal();
@@ -163,5 +187,21 @@ public class StaIndirectCostsController extends BaseController {
         result.put(RESULT_TOTAL, total);
         return BaseResult.success(result);
     }
+    @ResponseBody
+    @RequestMapping(value = "/getAll/{fromDate}",method = RequestMethod.POST)
+    public BaseResult getAll(@PathVariable(required = false) String fromDate)throws Exception{
+        ObjectMapper objectMapper = new ObjectMapper();
+       UtilEntity util =  objectMapper.readValue(fromDate, UtilEntity.class);
+
+        Map<String, String> map = new HashMap<>();
+        map.put("xmmc",util.getXmmc());
+        map.put("qsrq",util.getQsrq());
+        map.put("jsrq",util.getJsrq());
+        map.put("fysqbh",util.getFysqbh());
+        map.put("nf",util.getNf());
+        map.put("erpbh",util.getErpbh());
+        List<HashMap<String, Object>> staFeasibilityreport = staIndirectCostsService.searchIndirectCost(map);
+       return BaseResult.success(staFeasibilityreport);
+    }
 
 }

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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.Pageable;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 间接费(StaIndirectCosts)表数据库访问层
@@ -108,6 +109,6 @@ public interface StaIndirectCostsDao {
      * @param JZRQ 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchIndirectCost(String XMMC, String QSRQ, String JZRQ);
+    List<HashMap<String, Object>> searchIndirectCost(Map map);
 
 }

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

@@ -1,5 +1,7 @@
 package com.liang.entity;
 
+import com.fasterxml.jackson.annotation.JsonProperty;
+
 import java.io.Serializable;
 
 /**
@@ -10,54 +12,68 @@ public class StaIndirectCosts implements Serializable {
     /**
      * 表ID
      */
+
     private int id;
     /**
      * 主表id
      */
+    @JsonProperty("zb")
     private int zb;
     /**
      * 申请金额
      */
+    @JsonProperty("sqje")
     private Double sqje;
     /**
      * 费用用途
      */
+    @JsonProperty("fyyt")
     private String fyyt;
     /**
      * 报账金额（含税）
      */
-    private Double bzjehs;
+    @JsonProperty("bzje")
+    private Double bzje;
     /**
      * 报账金额（不含税）
      */
-    private Double bzjebhs;
+    @JsonProperty("bhsje")
+    private Double bhsje;
     /**
      * 备注
      */
+    @JsonProperty("bz")
     private String bz;
 
-    public Double getSqje() {
-        return sqje;
+    @JsonProperty("sl")
+    private String sl;
+
+    @JsonProperty("xh")
+    private String xh;
+    private String fysq;
+
+    public String getFysq() {
+        return fysq;
     }
 
-    public void setSqje(Double sqje) {
-        this.sqje = sqje;
+    public void setFysq(String fysq) {
+        this.fysq = fysq;
     }
 
-    public int getId() {
-        return id;
+    public String getXh() {
+        return xh;
     }
 
-    public void setId(int id) {
-        this.id = id;
+    public void setXh(String xh) {
+        this.xh = xh;
     }
 
-    public void setBzjehs(Double bzjehs) {
-        this.bzjehs = bzjehs;
+    public int getId() {
+        return id;
     }
 
-    public void setBzjebhs(Double bzjebhs) {
-        this.bzjebhs = bzjebhs;
+    public void setId(int id) {
+        this.id = id;
     }
 
     public int getZb() {
@@ -68,6 +84,13 @@ public class StaIndirectCosts implements Serializable {
         this.zb = zb;
     }
 
+    public Double getSqje() {
+        return sqje;
+    }
+
+    public void setSqje(Double sqje) {
+        this.sqje = sqje;
+    }
 
     public String getFyyt() {
         return fyyt;
@@ -77,20 +100,20 @@ public class StaIndirectCosts implements Serializable {
         this.fyyt = fyyt;
     }
 
-    public double getBzjehs() {
-        return bzjehs;
+    public Double getBzje() {
+        return bzje;
     }
 
-    public void setBzjehs(double bzjehs) {
-        this.bzjehs = bzjehs;
+    public void setBzje(Double bzje) {
+        this.bzje = bzje;
     }
 
-    public double getBzjebhs() {
-        return bzjebhs;
+    public Double getBhsje() {
+        return bhsje;
     }
 
-    public void setBzjebhs(double bzjebhs) {
-        this.bzjebhs = bzjebhs;
+    public void setBhsje(Double bhsje) {
+        this.bhsje = bhsje;
     }
 
     public String getBz() {
@@ -100,4 +123,12 @@ public class StaIndirectCosts implements Serializable {
     public void setBz(String bz) {
         this.bz = bz;
     }
+
+    public String getSl() {
+        return sl;
+    }
+
+    public void setSl(String sl) {
+        this.sl = sl;
+    }
 }

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

@@ -6,6 +6,7 @@ import org.springframework.data.domain.PageRequest;
 
 import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 间接费(StaIndirectCosts)表服务接口
@@ -91,6 +92,6 @@ public interface StaIndirectCostsService {
      * @param jsrq 创建结束日期
      * @return
      */
-    List<HashMap<String, Object>> searchIndirectCost(String xmmc, String sqrq, String jsrq);
+    List<HashMap<String, Object>> searchIndirectCost(Map map);
 
 }

src/main/java/com/liang/service/impl/StaIndirectCostsServiceImpl.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;
 
 /**
  * 间接费(StaIndirectCosts)表服务实现类
@@ -98,7 +99,7 @@ public class StaIndirectCostsServiceImpl implements StaIndirectCostsService {
     }
 
     @Override
-    public List<HashMap<String, Object>> searchIndirectCost(String xmmc, String qsrq, String jzrq) {
-        return this.staIndirectCostsDao.searchIndirectCost(xmmc, qsrq, jzrq);
+    public List<HashMap<String, Object>> searchIndirectCost(Map map) {
+        return this.staIndirectCostsDao.searchIndirectCost(map);
     }
 }

src/main/resources/mapper/StaIndirectCostsDao.xml

@@ -91,27 +91,38 @@
     </insert>
 
     <!--批量插入间接费-->
-    <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_IndirectCosts(ZB, sqje, FYYT, BZJEHS, BZJEBHS, BZ)
+       <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
+        insert into sta_IndirectCosts(ZB, SQJE, FYYT, BZJE, BHSJE, BZ,XH,SL,FYSQ)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.zb}, #{entity.sqje}, #{entity.fyyt}, #{entity.bzjehs}, #{entity.bzjebhs}, #{entity.bz})
+            (
+             #{entity.zb},
+             #{entity.sqje},
+             #{entity.fyyt},
+             #{entity.bzje},
+             #{entity.bhsje},
+             #{entity.bz},
+             #{entity.xh},
+             #{entity.sl},
+             #{entity.fysq}
+             )
         </foreach>
     </insert>
 
     <insert id="insertOrUpdateBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into sta_IndirectCosts(ZB, sqje, FYYT, BZJEHS, BZJEBHS, BZ)
+        insert into sta_IndirectCosts(ZB, sqje, FYYT, BZJE, BHSJE, BZ,SL)
         values
         <foreach collection="entities" item="entity" separator=",">
-            (#{entity.zb}, #{entity.sqje}, #{entity.fyyt}, #{entity.bzjehs}, #{entity.bzjebhs}, #{entity.bz})
+            (#{entity.zb}, #{entity.sqje}, #{entity.fyyt}, #{entity.bzje}, #{entity.bhsje}, #{entity.bz},#{entity.sl})
         </foreach>
         on duplicate key update
         ZB = values(ZB),
         sqje = values(sqje),
         FYYT = values(FYYT),
-        BZJEHS = values(BZJEHS),
-        BZJEBHS = values(BZJEBHS),
-        BZ = values(BZ)
+        BZJE = values(BZJE),
+        BHSJE = values(BHSJE),
+        BZ = values(BZ),
+SL = values(SL)
     </insert>
 
     <!--通过主键修改数据-->
@@ -171,40 +182,49 @@
     </select>
 
     <!--统计报表（间接费）查询 -->
-    <select id="searchIndirectCost" resultType="Map">
-        SELECT sta_IndirectCosts.ID,
+    <select id="searchIndirectCost" resultType="HashMap">
+        SELECT
+        sta_IndirectCosts.ID,
         sys_dept_info.dept_name AS BM,
         prj_Project.BM AS XMBH,
         sta_BudgetApproval.XMMC,
         base_ProjectType.XMLXMC,
-        sta_IndirectCosts.SQJE,
+        sta_BudgetApproval.SQJE,
+        sta_IndirectCosts.FYYT,
         sta_IndirectCosts.FYYT,
-        CASE
-        WHEN sta_BudgetApproval.SFBYJ = 0 THEN '否'
-        WHEN sta_BudgetApproval.SFBYJ = 1 THEN '是'
+        CASE sta_BudgetApproval.SFBYJ
+        WHEN 0 THEN '否'
+        WHEN 1 THEN '是'
         ELSE CAST(sta_BudgetApproval.SFBYJ AS varchar(11))
         END AS SFBYJ,
         sta_IndirectCosts.BZJEHS,
         sta_IndirectCosts.BZJEBHS,
         sta_IndirectCosts.BZ,
         CAST(sta_BudgetApproval.SQSJ AS date) AS SQSJ
-        FROM sta_IndirectCosts,
-        sta_BudgetApproval,
-        prj_Project,
-        sys_dept_info,
-        base_ProjectType
-        WHERE sta_IndirectCosts.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="XMMC != null and XMMC != ''">
-            AND sta_BudgetApproval.XMMC LIKE '%${XMMC}%'
+        FROM
+        sta_IndirectCosts
+        INNER JOIN sta_BudgetApproval ON sta_IndirectCosts.ZB = sta_BudgetApproval.ID
+        INNER JOIN prj_Project ON sta_BudgetApproval.XMID = prj_Project.ID
+        INNER JOIN sys_dept_info ON sta_BudgetApproval.SSBM = sys_dept_info.dept_id
+        INNER JOIN base_ProjectType ON sta_BudgetApproval.XMLX = base_ProjectType.XMLX
+        where  1= 1
+        <if test="xmmc != null and xmmc != ''">
+            AND sta_BudgetApproval.XMMC LIKE '%'+#{xmmc}+'%'
+        </if>
+        <if test="sqrq != null and sqrq != ''">
+            AND sta_BudgetApproval.SQSJ  <![CDATA[>= ]]> #{sqrq}
+        </if>
+        <if test="jsrq != null and jsrq != ''">
+            AND sta_BudgetApproval.SQSJ  <![CDATA[<= ]]> #{jsrq}
+        </if>
+        <if test="erpbh != null and erpbh != ''">
+        AND sta_BudgetApproval.ERPBH like '%'+#{erpbh}+'%'
         </if>
-        <if test="QSRQ != null and QSRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[>= ]]> #{QSRQ}
+        <if test="bh != null and bh != ''">
+            AND sta_BudgetApproval.BH like '%'+#{bh}+'%'
         </if>
-        <if test="JZRQ != null and JZRQ != ''">
-            AND sta_BudgetApproval.SQSJ  <![CDATA[<= ]]> #{JZRQ}
+        <if test="nf != null and nf != ''">
+            AND  sta_BudgetApproval.NF = #{nf}
         </if>
     </select>
 

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

@@ -1404,12 +1404,13 @@
             cols: [
                 [
                     {type: "checkbox", align: 'center'},
-                    {type: 'numbers', align: 'center'},
+                    {type: 'numbers', align: 'center',title: '😊'},
                     {field: 'xh', title: '序号', width: '10%'},
-                    {field: 'sqje', title: '申请金额', width: '10%'},
+                    {field: 'sqje', title: '申请金额', width: '15%'},
                     {field: 'fyyt', title: '费用用途', width: '20%'},
-                    {field: 'bzjehs', title: '报账金额（含税）', width: '14%'},
-                    {field: 'bzjebhs', title: '报账金额（不含税）)', width: '14%'},
+                    {field: 'bzje', title: '报账金额（含税）', width: '20%'},
+                    {field: 'bhsje', title: '报账金额（不含税)', width: '20%'},
+                    {field: 'sl', title: '税率', width: '14%'},
                     {field: 'bz', title: '备注', width: '11%'},
                 ]
             ],
@@ -1465,9 +1466,10 @@
                     "xh": data[0].xh,
                     "sqje": data[0].sqje,
                     "fyyt": data[0].fyyt,
-                    "bzjehs": data[0].bzjehs,
-                    "bzjebhs": data[0].bzjebhs,
-                    "bz": data[0].bz
+                    "bzje": data[0].bzje,
+                    "bhsje": data[0].bhsje,
+                    "bz": data[0].bz,
+                    "sl": data[0].sl
                 };
                 layer.open({
                     title: '编辑间接费',
@@ -1516,9 +1518,11 @@
                     "xh": data[0].xh,
                     "sqje": data[0].sqje,
                     "fyyt": data[0].fyyt,
-                    "bzjehs": data[0].bzjehs,
-                    "bzjebhs": data[0].bzjebhs,
-                    "bz": data[0].bz
+                    "bzje": data[0].bzje,
+                    "bhsje": data[0].bhsje,
+                    "bz": data[0].bz,
+                    "xh": data[0].xh,
+                    "sl": data[0].sl
                 };
                 layer.open({
                     title: '浏览间接费',
@@ -1567,9 +1571,10 @@
                 "xh": data.xh,
                 "sqje": data.sqje,
                 "fyyt": data.fyyt,
-                "bzjehs": data.bzjehs,
-                "bzjebhs": data.bzjebhs,
-                "bz": data.bz
+                "bzje": data.bzje,
+                "bhsje": data.bhsje,
+                "bz": data.bz,
+                "sl":data.sl
             };
             layer.open({
                 title: '浏览间接费',
@@ -3818,9 +3823,11 @@
                                         "zb": fyId,
                                         "sqje": item.sqje,
                                         "fyyt": item.fyyt,
-                                        "bzjehs": item.bzjehs,
-                                        "bzjebhs": item.bzjebhs,
-                                        "bz": item.bz
+                                        "bzje": item.bzje,
+                                        "bhsje": item.bhsje,
+                                        "bz": item.bz,
+                                        "sl": item.sl,
+                                        "xh" :item.xh
                                     };
                                     indirectCosts.push(cost);
                                 }

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

@@ -15,23 +15,50 @@
 <body>
 <form class="layui-form" action="" lay-filter="formDemo">
     <div class="layui-form layuimini-form">
-        <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: 270px">
-                <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input">
+        <div class="layui-form-item" style="width: 100%; display: flex; flex-wrap: wrap;">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">序号</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空">
+                </div>
             </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: 270px">
-                <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off"
-                       class="layui-input">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">费用用途</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">申请金额</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <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: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">税率</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
+                </div>
             </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(不含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
+            </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: 270px">
-                <input type="text" id="bz" name="bz" autocomplete="off" class="layui-input">
+        <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+            <label class="layui-form-label" style="width: 70px; margin-right: 10px;">备注</label>
+            <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input"></textarea>
             </div>
         </div>
 
@@ -45,6 +72,28 @@
             </button>
         </div>
     </div>
+    <script>
+        function calculateBzje() {
+            var bhsje = parseFloat(document.getElementById('bhsje').value);
+            var sl = parseFloat(document.getElementById('sl').value) / 100; // assuming sl is input as percentage
+
+            if (!isNaN(bhsje) && !isNaN(sl)) {
+                var bzje = bhsje * (1 + sl);
+                document.getElementById('bzje').value = bzje.toFixed(2); // Round to 2 decimal places
+            }
+        }
+
+        function calculateBhsje() {
+            var bzje = parseFloat(document.getElementById('bzje').value);
+            var sl = parseFloat(document.getElementById('sl').value) / 100; // assuming sl is input as percentage
+
+            if (!isNaN(bzje) && !isNaN(sl)) {
+                var bhsje = bzje / (1 + sl);
+                document.getElementById('bhsje').value = bhsje.toFixed(2); // Round to 2 decimal places
+            }
+        }
+    </script>
+
 </form>
 
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>

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

@@ -15,23 +15,50 @@
 <body>
 <form class="layui-form" action="" lay-filter="formDemo">
     <div class="layui-form layuimini-form">
-        <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: 270px">
-                <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input">
+        <div class="layui-form-item" style="width: 100%; display: flex; flex-wrap: wrap;">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">序号</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空">
+                </div>
             </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: 270px">
-                <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off"
-                       class="layui-input">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">费用用途</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">申请金额</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <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: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">税率</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(不含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
             </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: 270px">
-                <input type="text" id="bz" name="bz" autocomplete="off" class="layui-input">
+        <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+            <label class="layui-form-label" style="width: 70px; margin-right: 10px;">备注</label>
+            <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input"></textarea>
             </div>
         </div>
 
@@ -44,6 +71,27 @@
                 <i class="layui-icon layui-icon-close"></i>取消
             </button>
         </div>
+        <script>
+            function calculateBzje() {
+                var bhsje = parseFloat(document.getElementById('bhsje').value);
+                var sl = parseFloat(document.getElementById('sl').value) / 100; // assuming sl is input as percentage
+
+                if (!isNaN(bhsje) && !isNaN(sl)) {
+                    var bzje = bhsje * (1 + sl);
+                    document.getElementById('bzje').value = bzje.toFixed(2); // Round to 2 decimal places
+                }
+            }
+
+            function calculateBhsje() {
+                var bzje = parseFloat(document.getElementById('bzje').value);
+                var sl = parseFloat(document.getElementById('sl').value) / 100; // assuming sl is input as percentage
+
+                if (!isNaN(bzje) && !isNaN(sl)) {
+                    var bhsje = bzje / (1 + sl);
+                    document.getElementById('bhsje').value = bhsje.toFixed(2); // Round to 2 decimal places
+                }
+            }
+        </script>
     </div>
 </form>
 <script th:src="@{/lib/jquery-3.4.1/jquery-3.4.1.min.js}" charset="utf-8"></script>
@@ -61,9 +109,10 @@
         $("#xh").val(cost.xh);
         $("#sqje").val(cost.sqje);
         $("#fyyt").val(cost.fyyt);
-        $("#bzjehs").val(cost.bzjehs);
-        $("#bzjebhs").val(cost.bzjebhs);
+        $("#bzje").val(cost.bzje);
+        $("#bhsje").val(cost.bhsje);
         $("#bz").val(cost.bz);
+        $("#sl").val(cost.sl);
         form.render();
 
         // var sqje = $("#sqje").val();

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

@@ -15,26 +15,52 @@
 <body>
 <form class="layui-form" action="" lay-filter="formDemo">
     <div class="layui-form layuimini-form">
-        <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: 270px">
-                <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input">
+        <div class="layui-form-item" style="width: 100%; display: flex; flex-wrap: wrap;">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">序号</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="xh" name="xh" autocomplete="off" class="layui-input" lay-verify="序号不能为空">
+                </div>
             </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: 270px">
-                <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off"
-                       class="layui-input">
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">费用用途</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="fyyt" name="fyyt" lay-verify="required" lay-reqtext="费用用途不能为空" autocomplete="off" class="layui-input">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">申请金额</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <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: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">税率</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="sl" name="sl" lay-verify="required" lay-reqtext="税率不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
+            </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bzje" name="bzje" lay-verify="required" lay-reqtext="报账金额(含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBhsje()">
+                </div>
             </div>
+            <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+                <label class="layui-form-label required" style="width: 70px; margin-right: 10px;">报账金额(不含税)</label>
+                <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                    <input type="text" id="bhsje" name="bhsje" lay-verify="required" lay-reqtext="报账金额(不含税)不能为空" autocomplete="off" class="layui-input" oninput="calculateBzje()">
+                </div>
+            </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: 270px">
-                <input type="text" id="bz" name="bz" autocomplete="off" class="layui-input">
+        <div class="layui-form-item layui-inline" style="width: calc(50% - 35px); display: flex; align-items: center;">
+            <label class="layui-form-label" style="width: 70px; margin-right: 10px;">备注</label>
+            <div class="layui-input-inline" style="width: calc(100% - 80px);">
+                <textarea  type="text" id="bz" name="bz" autocomplete="off" class="layui-input"></textarea>
             </div>
         </div>
-
         <!-- 右侧悬浮按钮 -->
         <div class="right-bottom-btn">
             <button class="layui-btn" lay-filter="cancleBtn">
@@ -59,9 +85,10 @@
         $("#xh").val(cost.xh);
         $("#sqje").val(cost.sqje);
         $("#fyyt").val(cost.fyyt);
-        $("#bzjehs").val(cost.bzjehs);
-        $("#bzjebhs").val(cost.bzjebhs);
+        $("#bzje").val(cost.bzje);
+        $("#bhsje").val(cost.bhsje);
         $("#bz").val(cost.bz);
+        $("#sl").val(cost.sl);
         form.render();
 
         // var sqje = $("#sqje").val();