任务书数据留痕

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

@@ -27,6 +27,7 @@ import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
 import org.springframework.http.ResponseEntity;
 import org.springframework.stereotype.Controller;
+import org.springframework.transaction.annotation.Transactional;
 import org.springframework.ui.Model;
 import org.springframework.web.bind.annotation.*;
 import org.springframework.web.multipart.MultipartFile;
@@ -99,6 +100,8 @@ public class PrjProjectController extends BaseController {
     private SysUserInfoService sysUserInfoService;
     @Resource
     private PrjAnnualbudgetdetailDao prjAnnualbudgetdetailDao;
+    @Resource
+    private PrjProjectXgjlService prjProjectXgjlService;
 
 
     private final static List oldCddwList = new ArrayList();
@@ -2315,5 +2318,64 @@ public class PrjProjectController extends BaseController {
 
         return BaseResult.success(result);
     }
+    /**
+     * 任务书修改记录查看页面
+     *
+     * @return
+     */
+    @GetMapping("/viewRecord")
+    public String viewRecord() {
+        return "prjproject/view_record";
+    }
+
+    @ResponseBody
+    @RequestMapping(value = "/redordData/{xmid}", method = RequestMethod.POST)
+    public BaseResult spList(@PathVariable int xmid,
+                             @RequestParam("page") Integer pageNum,
+                             @RequestParam("limit") Integer pageSize
+                           ) {
+        PageHelper.startPage(pageNum, pageSize);
+        List<PrjBudget> list = prjBudgetService.getXGJL(xmid);
+        PageInfo<PrjBudget> pageinfo = new PageInfo<>(list);
+        //取出查询结果
+        List<PrjBudget> rows = pageinfo.getList();
+        int total = (int) pageinfo.getTotal();
+        Map<String, Object> result = new HashMap<>();
+        result.put(RESULT_ROWS, rows);
+        result.put(RESULT_TOTAL, total);
+
+        return BaseResult.success(result);
+    }
+
+    /**
+     * 在记录表中添加修改前的数据
+     * @return
+     */
+    @ResponseBody
+    @PostMapping("/addPrjProjectRecord/{xmid}")
+//    @Transactional
+    public BaseResult addBudgetRecord(@PathVariable("xmid") Integer xmid) {
+//        1.获取年度预算明细列表中的数据
+        List<PrjBudget> xgjl = prjBudgetService.getXGJL(xmid);
+//        查询当前为第几次记录
+        List<PrjProjectXgjl> xgjls = prjProjectXgjlService.getXGJL(xmid);
+//        获取当前年度预算审批状态
+        PrjProject prjProject = prjProjectService.queryById(xmid);
+        int xh = xgjls.size()+1;
+        List<PrjProjectXgjl> prjProjectXgjlList = new ArrayList<>();
+        for (int i = 0; i < xgjl.size(); i++) {
+            PrjProjectXgjl prjProjectXgjl= new PrjProjectXgjl();
+            prjProjectXgjl.setXmid(xmid);
+            prjProjectXgjl.setMc(xgjl.get(i).getMc());
+            prjProjectXgjl.setXg(xgjl.get(i).getXg());
+            prjProjectXgjl.setXgrq(new java.sql.Date(System.currentTimeMillis()).toString());
+            prjProjectXgjl.setXh(xh);
+            prjProjectXgjlList.add(prjProjectXgjl);
+        }
+        if (prjProject.getSpzt().equals("审批结束")){
+            prjProjectXgjlService.batchinsertXGJL(prjProjectXgjlList);
+        }
+        return BaseResult.success();
+    }
 }
 

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

@@ -0,0 +1,34 @@
+package com.liang.controller;
+
+import com.liang.common.JsonTool;
+import com.liang.entity.PrjAnnualbudgetXgjl;
+import com.liang.entity.PrjProjectXgjl;
+import com.liang.service.PrjProjectXgjlService;
+import org.springframework.stereotype.Controller;
+import org.springframework.web.bind.annotation.PathVariable;
+import org.springframework.web.bind.annotation.RequestMapping;
+import org.springframework.web.bind.annotation.RequestMethod;
+import org.springframework.web.bind.annotation.ResponseBody;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Controller
+@RequestMapping("prjProjectXgjl")
+public class PrjProjectXgjlController {
+    @Resource
+    private PrjProjectXgjlService prjProjectXgjlService;
+
+    /**
+     * 获取项目修改记录
+     *
+     * @return
+     */
+    @ResponseBody
+    @RequestMapping(value = "/getXGJL/{xmid}", method = RequestMethod.POST)
+    public Object getXGJL(@PathVariable Integer xmid) {
+        List<PrjProjectXgjl> prjProjectXgjlList = prjProjectXgjlService.getXGJL(xmid);
+        return JsonTool.toJsonString(prjProjectXgjlList);
+    }
+
+}

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

@@ -0,0 +1,14 @@
+package com.liang.dao;
+
+import com.liang.entity.PrjProjectXgjl;
+import org.apache.ibatis.annotations.Param;
+
+import java.util.List;
+
+public interface PrjProjectXgjlDao {
+    List<PrjProjectXgjl> getXGJL(Integer xmid);
+
+    List<PrjProjectXgjl> getXG(@Param("xh") Integer k,@Param("xmid") Integer xmid);
+
+    void batchinsertXGJL(@Param("xgjlList") List<PrjProjectXgjl> prjProjectXgjlList);
+}

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

@@ -1,5 +1,7 @@
 package com.liang.entity;
 
+import lombok.Data;
+
 import java.io.Serializable;
 
 /**
@@ -8,6 +10,7 @@ import java.io.Serializable;
  * @author makejava
  * @since 2023-03-10 07:49:56
  */
+@Data
 public class PrjBudget implements Serializable {
     private static final long serialVersionUID = -99295013384521803L;
 
@@ -145,6 +148,24 @@ public class PrjBudget implements Serializable {
      * 备注
      */
     private String bz;
+    /**
+     *  修改前数据
+     */
+    private String xg;
+
+    /**
+     * 修改记录
+     */
+    private String xg1;
+    private String xg2;
+    private String xg3;
+    private String xg4;
+    private String xg5;
+    private String xg6;
+    private String xg7;
+    private String xg8;
+    private String xg9;
+    private String xg10;
 
 
     public Integer getId() {

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

@@ -0,0 +1,29 @@
+package com.liang.entity;
+
+import lombok.AllArgsConstructor;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+import org.apache.poi.hpsf.Decimal;
+
+import java.sql.Date;
+
+@Data
+@AllArgsConstructor
+@NoArgsConstructor
+public class PrjProjectXgjl {
+    private Integer id;
+//    任务书id
+    private Integer xmid;
+//    费用名称
+    private String mc;
+//    修改内容
+    private  String xg;
+//    修改日期
+    private String xgrq;
+//    序号
+    private Integer xh;
+//    预算金额
+    private Double ysje;
+
+
+}

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

@@ -94,4 +94,6 @@ public interface PrjBudgetService {
      * @return
      */
     int updateYsByXm(Integer xm, Integer count);
+
+    List<PrjBudget> getXGJL(int xmid);
 }

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

@@ -0,0 +1,14 @@
+package com.liang.service;
+
+import com.liang.entity.PrjProjectXgjl;
+
+import java.util.List;
+
+public interface PrjProjectXgjlService {
+
+    List<PrjProjectXgjl> getXGJL(Integer xmid);
+
+    List<PrjProjectXgjl> getXG(int k, int xmid);
+
+    void batchinsertXGJL(List<PrjProjectXgjl> prjProjectXgjlList);
+}

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

@@ -1,17 +1,20 @@
 package com.liang.service.impl;
 
 import com.liang.dao.BaseProjectbudgetDao;
-import com.liang.entity.BaseProjectbudget;
-import com.liang.entity.PrjBudget;
+import com.liang.entity.*;
 import com.liang.dao.PrjBudgetDao;
 import com.liang.service.PrjBudgetService;
+import com.liang.service.PrjCompletecompanyService;
+import com.liang.service.PrjProjectXgjlService;
 import org.springframework.stereotype.Service;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageImpl;
 import org.springframework.data.domain.PageRequest;
 
 import javax.annotation.Resource;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 
 /**
  * 项目预算(PrjBudget)表服务实现类
@@ -25,6 +28,10 @@ public class PrjBudgetServiceImpl implements PrjBudgetService {
     private PrjBudgetDao prjBudgetDao;
     @Resource
     private BaseProjectbudgetDao baseProjectbudgetDao;
+    @Resource
+    private PrjProjectXgjlService prjProjectXgjlService;
+    @Resource
+    private PrjCompletecompanyService prjCompletecompanyService;
 
     /**
      * 通过ID查询单条数据
@@ -119,4 +126,141 @@ public class PrjBudgetServiceImpl implements PrjBudgetService {
         this.prjBudgetDao.emptyYSYE(xm);
         return num;
     }
+
+    @Override
+    public List<PrjBudget> getXGJL(int xmid) {
+        List<PrjBudget> xgjl = prjBudgetDao.getBudgetList(xmid);
+//        获取完成单位列表
+        String xm = String.valueOf(xmid);
+        Map<String, String> paraMap = new HashMap<>();
+        paraMap.put("xm", xm);
+        List<PrjCompletecompany> list = prjCompletecompanyService.getCompanyList(paraMap);
+//        拼接修改记录
+        for (int i = 0; i < xgjl.size(); i++) {
+            String xg = "";
+            if (xgjl.get(i).getYsje()!=null) {
+                 xg = xgjl.get(i).getYsje().toString()+",";
+            }else {
+                 xg = "0,";
+            }
+            for (int j = 0; j < list.size(); j++) {
+                int k = j + 1;
+                switch (k) {
+                    case 1:
+                        if (xgjl.get(i).getDw1()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw1().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }
+                        break;
+                    case 2:
+                        if (xgjl.get(i).getDw2()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw2().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 3:
+                        if (xgjl.get(i).getDw3()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw3().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 4:
+                        if (xgjl.get(i).getDw4()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw4().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 5:
+                        if (xgjl.get(i).getDw5()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw5().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 6:
+                        if (xgjl.get(i).getDw6()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw6().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 7:
+                        if (xgjl.get(i).getDw7()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw7().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 8:
+                        if (xgjl.get(i).getDw8()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw8().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 9:
+                        if (xgjl.get(i).getDw9()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw9().toString()).concat(",");
+                        }else {
+                            xg=xg.concat("0").concat(",");
+                        }                        break;
+                    case 10:
+                        if (xgjl.get(i).getDw10()!=null){
+                            xg=xg.concat(xgjl.get(i).getDw10().toString()).concat("");
+                        }else {
+                            xg=xg.concat("0").concat("");
+                        }                        break;
+                }
+            }
+            xgjl.get(i).setXg(xg);
+        }
+        List<PrjProjectXgjl> prjProjectXgjlList=prjProjectXgjlService.getXGJL(xmid);
+//        获取修改记录
+        for (int i = 0; i < prjProjectXgjlList.size(); i++) {
+            int k=i+1;
+            List<PrjProjectXgjl> xg   =prjProjectXgjlService.getXG(k,xmid);
+            switch (k){
+                case 1:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg1(xg.get(j).getXg());
+                    };break;
+                case 2:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg2(xg.get(j).getXg());
+                    };break;
+                case 3:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg3(xg.get(j).getXg());
+                    };break;
+                case 4:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg4(xg.get(j).getXg());
+                    };break;
+                case 5:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg5(xg.get(j).getXg());
+                    };break;
+                case 6:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg6(xg.get(j).getXg());
+                    };break;
+                case 7:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg7(xg.get(j).getXg());
+                    };break;
+                case 8:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg8(xg.get(j).getXg());
+                    };break;
+                case 9:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg9(xg.get(j).getXg());
+                    };break;
+                case 10:
+                    for (int j = 0; j < xg.size(); j++) {
+                        xgjl.get(j).setXg10(xg.get(j).getXg());
+                    };break;
+            }
+
+        }
+
+        return xgjl;
+    }
 }

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

@@ -0,0 +1,31 @@
+package com.liang.service.impl;
+
+import com.liang.dao.PrjProjectXgjlDao;
+import com.liang.entity.PrjProjectXgjl;
+import com.liang.service.PrjProjectXgjlService;
+import org.springframework.stereotype.Service;
+
+import javax.annotation.Resource;
+import java.util.List;
+
+@Service("PrjProjectXgjlService")
+public class PrjProjectXgjlServiceImpl implements PrjProjectXgjlService {
+
+    @Resource
+    private PrjProjectXgjlDao prjProjectXgjlDao;
+
+    @Override
+    public List<PrjProjectXgjl> getXGJL(Integer xmid) {
+        return this.prjProjectXgjlDao.getXGJL(xmid);
+    }
+
+    @Override
+    public List<PrjProjectXgjl> getXG(int k, int xmid) {
+        return this.prjProjectXgjlDao.getXG(k,xmid);
+    }
+
+    @Override
+    public void batchinsertXGJL(List<PrjProjectXgjl> prjProjectXgjlList) {
+        prjProjectXgjlDao.batchinsertXGJL(prjProjectXgjlList);
+    }
+}

src/main/resources/mapper/PrjProjectXgjlDao.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!DOCTYPE mapper PUBLIC "-//mybatis.org//DTD Mapper 3.0//EN" "http://mybatis.org/dtd/mybatis-3-mapper.dtd">
+<mapper namespace="com.liang.dao.PrjProjectXgjlDao">
+    <resultMap type="com.liang.entity.PrjProjectXgjl" id="PrjProjectXgjlMap">
+        <result property="id" column="ID" jdbcType="INTEGER"/>
+        <result property="xmid" column="XMID" jdbcType="INTEGER"/>
+        <result property="mc" column="MC" jdbcType="VARCHAR"/>
+        <result property="xg" column="XG" jdbcType="VARCHAR"/>
+        <result property="xh" column="XH" jdbcType="INTEGER"/>
+        <result property="xgrq" column="XGRQ" jdbcType="DATE"/>
+        <result property="ysje" column="YSJE" jdbcType="DECIMAL"/>
+    </resultMap>
+    <insert id="insertXGJL" keyProperty="id" useGeneratedKeys="true">
+        INSERT INTO prj_ProjectRecord (nys, fymc, xg, xgrq, xh)
+        VALUES (#{xgjl.nys},#{xgjl.fymc}, #{xgjl.xg}, #{xgjl.xgrq}, #{xgjl.xh});
+    </insert>
+    <insert id="batchinsertXGJL" keyProperty="id" useGeneratedKeys="true">
+        INSERT INTO prj_ProjectRecord (xmid, mc, xg, xgrq, xh)
+        VALUES
+        <foreach collection="xgjlList" item="xgjl" separator=",">
+            (#{xgjl.xmid},#{xgjl.mc}, #{xgjl.xg}, #{xgjl.xgrq}, #{xgjl.xh})
+        </foreach>
+    </insert>
+    <select id="getXGJL" resultType="com.liang.entity.PrjProjectXgjl">
+        SELECT XH,xgrq
+        FROM prj_ProjectRecord
+        WHERE XMID = #{xmid}
+        GROUP BY XH,xgrq
+        ORDER BY XH ASC
+    </select>
+    <select id="getXG" resultType="com.liang.entity.PrjProjectXgjl">
+        SELECT b.MC,a.xg
+        FROM prj_ProjectRecord a
+                 RIGHT JOIN prj_Budget b on a.xmid=b.xm and a.mc = b.MC
+        WHERE a.XMID = #{xmid}
+          AND  a.XH = #{xh}
+    </select>
+
+
+</mapper>

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

@@ -0,0 +1,620 @@
+<!DOCTYPE html>
+<html xmlns="http://www.w3.org/1999/xhtml" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>编辑</title>
+    <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
+    <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
+    <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
+    <style>
+        body {
+            background-color: #ffffff;
+        }
+    </style>
+</head>
+<body>
+<form class="layui-form" action="" lay-filter="formDemo">
+    <div class="layui-tab layui-tab-card">
+        <ul class="layui-tab-title">
+            <li class="layui-this">常规</li>
+            <li>预算</li>
+        </ul>
+        <div class="layui-tab-content">
+            <!--常规开始-->
+            <div class="layui-tab-item layui-show" style="min-height: 550px; margin-bottom: 5px">
+                <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: 855px">
+                                <input type="hidden" id="id" name="id" class="layui-input"
+                                       th:value="${annualbudget.id}">
+                                <input type="text" id="mc" name="mc" class="layui-input" th:value="${annualbudget.mc}">
+                            </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: 855px">
+                                <input type="hidden" id="rws" name="rws" class="layui-input"
+                                       th:value="${annualbudget.rws}">
+                                <input type="text" id="rwsmc" name="rwsmc" class="layui-input"
+                                       th:value="${annualbudget.rwsmc}" readonly>
+                            </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: 855px">
+                                <input type="hidden" name="qs" id="qs" class="layui-input" th:value="${qs}">
+                                <input type="hidden" name="wc" id="wc" class="layui-input" th:value="${wc}">
+                                <input type="text" id="xmzxq" name="xmzxq" class="layui-input"
+                                       th:value="${annualbudget.xmzxq}" readonly>
+                            </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: 855px">
+                                <input type="text" id="nf" name="nf" class="layui-input" th:value="${annualbudget.nf}">
+                            </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: 855px">
+                                <textarea id="sm" name="sm" class="layui-textarea" style="width: 100%;height: 150px"
+                                          th:text="${annualbudget.sm}"></textarea>
+                            </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: 380px">
+                                <input type="text" name="sqrxm" class="layui-input" th:value="${annualbudget.sqrxm}"
+                                       readonly>
+                            </div>
+                            <label class="layui-form-label" style="width: 65px">申请时间</label>
+                            <div class="layui-input-inline" style="width: 370px">
+                                <input type="text" id="sqsj" name="sqsj" class="layui-input"
+                                       th:value="${annualbudget.sqsj}">
+                                <tip>日期格式：yyyy-MM-dd</tip>
+                            </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: 855px">-->
+                        <!--                                <input type="text" id="spzt" name="spzt" class="layui-input" value="未提交" readonly>-->
+                        <!--                            </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: 855px">
+                                <input type="text" id="xmmc" name="xmmc" class="layui-input"
+                                       th:value="${annualbudget.xmmc}" readonly>
+                            </div>
+                        </div>
+                        <div class="layui-form-item layui-inline" style="width: 100%">
+                            <label class="layui-form-label" style="width: 70px">ERP编号</label>
+                            <div class="layui-input-inline" style="width: 380px">
+                                <input type="text" id="erpbh" name="erpbh" class="layui-input"
+                                       th:value="${annualbudget.erpbh}" readonly>
+                            </div>
+                            <label class="layui-form-label" style="width: 65px">项目类型</label>
+                            <div class="layui-input-inline" style="width: 370px">
+                                <input type="text" id="xmlxmc" name="xmlxmc" class="layui-input"
+                                       th:value="${annualbudget.xmlxmc}" readonly>
+                            </div>
+                        </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: 370px">
+                                <input type="text" id="xmfzrxm" name="xmfzrxm" class="layui-input"
+                                       th:value="${annualbudget.xmfzrxm}" readonly>
+                            </div>
+                            <label class="layui-form-label" style="width: 65px">所属部门</label>
+                            <div class="layui-input-inline" style="width: 370px">
+                                <input type="text" id="ssbmmc" name="ssbmmc" class="layui-input"
+                                       th:value="${annualbudget.ssbmmc}" readonly>
+                            </div>
+                        </div>
+
+                        <!-- 右侧悬浮按钮 -->
+                        <div class="right-bottom-btn" style="margin-bottom: 5px">
+                            <button class="layui-btn" lay-filter="viewRwsBtn">
+                                <i class="layui-icon layui-icon-file"></i>查看任务书
+                            </button>
+                            <button class="layui-btn" lay-filter="cancleBtn">
+                                <i class="layui-icon layui-icon-close"></i>取消
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <!--常规结束-->
+            <!--预算开始-->
+            <div class="layui-tab-item" style="min-height: 550px; padding-left: 30px; padding-right: 30px">
+                <form class="layui-form" action="" lay-filter="formDemo">
+                    <div class="layui-form layuimini-form">
+                        <div class="layui-form-item" style="margin-bottom: -10px">
+                            <div class="layui-inline">
+                                <label class="layui-form-label"
+                                       style="width: fit-content; margin-bottom: -10px">单位：万元</label>
+                                <label class="layui-form-label" style="width: 170px"></label>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 70px; margin-left: -10px">项目总预算</label>
+                                <div class="layui-input-inline" style="width: 100px">
+                                    <input type="text" id="rwsys" name="rwsys" class="layui-input" th:value="${rwsys}"
+                                           readonly>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 60px; margin-left: -15px">年度经费</label>
+                                <div class="layui-input-inline" style="width: 100px">
+                                    <input type="text" id="ndczje" name="ndczje" class="layui-input"
+                                           th:value="${ndczje}" readonly>
+                                </div>
+                            </div>
+                            <div class="layui-inline">
+                                <label class="layui-form-label" style="width: 70px; margin-left: -15px">年度备用金</label>
+                                <div class="layui-input-inline" style="width: 100px; margin-right: -15px">
+                                    <input type="number" id="ndbyj" name="ndbyj" class="layui-input" autocomplete="off">
+                                </div>
+                            </div>
+                        </div>
+
+                        <table class="layui-hide layui-table-view" id="currentTableId"
+                               lay-filter="currentTableFilter"></table>
+
+                        <!-- 右侧悬浮按钮 -->
+                        <div class="right-bottom-btn" style="margin-bottom: 5px">
+                            <button class="layui-btn" id="btn" lay-filter="viewRwsBtn">
+                                <i class="layui-icon layui-icon-file"></i>查看任务书
+                            </button>
+                            <button type="button" class="layui-btn" lay-filter="saveBtnYs">
+                                <i class="layui-icon layui-icon-ok"></i>申请修改
+                            </button>
+                            <button class="layui-btn" lay-filter="cancleBtn">
+                                <i class="layui-icon layui-icon-close"></i>取消
+                            </button>
+                        </div>
+                    </div>
+                </form>
+            </div>
+            <!--预算结束-->
+        </div>
+    </div>
+</form>
+
+<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>
+<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>
+
+<script type="text/javascript" th:inline="javascript">
+    //删除键盘的所有默认行为
+    // document.onkeypress = function(e) {
+    //     e.preventDefault();
+    // }
+    //全局禁用enter
+    document.onkeydown = function (e) {
+        var ev = (typeof event != 'undefined') ? window.event : e
+        if (ev.keyCode == 13) {
+            return false
+        }
+    }
+    AjaxUtil.ctx = /*[[@{/}]]*/'';
+    layui.use(['form', 'treeTable', 'layCascader', 'tableSelect', 'laydate'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            treeTable = layui.treeTable,
+            laydate = layui.laydate;
+
+        var rwsId = $("#rws").val(),
+            ysId = $("#id").val();
+        var zjfy = 0;
+
+        //申请时间
+        laydate.render({
+            elem: '#sqsj',
+            value: new Date()
+        });
+
+        // 监听查看任务书按钮
+        $("button[lay-filter='viewRwsBtn']").click(function (e) {
+            parent.layer.open({
+                title: '查看项目任务书',
+                type: 2,
+                shade: 0.3,
+                // maxmin: true,
+                shadeClose: true,
+                area: ['1100px', '750px'],
+                content: AjaxUtil.ctx + 'prjProject/forView/' + rwsId,
+                end: function (index) {
+                    layer.close(index);
+                }
+            });
+            // e.target.blur();//主动去除焦点
+            return false;
+        });
+
+        //预算
+        var dataBudget1 = new Array();
+        $.ajax({
+            url: AjaxUtil.ctx + 'prjAnnualbudgetdetail/list/' + ysId,
+            type: "post",
+            async: false,
+            dataType: "json",
+            success: function (result) {
+                dataBudget1 = result;
+                for (let i = 0; i < dataBudget1.length; i++) {
+                    if (dataBudget1[i].fymc.indexOf('总计') > -1) {
+                        zjfy = i;
+                    }
+                }
+                $("#ndbyj").val(dataBudget1[zjfy].byj);
+                $("#rwsys").val(dataBudget1[zjfy].xmzys);
+            }
+        });
+        //查看年度预算（项目总预算）
+        var dataBudget = new Array();
+        $.ajax({
+            url: AjaxUtil.ctx + 'prjAnnualbudget/list/' + ysId,
+            type: "post",
+            async: false,
+            dataType: "json",
+            success: function (result) {
+                dataBudget = result;
+                console.log(dataBudget)
+            }
+        });
+        var insTb;
+
+        function loadTreetable() {
+            insTb = treeTable.render({
+                elem: '#currentTableId',
+                data: dataBudget,
+                skin: 'grid',
+                style: 'overflow:auto',
+                tree: {
+                    treeColIndex: 1,
+                    treeSpid: "",   //最上级的父级id
+                    iconIndex: 1,   // 折叠图标显示在第几列
+                    isPidData: true,// 是否是id、pid形式数据
+                    idName: 'bm',  // id字段名称
+                    pidName: 'fj', // pid字段名称
+                    arrowType: 'arrow2',
+                    getIcon: 'ew-tree-icon-style2',
+                    openName: 'bm'
+                },
+                treeDefaultClose: false,
+                page: false,
+                // toolbar: '#toolbarDemo',
+                cols: [
+                    [
+                        {type: 'numbers', width: '3%'},
+                        {field: 'fymc', width: '30%', title: '费用名称'},
+                        {field: 'xmzys', width: '12%', title: '项目总预算', edit: 'number'},
+                        {field: 'xtjsyzx', width: '15%', title: '系统计算已执行', edit: 'number'},
+                        {field: 'sjyzx', width: '12%', title: '实际已执行', edit: 'number'},
+                        {field: 'ysje', width: '10%', title: '预算金额'},
+                        {field: 'xmz', width: '9%', title: '项目组', edit: 'number'},
+                        {field: "byj", width: '9%', title: '备用金'}
+                        // {field: 'ysqje', width: '11%', title: '已申请金额'},
+                        // {field: 'ybzje', width: '11%', title: '已报账金额'},
+                        // {field: 'byjysq', width: '11%', title: '备用金已申请'},
+                        // {field: 'byjybz', width: '11%', title: '备用金已报账'}
+                    ]
+                ],
+                edit: function (obj) {
+                    if (obj.data.edit === false)
+                        return false;
+                    else
+                        return true;
+                }
+            });
+        }
+
+        loadTreetable();
+
+        //年度备用金
+        $("#ndbyj").on("input", function (e) {
+            //获取input输入的值
+            var ndbyj = parseFloat(e.delegateTarget.value);
+            if (isNaN(ndbyj))
+                ndbyj = 0;
+            dataBudget[zjfy].byj = ndbyj;
+
+            var xmz = 0, byj = 0;
+            if (dataBudget[zjfy].xmz != null) {
+                xmz = parseFloat(dataBudget[zjfy].xmz);
+                if (isNaN(xmz))
+                    xmz = 0;
+            }
+            if (dataBudget[zjfy].byj != null) {
+                byj = parseFloat(dataBudget[zjfy].byj);
+                if (isNaN(byj))
+                    byj = 0;
+            }
+            var ysje = xmz + byj;
+            if (ysje == 0)
+                dataBudget[zjfy].ysje = "";
+            else
+                dataBudget[zjfy].ysje = ysje;
+
+            loadTreetable();
+        });
+
+        // 监听单元格编辑
+        treeTable.on('edit(currentTableId)', function (obj) {
+            var value = obj.value,
+                item = obj.data,
+                colName = obj.field;
+            if (item.children == undefined) {
+                //当前行预算
+                setCurBudget(item.bm, colName, value);
+                //父级预算
+                setFjBudget(item.fj);
+            }
+
+            var xmz = 0, byj = 0;
+            if (dataBudget[zjfy].xmz != null) {
+                xmz = parseFloat(dataBudget[zjfy].xmz);
+                if (isNaN(xmz))
+                    xmz = 0;
+            }
+            if (dataBudget[zjfy].byj != null) {
+                byj = parseFloat(dataBudget[zjfy].byj);
+                if (isNaN(byj))
+                    byj = 0;
+            }
+            var ysje = xmz + byj;
+            if (ysje == 0)
+                dataBudget[zjfy].ysje = "";
+            else
+                dataBudget[zjfy].ysje = ysje;
+
+            loadTreetable();
+        });
+
+        //当前行预算
+        function setCurBudget(bm, colName, value) {
+            for (var i = 0; i < dataBudget.length; i++) {
+                if (bm == dataBudget[i].bm) {
+                    value = parseFloat(value);
+                    if (isNaN(value))
+                        value = null;
+                    // var rwsys = $("#rwsys").val();
+                    // if (value !== null && value > rwsys * 0.2) {
+                    //     alert("不能超过项目总预算预算的20%！");
+                    //     return; // 返回，不进行后续处理
+                    // }
+
+                    //当前数据不能大于总预算列的值
+                    if (dataBudget[i].xmzys != null) {
+                        if (value !== null && value > parseFloat(dataBudget[i].xmzys * 1.2).toFixed(6)) {
+                            alert("输入金额不能超过项目总预算列的120%！");
+                            return; // 返回，不进行后续处理
+                        }
+                    }
+                    //当前单元格
+                    // if(colName == "xmzys") {
+                    //     dataBudget[i].xmzys = value;
+                    // } else
+                    if (colName == "xmz") {
+                        dataBudget[i].xmz = value;
+                    } else if (colName == "byj") {
+                        dataBudget[i].byj = value;
+                    } else if (colName == "xtjsyzx") {
+                        dataBudget[i].xtjsyzx = value;
+                    } else if (colName == "sjyzx") {
+                        dataBudget[i].sjyzx = value;
+                    }
+
+                    //正在编辑的预算
+                    var xmz = 0, byj = 0;
+                    if (dataBudget[i].xmz != null) {
+                        xmz = parseFloat(dataBudget[i].xmz);
+                        if (isNaN(xmz))
+                            xmz = 0;
+                    }
+                    if (dataBudget[i].byj != null) {
+                        byj = parseFloat(dataBudget[i].byj);
+                        if (isNaN(byj))
+                            byj = 0;
+                    }
+                    var ysje = xmz + byj;
+                    if (ysje == 0)
+                        dataBudget[i].ysje = "";
+                    else
+                        dataBudget[i].ysje = ysje;
+
+                    break;
+                }
+            }
+        }
+
+        //父级预算
+        function setFjBudget(fj) {
+            if (fj != null && fj != '') {
+                var xmzys = 0, xmz = 0, byj = 0, xtjsyzx = 0, sjyzx = 0;
+                //子节点的值相加
+                for (var j = 0; j < dataBudget.length; j++) {
+                    if (fj == dataBudget[j].fj) {
+                        // var t = parseFloat(dataBudget[j].xmzys);
+                        // if (!isNaN(t))
+                        //     xmzys += t;
+                        var t1 = parseFloat(dataBudget[j].xmz);
+                        if (!isNaN(t1))
+                            xmz += t1;
+                        var t2 = parseFloat(dataBudget[j].byj);
+                        if (!isNaN(t2))
+                            byj += t2;
+                        var t3 = parseFloat(dataBudget[j].xtjsyzx);
+                        if (!isNaN(t3))
+                            xtjsyzx += t3;
+                        var t4 = parseFloat(dataBudget[j].sjyzx);
+                        if (!isNaN(t4))
+                            sjyzx += t4;
+                    }
+                }
+
+                //更新父节点的值
+                for (var j = 0; j < dataBudget.length; j++) {
+                    if (fj == dataBudget[j].bm) {
+                        // if (xmzys == 0)
+                        //     dataBudget[j].xmzys = '';
+                        // else
+                        //     dataBudget[j].xmzys = xmzys.toFixed(2);
+                        if (xmz == 0)
+                            dataBudget[j].xmz = '';
+                        else
+                            dataBudget[j].xmz = xmz.toFixed(2);
+                        if (xtjsyzx == 0)
+                            dataBudget[j].xtjsyzx = '';
+                        else
+                            dataBudget[j].xtjsyzx = xtjsyzx.toFixed(2);
+                        if (sjyzx == 0)
+                            dataBudget[j].sjyzx = '';
+                        else
+                            dataBudget[j].sjyzx = sjyzx.toFixed(2);
+
+                        var ysje = xmz + byj;
+                        if (ysje == 0)
+                            dataBudget[j].ysje = "";
+                        else
+                            dataBudget[j].ysje = ysje.toFixed(2);
+
+                        setFjBudget(dataBudget[j].fj);
+                        break;
+                    }
+                }
+            }
+        }
+
+        //组织要保存的数据
+        function getBudget(budgets, data) {
+            var budget = {
+                "id": data.id,
+                "xmzys": data.xmzys,
+                "ysje": data.ysje,
+                "xmz": data.xmz,
+                "byj": data.byj,
+                "xtjsyzx": data.xtjsyzx,
+                "sjyzx": data.sjyzx
+            };
+            budgets.push(budget);
+            if (data.children != undefined) {
+                getChildNode(budgets, data);
+            }
+        }
+
+        function getChildNode(budgets, data) {
+            for (let item of data.children) {
+                getBudget(budgets, item);
+            }
+        }
+
+        // 监听保存按钮（项目预算）
+        $("button[lay-filter='saveBtnYs']").click(function () {
+            var rwsys = $("#rwsys").val();
+            var ndczje = $("#ndczje").val();
+            for (let i = 0; i < dataBudget.length; i++) {
+                if (dataBudget[i].fj==''){
+                    var ysje = dataBudget[i].ysje;
+                }
+            }
+            if (ndczje === "" && ndczje === null){
+                Message.error("年度经费为空，不能申请年段预算");
+                return false;
+            }
+            if (ysje === null){
+                Message.error("预算金额不能为空",1500);
+                return false;
+
+            }
+            if ( ysje > ndczje){
+                Message.error("预算金额不能大于年度经费！",1500);
+                return false;
+            }
+            if ( ysje < ndczje){
+                Message.error("预算金额不能小于年度经费！",1500);
+                return false;
+            }
+            if (rwsys == "") {
+                Message.error("任务书预算不能为空，请完善任务书项目预算！", 1500);
+                return false;
+            }
+
+            var item = dataBudget.find((item) => item.fymc == "总计");
+            var ndzys = item.xmzys;
+            if (ndzys == null) {
+                return false;
+            }
+            if (parseFloat(ndzys) > parseFloat(rwsys)) {
+                Message.error("年度总预算不能超过任务书预算！", 1500);
+                return false;
+            }
+            if (parseFloat(ndzys) > parseFloat(rwsys)) {
+                Message.error("年度总预算不能超过任务书预算！", 1500);
+                return false;
+            }
+
+            var data = insTb.options.data;
+            var budgets = new Array();
+            for (var i = 0; i < data.length; i++) {
+                getBudget(budgets, data[i]);
+            }
+
+            var index = layer.load(0, {shade: 0.1});
+            //添加修改记录
+            AjaxUtil.post({
+                url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/addUpdateApplyRecord/',
+                data:budgets,
+                success: function (res) {
+                    layer.close(index);
+                    if (res.code === 0) {
+                        AjaxUtil.post({
+                            url: AjaxUtil.ctx + "prjApproverecord/doAddApprove",
+                            data: data.field,
+                            success: function (res) {
+                                //更新审批状态
+                                var project = {
+                                    "id": xmApproval.xmid,
+                                    // "spzt": '部门主任审批'
+                                    "spzt": '科技项目管理专责审批'
+                                }
+                                console.log(data.field)
+                                layer.load(0, {shade: 0.1});
+                                AjaxUtil.post({
+                                    url: AjaxUtil.ctx + "prjAnnualbudget/updateSpzt",
+                                    contentType: "application/json",
+                                    data: JSON.stringify(project),
+                                    success: function (res) {
+                                        parent.setUpdateFlag();
+
+                                        var iframeIndex = parent.layer.getFrameIndex(window.name);
+                                        parent.layer.close(iframeIndex);
+                                    },
+                                    error: function (error) {
+                                    }
+                                });
+                            },
+                            error: function (error) {
+                            }
+                        });
+                    } else {
+                        Message.error("修改记录添加失败", 2000);
+                    }
+                }
+            });
+
+        });
+
+        // 监听取消按钮
+        $("button[lay-filter='cancleBtn']").click(function () {
+            var iframeIndex = parent.layer.getFrameIndex(window.name);
+            parent.layer.close(iframeIndex);
+        });
+    });
+</script>
+</body>
+</html>

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

@@ -3,7 +3,7 @@
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>审批列表</title>
+    <title>修改记录</title>
     <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
     <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
     <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">

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

@@ -1950,29 +1950,68 @@
                 getBudget(budgets, data[i]);
             }
             var index = layer.load(0, {shade: 0.1});
+            // //添加修改记录
+            // AjaxUtil.post({
+            //     url: AjaxUtil.ctx + 'prjProject/addPrjProjectRecord/' + xmId,
+            //     data: data.field,
+            //     success: function (res) {
+            //         if (res.code === 0) {
+            //         } else {
+            //             Message.error("修改记录添加失败", 2000);
+            //         }
+            //     }
+            // });
+            // AjaxUtil.post({
+            //     url: AjaxUtil.ctx + "prjProject/doUpdateXmys",
+            //     contentType: "application/json",
+            //     data: JSON.stringify(budgets),
+            //     success: function (res) {
+            //         if (res.code === 0) {
+            //             Message.success(1000, res.message, function () {
+            //                 loadTreetable();
+            //                 parent.setUpdateFlag();
+            //             });
+            //         } else {
+            //             Message.error(res.message, 1000);
+            //         }
+            //         layer.close(index);
+            //     },
+            //     error: function (error) {
+            //         layer.close(index);
+            //     }
+            // });
+            // 添加修改记录请求
             AjaxUtil.post({
-                url: AjaxUtil.ctx + "prjProject/doUpdateXmys",
-                contentType: "application/json",
-                data: JSON.stringify(budgets),
-                success: function (res) {
+                url: AjaxUtil.ctx + 'prjProject/addPrjProjectRecord/' + xmId,
+                data: data.field,
+                success: function (res){
+                    console.log(res)
                     if (res.code === 0) {
-                        Message.success(1000, res.message, function () {
-                            loadTreetable();
-                            parent.setUpdateFlag();
+                        AjaxUtil.post({
+                            url: AjaxUtil.ctx + "prjProject/doUpdateXmys",
+                            contentType: "application/json",
+                            data: JSON.stringify(budgets),
+                            success: function (res) {
+                                if (res.code === 0) {
+                                    Message.success(1000, res.message, function () {
+                                        loadTreetable();
+                                        parent.setUpdateFlag();
+                                    });
+                                } else {
+                                    Message.error(res.message, 1000);
+                                }
+                                layer.close(index);
+                            },
+                            error: function (error) {
+                                layer.close(index);
+                            }
                         });
                     } else {
-                        Message.error(res.message, 1000);
+                        Message.error("修改记录添加失败", 2000);
                     }
-                    layer.close(index);
-                },
-                error: function (error) {
-                    layer.close(index);
                 }
             });
-            return false;
         });
-
-
         //出资方案
         var currTable6 = table.render({
             elem: '#currentTableId6',

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

@@ -0,0 +1,112 @@
+<!DOCTYPE html>
+<html lang="en" xmlns:th="http://www.thymeleaf.org">
+<head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
+    <title>修改记录</title>
+    <link rel="stylesheet" th:href="@{/lib/layui/css/layui.css}" media="all">
+    <link rel="stylesheet" th:href="@{/css/public.css}" media="all">
+    <link rel="stylesheet" th:href="@{/lib/font-awesome-4.7.0/css/font-awesome.min.css}" media="all">
+</head>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <form class="layui-form" action="" lay-filter="formDemo">
+            <div class="layui-form-item" style="margin: 20px 0px 0px 5px">
+                <input type="text" style="width: 70px; border: 0px" value="任务书：" readonly>
+                <input type="text" name="xm" id="xm" style="width: 1000px; border: 0px" readonly>
+            </div>
+            <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+
+            <!-- 右侧悬浮按钮 -->
+            <div class="layui-form layuimini-form" style="padding-bottom: 100px">
+                <div class="right-bottom-btn">
+                    <button class="layui-btn" lay-filter="cancleBtn">
+                        <i class="layui-icon layui-icon-close"></i>关闭
+                    </button>
+                </div>
+            </div>
+        </form>
+    </div>
+</div>
+<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>
+<script th:src="@{/js/lay-config.js}" charset="utf-8"></script>
+<script th:src="@{/lib/xm-select-v1.2.2/xm-select.js}" charset="utf-8"></script>
+<script th:inline="javascript" type="text/javascript">
+    AjaxUtil.ctx = /*[[@{/}]]*/'';
+    layui.use(['form', 'treeTable', 'tableSelect', 'laydate','table'], function () {
+
+        var form = layui.form,
+            table = layui.table;
+        var xmApprove = parent.getXmApproval();
+        var xgjl = new Array();
+        var dataCompany = new Array();
+        $("#xm").val(xmApprove.xm);
+        form.render();
+
+
+        $.ajax({
+            url: AjaxUtil.ctx + 'prjProjectXgjl/getXGJL/' + xmApprove.xmid,
+            type: "post",
+            async: false,
+            dataType: "json",
+            success: function (result) {
+                xgjl = result;
+            }
+        });
+        $.ajax({
+            url: AjaxUtil.ctx + 'prjCompletecompany/list/' + xmApprove.xmid,
+            type: "post",
+            async: false,
+            dataType: "json",
+            success: function (result) {
+                dataCompany = result.data.rows;
+            }
+        });
+        var dynamicColumns = [];
+        for (var i = 0; i < dataCompany.length; i++) {
+            dynamicColumns.push({field: "dw" + (i + 1), width: '10%', title: dataCompany[i].dwmc + '(万元)'})
+            if (i >= 9)
+                break;
+        }
+        for (var i = 0; i < xgjl.length; i++) {
+            field = 'xg'+xgjl[i].xh;
+            title = xgjl[i].xgrq+'修改';
+            dynamicColumns.push({field: field, width: '13%', title: title}
+            );
+        }
+        var newcols =[
+            {type: 'numbers', align: 'center'},
+            {field: 'mc', width: '15%', title: '费用名称'},
+            {field: 'ysje', width: '10%', title: '预算金额'},
+        ].concat(dynamicColumns);
+        var currTable = table.render({
+            elem: '#currentTableId',
+            url: AjaxUtil.ctx + 'prjProject/redordData/' + xmApprove.xmid,
+            method: 'post',
+            cols:[newcols],
+            autoSort: false,
+            limit: 30,
+            maxmin:true,
+            skin: 'grid',
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.rows, //解析数据列表
+                };
+            }
+        });
+
+        // 监听取消按钮
+        $("button[lay-filter='cancleBtn']").click(function () {
+            var iframeIndex = parent.layer.getFrameIndex(window.name);
+            parent.layer.close(iframeIndex);
+        });
+    });
+</script>
+</body>
+</html>