年度预算修改审批流程 （费用申请页面年度预算 费用管理页面年度预算 待审批页面）

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

@@ -1,8 +1,10 @@
 package com.liang.controller;
+//import java.util.Date;
 import com.google.common.collect.Lists;
 
 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.common.enums.PostInfoEnum;
@@ -41,12 +43,10 @@ public class PrjAnnualBudgetRecordController extends BaseController {
 
     @Resource
     private PrjAnnualbudgetService prjAnnualbudgetService;
-
-    @Resource
-    private SysPostInfoService sysPostInfoService;
     @Resource
     private PrjApproverecordService prjApproverecordService;
 
+
     /**
      * 在年度预算修改记录表中添加修改前的数据（年度预算明细）
      *
@@ -112,18 +112,94 @@ public class PrjAnnualBudgetRecordController extends BaseController {
     }
     @ResponseBody
     @RequestMapping(value = "/addUpdateApplyRecord", method = RequestMethod.POST)
-    @Transactional
     public BaseResult addUpdateApplyRecord(
-                             @RequestParam("budgets") List<PrjAnnualBudgetRecord> record) {
-//插入到修改申请表中
+            @RequestBody String data) {
+        List<PrjAnnualBudgetRecord> record =new ArrayList<>();
+        List<PrjAnnualbudgetdetail> budgetDetails = JsonTool.parseArray(data, PrjAnnualbudgetdetail.class);
+        for (int i = 0; i <budgetDetails.size() ; i++) {
+            PrjAnnualBudgetRecord prjAnnualBudgetRecord =new PrjAnnualBudgetRecord();
+            prjAnnualBudgetRecord.setFymc(budgetDetails.get(i).getFymc());
+            prjAnnualBudgetRecord.setYsje(budgetDetails.get(i).getYsje());
+            prjAnnualBudgetRecord.setNys(budgetDetails.get(i).getNys());
+            prjAnnualBudgetRecord.setBm(budgetDetails.get(i).getBm());
+            prjAnnualBudgetRecord.setFj(budgetDetails.get(i).getFj());
+            prjAnnualBudgetRecord.setNf(budgetDetails.get(i).getNf());
+            prjAnnualBudgetRecord.setXmz(budgetDetails.get(i).getXmz());
+            prjAnnualBudgetRecord.setByj(budgetDetails.get(i).getByj());
+            prjAnnualBudgetRecord.setXmzys(budgetDetails.get(i).getXmzys());
+            prjAnnualBudgetRecord.setBjsj(new Date(System.currentTimeMillis()));
+            prjAnnualBudgetRecord.setXgr(getSysUserId());
+            record.add(prjAnnualBudgetRecord);
+        }
+//先删除表中的预留数据（只能保存一份）
+        prjAnnualBudgetRecordService.deleteHistoryRecord(budgetDetails.get(0).getNys());
+//插入到修改申请表中(临时保存表)
         int i = prjAnnualBudgetRecordService.addHistoryRecord(record);
-
         if (i>0){
             return BaseResult.success();
         }else {
             return BaseResult.failure("");
         }
     }
+    /**
+     * 审批列表
+     *
+     * @return
+     */
+    @RequestMapping(value = "/forApproveList", method = RequestMethod.GET)
+    public String forApproveList() {
+        return "annualbudget/xglist_approve";
+    }
+    /**
+     * 查看数据
+     *
+     * @return
+     */
+    @RequestMapping(value = "/forView/{id}", method = RequestMethod.GET)
+    public String forView(Model model, @PathVariable Integer id) {
+        List<PrjAnnualbudgetdetail> budgetList = prjAnnualbudgetdetailService.getBudgetList(id);
+        List<PrjAnnualBudgetRecord> record = prjAnnualBudgetRecordService.queryRecordByNdysid(id);
+        model.addAttribute("prjAnnualbudget",budgetList);
+        model.addAttribute("prjAnnualbudgetRecord",record);
+        return "annualbudget/xgview_record";
+    }
+
+    /**
+     * 将中间表中的数据同步到年度预算列表中
+     * */
+    @ResponseBody
+    @RequestMapping(value = "/doUpdate/{xmid}", method = RequestMethod.POST)
+    public BaseResult bathUpdate( @PathVariable Integer xmid) {
+//  1.获取年度预算中间表情数据
+        List<PrjAnnualBudgetRecord> record = prjAnnualBudgetRecordService.queryRecordByNdysid(xmid);
+//  2.修改年度预算明细表的内容
+        int  i =prjAnnualbudgetdetailService.updateXg(record);
+        if (i>0){
+// 3.保存成功后删除中间表中的数据
+            prjAnnualBudgetRecordService.deleteHistoryRecord(xmid);
+            return BaseResult.success();
+        }else {
+            return BaseResult.failure("记录保存失败");
+        }
+
+
+    }
 
+    @RequestMapping(value = "/forApproveUpdate/{xmid}", method = RequestMethod.GET)
+    public String forApproveUpdate(Model model, @PathVariable Integer xmid, @RequestParam String spzt) {
+        //系统当前用户
+        SysUserInfo userInfo = getSysUserInfo();
+        model.addAttribute("userInfo", userInfo);
+
+        Map<String, String> paraMap1 = new HashMap<>();
+        paraMap1.put("xmid", xmid.toString());
+        paraMap1.put("zt", spzt);
+        paraMap1.put("wc", "0");
+        List<PrjApproverecord> approveList = prjApproverecordService.getApproveByXmId(paraMap1);
+        if (approveList.size() > 0) {
+            model.addAttribute("approveInfo", approveList.get(0));
+        }
+        return "annualbudget/finish_xg_approve";
+    }
 
 }

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

@@ -73,7 +73,8 @@ public class PrjAnnualbudgetController extends BaseController {
 
     @Resource
     private SysUserInfoService sysUserInfoService;
-
+    @Resource
+    private  PrjAnnualBudgetRecordService prjAnnualBudgetRecordService;
     @Resource
     private PrjCompletecompanyService prjCompletecompanyService;
 
@@ -203,6 +204,13 @@ public class PrjAnnualbudgetController extends BaseController {
 
         return "annualbudget/mylist";
     }
+        @RequestMapping(value = "/ViewXGSQ", method = RequestMethod.GET)
+        public String ViewXGSQ(Model model) {
+//            获取待审批修改申请列表
+//            prjAnnualBudgetRecordService.getSpList();
+
+            return "annualbudget/view_xgsq";
+        }
 
     @ResponseBody
     @RequestMapping(value = "/mylist", method = RequestMethod.POST)

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

@@ -12,6 +12,7 @@ import com.liang.entity.*;
 import com.liang.service.PrjApproverecordService;
 import com.liang.service.StaBudgetapprovalService;
 import com.liang.service.SysDictInfoService;
+import com.liang.service.SysUserPostService;
 import io.swagger.annotations.ApiOperation;
 import org.springframework.data.domain.Page;
 import org.springframework.data.domain.PageRequest;
@@ -24,6 +25,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.text.DateFormat;
+import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.*;
 
@@ -46,6 +48,8 @@ public class PrjApproverecordController extends BaseController {
 
     @Resource
     private StaBudgetapprovalService staBudgetapprovalService;
+    @Resource
+    private SysUserPostService sysUserPostService;
 
     /**
      * 分页查询
@@ -132,6 +136,39 @@ public class PrjApproverecordController extends BaseController {
 
         return BaseResult.success(result);
     }
+    /**
+     * 年度预算修改申请列表
+     * */
+    @ResponseBody
+    @RequestMapping(value = "/xgsqList", method = RequestMethod.POST)
+    public BaseResult xgsqList(@RequestParam("page") Integer pageNum,
+                           @RequestParam("limit") Integer pageSize
+                            ) {
+        PageHelper.startPage(pageNum, pageSize);
+
+        Map<String, String> paraMap = new HashMap<>();
+        SysUserInfo userInfo = getSysUserInfo();
+        if (!userInfo.getAccount().equals("admin")) {
+            paraMap.put("userId", userInfo.getUserId().toString());
+        }
+            paraMap.put("tablename","prj_AnnualBudgetRecord");
+// 获取待审批的年度预算修改申请
+        List<PrjApproverecord> xglist = prjApproverecordService.getApproveList(paraMap);
+
+        for (int i = 0; i < xglist.size(); i++) {
+            xglist.get(i).setSpzt(xglist.get(i).getZt());
+        }
+
+        PageInfo<PrjApproverecord> pageinfo = new PageInfo<>(xglist);
+        //取出查询结果
+        List<PrjApproverecord> 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);
+    }
 
     /**
      * 保存数据（提交审批：可研报告，任务书，年度预算，报账）
@@ -184,6 +221,62 @@ public class PrjApproverecordController extends BaseController {
             return BaseResult.failure("保存失败!");
         }
     }
+    /**
+     * 保存年度预算修改申请
+    * */
+    @ResponseBody
+    @RequestMapping(value = "/doUpdatApprove", method = RequestMethod.POST)
+    public BaseResult doUpdatApprove(PrjApproverecord approverecord) {
+//        获取审批列表信息
+        SysUserInfo sysUserInfo = getSysUserInfo();
+        List<PrjApproverecord> recordList = new ArrayList<>();//提交人
+
+        LocalDateTime currentTime = LocalDateTime.now();
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm:ss");//提交时间
+
+        Map<String, String> paraMap2 = new HashMap<>();//提交人
+        paraMap2.put("postName", "科技项目管理专责");
+        paraMap2.put("postId","39");
+        List<SysUserPost> userPostList = sysUserPostService.getPostUserList(paraMap2);
+        Integer shr = userPostList.get(0).getUserId();
+
+        PrjApproverecord record1 = new PrjApproverecord();
+        record1.setXm(approverecord.getXm());
+        record1.setXmid(approverecord.getXmid());
+        record1.setZt(approverecord.getZt());
+        record1.setTablename("prj_AnnualBudgetRecord");
+        record1.setSpcz("预算申请修改");
+        record1.setTjr(sysUserInfo.getUserId());
+        record1.setTjsj(currentTime.format(formatter));
+        record1.setShr(record1.getTjr());
+        record1.setShsj(record1.getTjsj());
+        record1.setSfsjsh(true);//是否需要上级审核
+        record1.setSjshr(shr);
+        record1.setSjshgw(39);//上级审核岗位
+        record1.setSffh(false);//是否返回
+        record1.setYcshr(false);//隐藏审核人
+        record1.setWc(true);//完成
+        recordList.add(record1);
+
+        PrjApproverecord record2 = new PrjApproverecord();
+        record2.setXm(approverecord.getXm());
+        record2.setXmid(approverecord.getXmid());
+        record2.setTablename("prj_AnnualBudgetRecord");
+        record2.setTjr(sysUserInfo.getUserId());
+        record2.setTjsj(currentTime.format(formatter));
+        record2.setZt(PostInfoEnum.KJXMGLZZ.postName() + "审批");//状态
+        record2.setWc(false);//完成
+        record2.setShr(shr);//审核人
+        record2.setShgw(39);//审核岗位
+        recordList.add(record2);
+
+        int num = prjApproverecordService.insertBatch(recordList);
+        if (num > 0) {
+            return BaseResult.success("保存成功!", approverecord);
+        } else {
+            return BaseResult.failure("保存失败!");
+        }
+    }
 
     /**
      * 保存数据（提交审批：费用申请）

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

@@ -33,4 +33,6 @@ public interface PrjAnnualBudgetRecordDao {
      * @return
      */
     List<PrjAnnualBudgetRecord> queryRecordByNdysid(int nys);
+
+    void deleteHistoryRecord(Integer nys);
 }

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

@@ -1,5 +1,6 @@
 package com.liang.dao;
 
+import com.liang.entity.PrjAnnualBudgetRecord;
 import com.liang.entity.PrjAnnualbudgetdetail;
 import com.liang.entity.PrjBudget;
 import com.liang.vo.PrjAnnualbudgetYzxqkVo;
@@ -140,5 +141,7 @@ public interface PrjAnnualbudgetdetailDao {
     Double getXMZYS(String id);
 
     void updateSPTGZT(@Param("nys") Integer id, @Param("fymc") String fymc, @Param("sptgzt") String xgjlxz);
+
+    int updateXG(@Param("record") PrjAnnualBudgetRecord budget);
 }
 

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

@@ -32,4 +32,5 @@ public interface PrjAnnualBudgetRecordService {
     List<PrjAnnualBudgetRecord> queryRecordByNdysid(int nys);
 
 
+    void deleteHistoryRecord(Integer nys);
 }

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

@@ -1,5 +1,6 @@
 package com.liang.service;
 
+import com.liang.entity.PrjAnnualBudgetRecord;
 import com.liang.entity.PrjAnnualbudgetdetail;
 import org.apache.ibatis.annotations.Param;
 import org.springframework.data.domain.Page;
@@ -95,4 +96,6 @@ public interface PrjAnnualbudgetdetailService {
     List<PrjAnnualbudgetdetail> getXGJL(int xmid);
 
     Double getXMZYS(String id);
+
+    int updateXg(List<PrjAnnualBudgetRecord> record);
 }

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

@@ -39,4 +39,9 @@ public class PrjAnnualBudgetRecordServiceImpl implements PrjAnnualBudgetRecordSe
     public List<PrjAnnualBudgetRecord> queryRecordByNdysid(int nys) {
         return prjAnnualBudgetRecordDao.queryRecordByNdysid(nys);
     }
+
+    @Override
+    public void deleteHistoryRecord(Integer nys) {
+        prjAnnualBudgetRecordDao.deleteHistoryRecord(nys);
+    }
 }

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

@@ -3,11 +3,8 @@ package com.liang.service.impl;
 import com.liang.dao.PrjAnnualbudgetXgjlDao;
 import com.liang.dao.PrjBudgetDao;
 import com.liang.dao.PrjCompletecompanyDao;
-import com.liang.entity.PrjAnnualbudgetXgjl;
-import com.liang.entity.PrjAnnualbudgetdetail;
+import com.liang.entity.*;
 import com.liang.dao.PrjAnnualbudgetdetailDao;
-import com.liang.entity.PrjBudget;
-import com.liang.entity.PrjCompletecompany;
 import com.liang.service.PrjAnnualbudgetXgjlService;
 import com.liang.service.PrjAnnualbudgetdetailService;
 import org.springframework.stereotype.Service;
@@ -307,4 +304,12 @@ public class PrjAnnualbudgetdetailServiceImpl implements PrjAnnualbudgetdetailSe
         return xmzys;
     }
 
+    @Override
+    public int updateXg(List<PrjAnnualBudgetRecord> record) {
+        int count = 0;
+        for (PrjAnnualBudgetRecord budget : record) {
+            count += this.prjAnnualbudgetdetailDao.updateXG(budget);
+        }
+        return count;    }
+
 }

src/main/resources/mapper/PrjAnnualBudgetRecordDao.xml

@@ -5,7 +5,7 @@
     <resultMap type="com.liang.entity.PrjAnnualBudgetRecord" id="PrjAnnualBudgetRecordMap">
         <result property="id" column="ID" jdbcType="INTEGER"/>
         <result property="fymc" column="FYMC" jdbcType="VARCHAR"/>
-        <result property="ysje" column="YSJE" jdbcType="NUMERIC"/>
+        <result property="ysje" column="YSJE" jdbcType="DECIMAL"/>
         <result property="nys" column="NYS" jdbcType="INTEGER"/>
         <result property="bm" column="BM" jdbcType="VARCHAR"/>
         <result property="fj" column="FJ" jdbcType="VARCHAR"/>
@@ -13,12 +13,15 @@
         <result property="px" column="PX" jdbcType="VARCHAR"/>
         <result property="hjbm" column="HJBM" jdbcType="VARCHAR"/>
         <result property="bz" column="BZ" jdbcType="VARCHAR"/>
-        <result property="xmz" column="XMZ" jdbcType="NUMERIC"/>
-        <result property="byj" column="BYJ" jdbcType="NUMERIC"/>
-        <result property="xmzys" column="XMZYS" jdbcType="NUMERIC"/>
+        <result property="xmz" column="XMZ" jdbcType="DECIMAL"/>
+        <result property="byj" column="BYJ" jdbcType="DECIMAL"/>
+        <result property="xmzys" column="XMZYS" jdbcType="DECIMAL"/>
         <result property="bjsj" column="BJSJ" jdbcType="TIMESTAMP"/>
         <result property="xgr" column="XGR" jdbcType="INTEGER"/>
     </resultMap>
+    <delete id="deleteHistoryRecord">
+        DELETE FROM prj_AnnualBudgetRecord WHERE nys = #{nys}
+    </delete>
 
     <!--查询单个-->
     <select id="queryDetailByNys" resultType="com.liang.entity.PrjAnnualBudgetRecord">

src/main/resources/mapper/PrjAnnualbudgetdetailDao.xml

@@ -504,6 +504,15 @@
         where NYS = #{nys}
           AND FYMC = #{fymc}
     </update>
+    <update id="updateXG">
+            update prj_AnnualBudgetDetail
+            set XMZYS   = #{record.xmzys},
+                YSJE    = #{record.ysje},
+                XMZ     = #{record.xmz},
+                BYJ     = #{record.byj}
+            where NYS = #{record.nys}
+            and FYMC = #{record.fymc}
+    </update>
 
     <!--通过主键删除-->
     <delete id="deleteById">

src/main/resources/mapper/PrjApproverecordDao.xml

@@ -451,6 +451,8 @@
         '报账'
         WHEN TABLENAME = 'sta_PayApproval' THEN
         '付款申请'
+        WHEN TABLENAME = 'prj_AnnualBudgetRecord' THEN
+        '年度预算修改申请'
         END AS XMLXMC,
         CASE
 
@@ -571,6 +573,9 @@
         <if test="tableName != null and tableName != ''">
             and a.TABLENAME = #{tableName}
         </if>
+        <if test=" tableName == 'prj_AnnualBudget'">
+            or a.TABLENAME = 'prj_AnnualBudgetRecord'
+        </if>
         <choose>
             <when test="sortName != null and sortName != '' and sortOrder != null and sortOrder != ''">
                 order by ${sortName} ${sortOrder} DESC

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

@@ -0,0 +1,321 @@
+<!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-form layuimini-form" style="padding-bottom: 100px">
+        <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: 865px">
+                <input type="hidden" id="id" name="id" class="layui-input" th:value="${approveInfo.id}">
+                <input type="hidden" id="xmid" name="xmid" class="layui-input" th:value="${approveInfo.xmid}">
+                <input type="hidden" id="tablename" name="tablename" class="layui-input"
+                       th:value="${approveInfo.tablename}">
+                <input type="text" id="xm" name="xm" class="layui-input" readonly th:value="${approveInfo.xm}">
+            </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: 600px">
+                <input type="hidden" id="spzt" name="spzt" class="layui-input" th:value="${approveInfo.zt}">
+                <input type="text" id="zt" name="zt" class="layui-input" readonly th:value="${approveInfo.zt}">
+            </div>
+            <div class="layui-input-inline" style="width: 255px">
+                <input type="text" value="年度预算修改申请" class="layui-input" 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: 865px">
+                <select id="spcz" name="spcz" class="layui-input" lay-filter="spcz">
+                    <option value="审批通过">审批通过</option>
+                    <option value="返回修改">返回修改</option>
+                </select>
+            </div>
+        </div>
+
+        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
+        <!--            <label class="layui-form-label" style="width: 65px">意见</label>-->
+        <!--            <div class="layui-input-inline" style="width: 870px" id="jyDiv1">-->
+        <!--                <textarea id="yj" name="yj" class="layui-textarea" th:text="同意" style="width: 870px;height: 100px"></textarea>-->
+        <!--            </div>-->
+        <!--            <div class="layui-input-inline" style="width: 870px; display: none" id="jyDiv2">-->
+        <!--                <textarea id="yj2" name="yj2" class="layui-textarea" style="width: 870px;height: 100px"></textarea>-->
+        <!--            </div>-->
+        <!--        </div>-->
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label" style="width: 65px">意见</label>
+            <div class="layui-input-inline" style="width: 870px" id="jyDiv1">
+                <textarea id="yj" name="yj" class="layui-textarea" style="width: 870px;height: 100px"></textarea>
+            </div>
+        </div>
+
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label" style="width: 95px">选择常用语</label>
+            <div class="layui-input-inline" style="width: 750px">
+                <select name="xmlx" id="xmlx" lay-filter="xmlx">
+                    <option value="">[无]</option>
+                    <!--<option th:each="cyyList:${cyyList}" th:text="${cyyList.cyy}"
+                            th:value="${cyyList. id}"></option>-->
+                </select>
+            </div>
+            <button type="button" class="layui-btn" lay-filter="cyySaveBtn" style="width: 80px">常用语</button>
+        </div>
+        <!--        <div class="layui-form-item layui-inline" style="width: 100%">-->
+        <!--            <label class="layui-form-label" style="width: 95px">选择常用语</label>-->
+        <!--            <div class="layui-input-inline" style="width: 750px">-->
+        <!--                <input type="text" id="cyy" name="cyy" class="layui-input" readonly>-->
+        <!--            </div>-->
+        <!--            <button type="button" class="layui-btn" lay-filter="cyySaveBtn" style="width: 80px">常用语</button>-->
+        <!--        </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: 370px">
+                <input type="hidden" id="tjr" name="tjr" class="layui-input" th:value="${approveInfo.tjr}">
+                <input type="text" id="tjrxm" name="tjrxm" class="layui-input" readonly th:value="${approveInfo.tjrxm}">
+            </div>
+            <label class="layui-form-label" style="width: 80px">提交时间</label>
+            <div class="layui-input-inline" style="width: 375px">
+                <input type="text" id="tjsj" name="tjsj" class="layui-input" readonly th:value="${approveInfo.tjsj}">
+            </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: 370px">
+                <input type="hidden" id="userId" name="userId" class="layui-input" th:value="${userInfo.userId}">
+                <input type="hidden" id="shr" name="shr" class="layui-input" th:value="${approveInfo.shr}">
+                <input type="text" id="shrxm" name="shrxm" class="layui-input" th:value="${approveInfo.shrxm}" readonly>
+            </div>
+            <label class="layui-form-label" style="width: 80px">审核时间</label>
+            <div class="layui-input-inline" style="width: 375px">
+                <input type="text" id="shsj" name="shsj" class="layui-input">
+            </div>
+        </div>
+
+        <!-- 右侧悬浮按钮 -->
+        <div class="right-bottom-btn">
+            <button type="button" class="layui-btn" lay-filter="viewNdysBtn">
+                <i class="layui-icon layui-icon-file"></i>查看年度预算
+            </button>
+            <button type="button" class="layui-btn" lay-filter="viewSplistBtn">
+                <i class="layui-icon layui-icon-file"></i>审批列表
+            </button>
+            <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>取消
+            </button>
+        </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">
+    function getInit() {
+        var userId = document.getElementById('userId').value;
+        //初始化常用语
+        $.ajax({
+            type: "get",
+            url: AjaxUtil.ctx + "prjProject/init_cyy/" + userId,
+            async: true,
+            success: function (data) {
+                var cyyList = [];
+                for (var item in data) {
+                    cyyList.push(data[item]);
+                }
+
+                for (var i = 0; i < cyyList.length; i++) {
+                    $("#xmlx").append("<option value = '" + cyyList[i].id + "'>" + cyyList[i].cyy + "</option>");
+                    //重新渲染
+                    layui.form.render("select");
+                }
+            }
+        })
+    }
+
+    AjaxUtil.ctx = /*[[@{/}]]*/'';
+    layui.use(['form', 'tableSelect', 'laydate', 'element'], function () {
+        var form = layui.form,
+            layer = layui.layer,
+            laydate = layui.laydate,
+            element = layui.element;
+        var updateflag = 0;
+
+        var xmApproval = parent.getXmApproval();
+
+        //提交时间
+        laydate.render({
+            elem: '#shsj',
+            type: 'datetime',
+            value: new Date()
+        });
+
+        // element.render('checkbox');
+        // form.on('select(spcz)', function (data) {
+        //     if (data.value == "审批通过") {
+        //         document.getElementById('jyDiv1').style.display = 'block';
+        //         document.getElementById('jyDiv2').style.display = 'none';
+        //     }
+        //     else {
+        //         document.getElementById('jyDiv1').style.display = 'none';
+        //         document.getElementById('jyDiv2').style.display = 'block';
+        //     }
+        // });
+        // 渲染复选框元素
+        element.render('checkbox');
+
+        // 监听下拉菜单选择事件
+        form.on('select(xmlx)', function () {
+            // 获取选中的选项
+            var selectedOption = document.getElementById('xmlx').options[document.getElementById('xmlx').selectedIndex];
+            var newValue = selectedOption.text; // 获取选项文本
+
+            // 更新元素内容和值
+            // var yj2 = document.getElementById('yj2');
+            var yj = document.getElementById('yj');
+
+            // yj2.innerText = newValue;
+            yj.innerText = newValue;
+            // yj2.value = newValue;
+            yj.value = newValue;
+
+            // 修改意见内容
+            var modifiedValue = prompt("请输入修改后的意见内容：", newValue); // 提示用户输入修改后的内容
+
+            // 更新元素值
+            // yj2.value = modifiedValue;
+            yj.value = modifiedValue;
+
+            // 最后展示修改后的意见
+            console.log("修改后的意见是" + modifiedValue);
+        });
+
+
+        //初始化
+        getInit();
+        //gst ccy 监听常用语按钮
+        $("button[lay-filter='cyySaveBtn']").click(function () {
+            parent.layer.open({
+                title: '查看常用',
+                type: 2,
+                shade: 0.3,
+                maxmin: true,
+                shadeClose: true,
+                area: ['1080px', layerheight + 'px'],
+                // content: AjaxUtil.ctx + '/prjProject/forCyy/' + $("#userId").val(),
+                content: AjaxUtil.ctx + 'prjProject/forCyyy',
+                end: function (index) {
+                    $("#xmlx").empty();
+                    $("#xmlx").append("<option>[无]</option>");
+                    getInit();
+                }
+            });
+        });
+
+        // 监听查看年度预算按钮
+        $("button[lay-filter='viewNdysBtn']").click(function () {
+            parent.layer.open({
+                title: '查看年度预算',
+                type: 2,
+                shade: 0.3,
+                maxmin: true,
+                shadeClose: true,
+                area: ['1010px', layerheight + 'px'],
+                content: AjaxUtil.ctx + 'prjAnnualbudget/forView/' + xmApproval.xmid,
+                end: function (index) {
+                    layer.close(index);
+                }
+            });
+        });
+
+        // 监听审批列表按钮
+        $("button[lay-filter='viewSplistBtn']").click(function () {
+            parent.layer.open({
+                title: '审批列表',
+                type: 2,
+                shade: 0.3,
+                maxmin: true,
+                shadeClose: true,
+                area: ['1300px', '750px'],
+                content: AjaxUtil.ctx + 'prjAnnualbudget/forApproveList',
+                end: function (index) {
+                    layer.close(index);
+                }
+            });
+        });
+
+        // 监听提交按钮
+        form.on('submit(saveBtn)', function (data) {
+            var zt = $("#zt").val();
+            var shr = $("#shr").val();
+            var userId = $("#userId").val();
+            if (userId != shr)
+                Message.error("您不是指定的审核人！", 1500);
+            else if (zt == '数据不匹配')
+                Message.error("数据不匹配，请联系管理员处理！", 1500);
+            else {
+                //基本信息
+                layer.load(0, {shade: 0.1});
+                //1.修改审批列表的状态
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+                    data: data.field,
+                    success: function (res) {
+                        layer.load(0, {shade: 0.1});
+                        //2.修改年度预算列表中的值
+                        AjaxUtil.post({
+                            url: AjaxUtil.ctx + "PrjAnnualBudgetRecord/doUpdate/" + xmApproval.xmid,
+                            data: data.field,
+                            success: function (res) {
+                                //3.添加修改记录
+                                AjaxUtil.post({
+                                    url: AjaxUtil.ctx + 'PrjAnnualBudgetRecord/addBudgetRecord/' + xmApproval.xmid,
+                                    data: data.field,
+                                    success: function (res) {
+                                        // layer.close(index);
+                                        if (res.code === 0) {
+                                            Message.success("申请数据修改成功",1500)
+                                        } else {
+                                            Message.error("申请数据添加失败", 2000);
+                                        }
+                                        var iframeIndex = parent.layer.getFrameIndex(window.name);
+                                        parent.layer.close(iframeIndex);
+                                    }
+                                });                            },
+                            error: function (error) {
+                            }
+                        });
+
+                    },
+                    error: function (error) {
+                    }
+                });
+            }
+        });
+
+        // 监听取消按钮
+        $("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/list.html

@@ -116,6 +116,10 @@
                         id="tbYzx">
                     同步已执行
                 </button>
+                <button class="layui-btn layui-btn-sm" lay-event="viewXgsq"
+                        id="viewXgsq">
+                    查看修改申请
+                </button>
             </div>
         </script>
         <script>
@@ -709,6 +713,19 @@
                     });
 
                 }
+            }else  if (obj.event ="viewXgsq"){
+                var index = layer.open({
+                    title: '修改申请',
+                    type: 2,
+                    shade: 0.3,
+                    maxmin: true,
+                    shadeClose: true,
+                    area: ['1300px', layerheight + 'px'],
+                    content:  AjaxUtil.ctx+ "prjAnnualbudget/ViewXGSQ",
+                    end: function () {
+                        layer.close(index);
+                    }
+                });
             }
     });
 

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

@@ -118,6 +118,9 @@
                 <!--                <button class="layui-btn layui-btn-sm" lay-event="exportExcel">-->
                 <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
                 <!--                </button>-->
+                <button class="layui-btn layui-btn-sm data-add-btn" lay-event="updateApply">
+                    <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>修改申请
+                </button>
             </div>
         </script>
         <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
@@ -600,6 +603,35 @@
                         });
                     });
                 }
+            } else if (obj.event === 'updateApply') {
+                var dataBudget = table.cache["currentTableId"];
+                if (dataBudget.length == 0)
+                    return;
+                var checkStatus = table.checkStatus('currentTableId')
+                    , data = checkStatus.data;
+                if (data == null || data.length === 0) {
+                    Message.warning("请选择要修改的年度预算！", 1500);
+                } else if (data.length > 1) {
+                    Message.warning("请选择一条记录进行修改！", 1500);
+                } else if (data[0].spzt != "审批结束") {
+                    Message.warning("该年度预算还未审批结束！", 1500);
+                }
+                else {
+                    layer.open({
+                        title: '编辑年度预算',
+                        type: 2,
+                        shade: 0.3,
+                        maxmin: true,
+                        shadeClose: true,
+                        area: ['1010px', layerheight + 'px'],
+                        content: AjaxUtil.ctx + 'prjAnnualbudget/forUpdateApply/' + data[0].id,
+                        content: AjaxUtil.ctx + 'prjAnnualbudget/forUpdateApply/' + data[0].id,
+                        end: function () {
+                            if (updateflag == 1)
+                                currTable.reload();
+                            updateflag = 0;
+                        }
+                    });                }
             } else if (obj.event === 'exportExcel') {
                 var dataBudget = table.cache["currentTableId"];
                 if (dataBudget.length == 0)

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

@@ -207,11 +207,11 @@
             layer = layui.layer,
             treeTable = layui.treeTable,
             laydate = layui.laydate;
-
         var rwsId = $("#rws").val(),
             ysId = $("#id").val();
         var zjfy = 0;
-
+        var xm = [[${annualbudget.mc}]];
+        var xmid = [[${annualbudget.id}]];
         //申请时间
         laydate.render({
             elem: '#sqsj',
@@ -263,7 +263,6 @@
             dataType: "json",
             success: function (result) {
                 dataBudget = result;
-                console.log(dataBudget)
             }
         });
         var insTb;
@@ -298,10 +297,6 @@
                         {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) {
@@ -494,12 +489,14 @@
         function getBudget(budgets, data) {
             var budget = {
                 "id": data.id,
+                "fymc":data.fymc,
+                "nys":data.nys,
+                "fj":data.fj,
+                "bm":data.bm,
                 "xmzys": data.xmzys,
                 "ysje": data.ysje,
                 "xmz": data.xmz,
-                "byj": data.byj,
-                "xtjsyzx": data.xtjsyzx,
-                "sjyzx": data.sjyzx
+                "byj": data.byj
             };
             budgets.push(budget);
             if (data.children != undefined) {
@@ -563,41 +560,33 @@
             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,
+                contentType: "application/json",
+                data: JSON.stringify(budgets),
                 success: function (res) {
                     layer.close(index);
                     if (res.code === 0) {
+                        var project = {
+                            "xm":xm,
+                            "xmid":xmid,
+                            "zt":"未提交"
+
+                        }
+            //添加审批记录
                         AjaxUtil.post({
-                            url: AjaxUtil.ctx + "prjApproverecord/doAddApprove",
-                            data: data.field,
+                            url: AjaxUtil.ctx + "prjApproverecord/doUpdatApprove",
+                            data:project,
                             success: function (res) {
-                                //更新审批状态
-                                var project = {
-                                    "id": xmApproval.xmid,
-                                    // "spzt": '部门主任审批'
-                                    "spzt": '科技项目管理专责审批'
-                                }
-                                console.log(data.field)
+                                Message.success(res.message, 2000);
                                 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) {
-                                    }
-                                });
-                            },
+                                setTimeout(function() {
+                                    parent.layer.close(parent.layer.getFrameIndex(window.name)); // 关闭子窗口
+                                }, 1500);
+                                // parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+                                },
                             error: function (error) {
                             }
                         });

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

@@ -0,0 +1,662 @@
+<!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">
+    <script type="text/html" id="toolbarDemo">
+      <div class="layui-btn-container">
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="view">
+          <i class="layui-icon layui-icon-file" style="font-size: 10px;"></i>查看
+        </button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spOption">
+          <i class="layui-icon layui-icon-edit" style="font-size: 10px;"></i>审核
+        </button>
+        <button class="layui-btn layui-btn-sm layui-btn-normal" lay-event="spList">
+          <i class="layui-icon layui-icon-list" style="font-size: 10px;"></i>审批列表
+        </button>
+        <!--                <button class="layui-btn layui-btn-sm" lay-event="exportList">-->
+        <!--                    <i class="layui-icon layui-icon-export" style="font-size: 10px;"></i>导出列表-->
+        <!--                </button>-->
+      </div>
+    </script>
+
+    <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+
+  </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 = /*[[@{/}]]*/'';
+  var updateflag = 0;
+  var xmApproval = {};
+  layui.use(['form', 'table'], function () {
+    var form = layui.form,
+            table = layui.table;
+
+    var currTable = table.render({
+      elem: '#currentTableId',
+      url: AjaxUtil.ctx + 'prjApproverecord/xgsqList',
+      method: 'post',
+      toolbar: '#toolbarDemo',
+      defaultToolbar: ['filter', 'exports', 'print'],
+      cols: [
+        [
+          {type: "checkbox", fixed: 'left'},
+          {type: 'numbers', align: 'center'},
+          {field: 'spzt', width: '12%', title: '审批状态', sort: true},
+          {field: 'xmlxmc', width: '10%', title: '类型', sort: true},
+          {field: 'xm', width: '35%', title: '项目/申请', sort: true},
+          // {field: 'zt', width: '12%',title: '状态', sort: true},
+          {field: 'tjrxm', width: '8%', title: '提交人', align: 'center'},
+          {field: 'tjsj', width: '12%', title: '提交时间', align: 'center'}
+          // {title: '操作', toolbar: '#currentTableBar', align: 'center', fixed: 'right'}
+        ]
+      ],
+      sortName: 'xm',
+      autoSort: false,
+      limits: [10, 15, 20, 25, 50, 100],
+      limit: 10,
+      page: true,
+      skin: 'grid',
+      parseData: function (res) { //res 即为原始返回的数据
+        return {
+          "code": res.code, //解析接口状态
+          "msg": res.message, //解析提示文本
+          "count": res.data.total, //解析数据长度
+          "data": res.data.rows //解析数据列表
+        };
+      },
+      done: function (res, curr, count) { // done为数据渲染完的回调
+        // 测试打印出后端返回的权限列表
+        // let permissionSet = [[${permissionSet}]];
+        // console.log(JSON.stringify(permissionSet));
+      }
+    });
+
+    // 监听搜索操作
+    form.on('submit(data-search-btn)', function (data) {
+      // 执行搜索重载
+      currTable.reload({
+        page: {
+          curr: 1 // 页码从1开始
+        },
+        where: form.val("search-form")
+      });
+      return false;
+    });
+
+    // 监听重置操作
+    form.on('submit(data-reset-btn)', function (data) {
+      form.val("search-form", {
+        "xm": '',
+        "erpbh": '',
+        "xmlx": '',
+        "spzt": '',
+        "tablename":''
+      });
+      // 执行搜索重载
+      currTable.reload({
+        page: {
+          curr: 1
+        },
+        where: form.val("search-form")
+      });
+      return false;
+    });
+
+    // 监听排序事件
+    table.on('sort(currentTableFilter)', function (obj) { //注：sort 是工具条事件名，test 是 table 原始容器的属性 lay-filter="对应的值"
+      currTable.reload({
+        initSort: obj, //记录初始排序，如果不设的话，将无法标记表头的排序状态。
+        where: { //请求参数（注意：这里面的参数可任意定义，并非下面固定的格式）
+          sortName: toLine(obj.field), //排序字段
+          sortOrder: toLine(obj.type) //排序方式
+        }
+      });
+    });
+
+    // 监听行工具事件
+    table.on('toolbar(currentTableFilter)', function (obj) {
+      if (obj.event == 'view') {
+        var projects = table.cache["currentTableId"];
+        if (projects.length == 0)
+          return;
+
+        var checkStatus = table.checkStatus('currentTableId')
+                , data = checkStatus.data;
+        if (data == null || data.length === 0) {
+          Message.warning("请选择要查看的记录！", 1500);
+        } else if (data.length > 1) {
+          Message.warning("请选择一条记录进行查看！", 1500);
+        } else {
+          var height = 1090;
+          var title = '查看' + data[0].xmlxmc;
+          var content = AjaxUtil.ctx;
+          if (data[0].tablename == 'prj_Project')
+            content += 'prjProject/forView/' + data[0].xmid;
+          else if (data[0].tablename == 'prj_AnnualBudgetRecord') {
+            height = 1015;
+            content += 'PrjAnnualBudgetRecord/forView/' + data[0].xmid
+          }
+          layer.open({
+            title: title,
+            type: 2,
+            shade: 0.3,
+            maxmin: true,
+            shadeClose: true,
+            area: [height + 'px', layerheight + 'px'],
+            content: content,
+            end: function (index) {
+              layer.close(index);
+            }
+          });
+        }
+      } else if (obj.event === 'spOption') {
+        var projects = table.cache["currentTableId"];
+        if (projects.length == 0)
+          return;
+
+        var checkStatus = table.checkStatus('currentTableId')
+                , data = checkStatus.data;
+        if (data == null || data.length === 0) {
+          Message.warning("请选择要审批的记录！", 1500);
+        } else if (data.length > 1) {
+          for (var index in data) {
+            bathSP(data[index])
+            if (index == (data.length - 1)) {
+              var tc = layer.alert('操作成功', function (index) {
+                // 执行搜索重载
+                currTable.reload({
+                  page: {
+                    curr: 1
+                  },
+                  where: form.val("search-form")
+                });
+                layer.close(tc);
+              });
+            }
+          }
+
+        } else {
+          var content = oneSP(data)
+          layer.open({
+            title: '审批意见',
+            type: 2,
+            shade: 0.3,
+            maxmin: true,
+            shadeClose: true,
+            area: ['1025px', layerheight + 'px'],
+            content: content,
+            end: function () {
+              if (updateflag == 1)
+                currTable.reload();
+              updateflag = 0;
+            }
+          });
+        }
+      } else if (obj.event === 'spList') {
+        var projects = table.cache["currentTableId"];
+        if (projects.length == 0)
+          return;
+
+        var checkStatus = table.checkStatus('currentTableId')
+                , data = checkStatus.data;
+        if (data == null || data.length === 0) {
+          Message.warning("请选择要查看的记录！", 1500);
+        } else if (data.length > 1) {
+          Message.warning("请选择一条记录进行查看！", 1500);
+        } else {
+          xmApproval = {
+            "xmid": data[0].xmid,
+            "xm": data[0].xm
+          };
+
+          var content = AjaxUtil.ctx;
+          if (data[0].tablename == 'sta_FeasibilityReport')
+            content += 'reportinfo';
+          else if (data[0].tablename == 'prj_Project')
+            content += 'prjProject';
+          else if (data[0].tablename == 'prj_AnnualBudget')
+            content += 'prjAnnualbudget';
+          else if (data[0].tablename == 'sta_BudgetApproval')
+            content += 'staBudgetapproval';
+          else if (data[0].tablename == 'sta_Reimbursement')
+            content += 'staReimbursement';
+          else if (data[0].tablename == 'prj_AnnualBudgetRecord')
+            content += 'PrjAnnualBudgetRecord';
+          else if (data[0].tablename == 'sta_PayApproval')
+            content += 'staPayapproval';
+          content += '/forApproveList?mc=' + data[0].xm;
+
+          var index = layer.open({
+            title: '审批列表',
+            type: 2,
+            shade: 0.3,
+            maxmin: true,
+            shadeClose: true,
+            area: ['1300px', '750px'],
+            content: content,
+            end: function () {
+              layer.close(index);
+            }
+          });
+        }
+      }
+    });
+
+    //双击
+    table.on('rowDouble(currentTableFilter)', function (obj) {
+      var projects = table.cache["currentTableId"];
+      if (projects.length == 0)
+        return;
+
+      var checkStatus = table.checkStatus('currentTableId')
+              , data = checkStatus.data;
+      if (data == null || data.length === 0) {
+        Message.warning("请选择要审批的记录！", 1500);
+      } else if (data.length > 1) {
+        for (var index in data) {
+          bathSP(data[index])
+          if (index == (data.length - 1)) {
+            var tc = layer.alert('操作成功', function (index) {
+              // 执行搜索重载
+              currTable.reload({
+                page: {
+                  curr: 1
+                },
+                where: form.val("search-form")
+              });
+              layer.close(tc);
+            });
+          }
+        }
+
+      } else {
+        var content = oneSP(data)
+        layer.open({
+          title: '审批意见',
+          type: 2,
+          shade: 0.3,
+          maxmin: true,
+          shadeClose: true,
+          area: ['1025px', layerheight + 'px'],
+          content: content,
+          end: function () {
+            if (updateflag == 1)
+              currTable.reload();
+            updateflag = 0;
+          }
+        });
+      }
+    });
+  });
+
+  function oneSP(data) {
+    var content = AjaxUtil.ctx;
+    if (data[0].tablename == 'sta_FeasibilityReport') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "ysje": data[0].kysje
+      };
+      content += 'reportinfo/forApproveUpdate/' + data[0].xmid + '/' + data[0].kysje + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'prj_Project') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "ysje": data[0].rysje
+      };
+      content += 'prjProject/forApproveUpdate/' + data[0].xmid + '/' + data[0].rysje + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'prj_AnnualBudget') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "xmzys": data[0].xmzys
+      };
+      content += 'prjAnnualbudget/forApproveUpdate/' + data[0].xmid + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'prj_AnnualBudgetRecord') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "xmzys": data[0].xmzys
+      };
+      content += 'PrjAnnualBudgetRecord/forApproveUpdate/' + data[0].xmid + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'sta_BudgetApproval') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "xmzys": data[0].xmzys
+      };
+      content += 'staBudgetapproval/forApproveUpdate/' + data[0].xmid + '/' + data[0].sqje + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'sta_Reimbursement') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "zt": data[0].spzt,
+        "bzje": data[0].bzje
+      };
+      content += 'staReimbursement/forApproveUpdate/' + data[0].xmid + '/' + data[0].bzje + '?spzt=' + data[0].spzt;
+    } else if (data[0].tablename == 'sta_PayApproval') {
+      xmApproval = {
+        "xmid": data[0].xmid,
+        "xm": data[0].xm,
+        "zt": data[0].spzt,
+        "htje": data[0].htje
+      };
+      content += 'staPayapproval/forApproveUpdate/' + data[0].xmid + '/' + data[0].htje + '?spzt=' + data[0].spzt;
+    }
+    return content;
+  }
+
+  function bathSP(data) {
+    if (data.tablename == 'sta_FeasibilityReport') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "ysje": data.kysje
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'reportinfo/forApproveUpdate/' + data.xmid + '/' + data.kysje + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (res) {
+          console.log(res);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+            data: res.data.field,
+            success: function (res) {
+              //更新审批状态
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '审批结束'
+              }
+              AjaxUtil.post({
+                url: AjaxUtil.ctx + "reportinfo/updateSpzt",
+                contentType: "application/json",
+                data: JSON.stringify(project),
+                success: function (res) {
+                  return true;
+                },
+                error: function (error) {
+                }
+              });
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+
+
+    } else if (data.tablename == 'prj_Project') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "ysje": data.rysje
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'prjProject/bathUpdate/' + data.xmid + '/' + data.rysje + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (res) {
+          console.log(res);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+            data: res.approveInfo,
+            success: function (res) {
+              //更新审批状态
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '审批结束'
+              }
+              AjaxUtil.post({
+                url: AjaxUtil.ctx + "prjProject/updateSpzt",
+                contentType: "application/json",
+                data: JSON.stringify(project),
+                success: function (res) {
+                  return true;
+                },
+                error: function (error) {
+                }
+              });
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+    } else if (data.tablename == 'prj_AnnualBudget') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "xmzys": data.xmzys
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'prjAnnualbudget/bathUpdate/' + data.xmid + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (res) {
+          console.log(res);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+            data: res.approveInfo,
+            success: function (res) {
+              //更新审批状态
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '审批结束'
+              }
+              AjaxUtil.post({
+                url: AjaxUtil.ctx + "prjAnnualbudget/updateSpzt",
+                contentType: "application/json",
+                data: JSON.stringify(project),
+                success: function (res) {
+                  return true;
+                },
+                error: function (error) {
+                }
+              });
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+    } else if (data.tablename == 'prj_AnnualBudgetRecord') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "xmzys": data.xmzys
+      };
+          //修改审批记录表
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+            data: res.approveInfo,
+            success: function (res) {
+
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '审批结束'
+              }
+              //修改年度预算明细表
+            },
+            error: function (error) {
+            }
+          });
+    } else if (data.tablename == 'sta_BudgetApproval') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "zt": data.spzt,
+        "sqje": data.sqje
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'staBudgetapproval/bathUpdate/' + data.xmid + '/' + data.rysje + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (bathUpdateRes) {
+          console.log(bathUpdateRes.approveInfo);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApproveFysq",
+            data: bathUpdateRes.approveInfo,
+            success: function (res) {
+              console.log(res);
+              //更新审批状态
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '',
+                "sqje": xmApprovalBath.sqje,
+                "operations":"bathsp"
+              }
+              if (bathUpdateRes.approveInfo.spcz == '返回修改') {
+                project.spzt = '未提交(返回)';
+              } else if (bathUpdateRes.approveInfo.zt == '部门主任审批') {
+                project.spzt = '科技项目管理专责审批';
+              } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责审批') {
+                project.spzt = '科技部部门主任审批';
+              } else if (bathUpdateRes.approveInfo.zt == '科技部部门主任审批') {
+                project.spzt = '主管院领导审批';
+              } else if (bathUpdateRes.approveInfo.zt == '主管院领导审批') {
+                if (xmApprovalBath.sqje < 1000000) {
+                  project.spzt = '审批结束';
+                } else {
+                  project.spzt = '院长审批';
+                }
+              } else if (bathUpdateRes.approveInfo.zt === '院长审批') {
+                project.spzt = '审批结束';
+              }
+              AjaxUtil.post({
+                url: AjaxUtil.ctx + "staBudgetapproval/updateSpzt",
+                contentType: "application/json",
+                data: JSON.stringify(project),
+                success: function (res) {
+
+                },
+                error: function (error) {
+                }
+              });
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+    } else if (data.tablename == 'sta_Reimbursement') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "zt": data.spzt,
+        "bzje": data.bzje
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'staReimbursement/bathUpdate/' + data.xmid + '/' + data.bzje + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (bathUpdateRes) {
+          console.log(bathUpdateRes.approveInfo);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+            data: bathUpdateRes.approveInfo,
+            success: function (res) {
+              //更新审批状态
+              var project = {
+                "id": xmApprovalBath.xmid,
+                "spzt": '审批结束'
+              }
+              AjaxUtil.post({
+                url: AjaxUtil.ctx + "staReimbursement/updateSpzt",
+                contentType: "application/json",
+                data: JSON.stringify(project),
+                success: function (res) {
+                  return true;
+                },
+                error: function (error) {
+                }
+              });
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+    } else if (data.tablename == 'sta_PayApproval') {
+      var xmApprovalBath = {
+        "xmid": data.xmid,
+        "xm": data.xm,
+        "zt": data.spzt,
+        "htje": data.htje
+      };
+      AjaxUtil.get({
+        url: AjaxUtil.ctx + 'staPayapproval/bathUpdate/' + data.xmid + '/' + data.htje + '?spzt=' + data.spzt,
+        data: data.field,
+        success: function (bathUpdateRes) {
+          console.log(bathUpdateRes.approveInfo);
+          AjaxUtil.post({
+            url: AjaxUtil.ctx + "prjApproverecord/doUpdateApproveFksq",
+            data: bathUpdateRes.approveInfo,
+            success: function (res) {
+              if (res.code == 0) {
+                //更新审批状态
+                var project = {
+                  "id": xmApprovalBath.xmid,
+                  "spzt": ''
+                }
+                if (bathUpdateRes.approveInfo.spcz == '返回修改') {
+                  project.spzt = '未提交(返回)';
+                } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责1审批') {
+                  project.spzt = '科技项目管理专责2审批';
+                } else if (bathUpdateRes.approveInfo.zt == '科技项目管理专责2审批') {
+                  project.spzt = '科技部部门主任审批';
+                } else if (bathUpdateRes.approveInfo.zt === '科技部部门主任审批') {
+                  project.spzt = '审批结束';
+                }
+
+                AjaxUtil.post({
+                  url: AjaxUtil.ctx + "staPayapproval/updateSpzt",
+                  contentType: "application/json",
+                  data: JSON.stringify(project),
+                  success: function (res) {
+                    return true;
+                  },
+                  error: function (error) {
+                  }
+                });
+              }
+            },
+            error: function (error) {
+            }
+          });
+        },
+        error: function (error) {
+        }
+      });
+    }
+  }
+
+  function setUpdateFlag() {
+    updateflag = 1;
+  }
+
+  function getXmApproval() {
+    return xmApproval;
+  }
+</script>
+</body>
+</html>

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

@@ -0,0 +1,99 @@
+<!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', 'table'], function () {
+
+    var form = layui.form,
+            table = layui.table;
+
+    var xmApprove = parent.getXmApproval();
+    $("#xm").val(xmApprove.xm);
+    form.render();
+
+    var currTable = table.render({
+      elem: '#currentTableId',
+      url: AjaxUtil.ctx + 'prjApproverecord/spList/' + xmApprove.xmid+'/prj_AnnualBudgetRecord',
+      method: 'post',
+      // toolbar: '#toolbarDemo',
+      // defaultToolbar: ['filter', 'exports', 'print'],
+      cols: [
+        [
+          {type: 'numbers', align: 'center'},
+          {field: 'zt', width: '15%', title: '审批状态'},
+          // {field: 'tjrxm', width: '10%', title: '提交人'},
+          {field: 'tjsj', width: '16%', title: '提交时间', align: 'center'},
+          {
+            field: 'wc', width: '6%', title: '完成', align: 'center', templet: function (d) {
+              if (1 == d.wc) {
+                return '<span class="layui-badge layui-bg-blue">是</span>';
+              } else {
+                return '<span class="layui-badge layui-bg-orange">否</span>';
+              }
+            }
+          },
+          {field: 'shrxm', width: '10%', title: '审核人', align: 'center'},
+          {field: 'shsj', width: '16%', title: '审核时间', align: 'center'},
+          {field: 'spcz', width: '12%', title: '审批操作', align: 'center'},
+          {field: 'yj', title: '意见'}
+        ]
+      ],
+      sortName: 'jtsj',
+      autoSort: false,
+      limits: [10, 15, 20, 25, 50, 100],
+      limit: 10,
+      page: 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>

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

@@ -0,0 +1,145 @@
+<!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>
+<style>
+    .table-container {
+        display: flex;
+        justify-content: space-between;
+    }
+    .table-wrapper {
+        width: 48%;
+    }
+</style>
+<body>
+<div class="layuimini-container">
+    <div class="layuimini-main">
+        <form class="layui-form" action="" lay-filter="formDemo">
+            <div class="table-container">
+                <div class="table-wrapper">
+                    <h1 style="">新数据</h1>
+                <table class="layui-hide" id="currentTableId" lay-filter="currentTableFilter"></table>
+                </div>
+                <div class="table-wrapper">
+                    <h1 style="">旧数据</h1>
+                    <table class="layui-hide" id="currentTableId1" lay-filter="currentTableFilter"></table>
+                </div>
+            </div>
+            <div class="table-container">
+                <div class="table-wrapper">
+                    <table id="newDataTable" lay-filter="newDataFilter"></table>
+                </div>
+                <div class="table-wrapper">
+                    <table id="oldDataTable" lay-filter="oldDataFilter"></table>
+                </div>
+            </div>
+            <!-- 右侧悬浮按钮 -->
+            <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 prjAnnualbudgetRecord =[[${prjAnnualbudgetRecord}]];
+        var prjAnnualbudget =[[${prjAnnualbudget}]];
+        form.render();
+        // 合并数据
+        var mergedData = prjAnnualbudget.concat(prjAnnualbudgetRecord);
+        var newcols =[
+            {type: 'numbers', align: 'center'},
+            {field: 'fymc', width: '30%', title: '费用名称'},
+            {field: 'xmzys', width: '20%', title: '项目总预算'},
+            {field: 'ysje', width: '16%', title: '预算金额'},
+            {field: 'xmz', width: '16%', title: '项目组'},
+            {field: 'byj', width: '16%', title: '备用金'},
+
+        ]
+        var currTable = table.render({
+            elem: '#currentTableId',
+            data: prjAnnualbudgetRecord,
+            method: 'post',
+            cols:[newcols],
+            autoSort: false,
+            limits: [20, 25, 50, 100],
+            limit: 30,
+            maxmin:true,
+            page: true,
+            skin: 'grid',
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.rows, //解析数据列表
+                };
+            }
+        });
+        var currTable = table.render({
+            elem: '#currentTableId1',
+            data: prjAnnualbudget,
+            method: 'post',
+            cols:[newcols],
+            autoSort: false,
+            limits: [20, 25, 50, 100],
+            limit: 30,
+            maxmin:true,
+            page: true,
+            skin: 'grid',
+            parseData: function (res) { //res 即为原始返回的数据
+                return {
+                    "code": res.code, //解析接口状态
+                    "msg": res.message, //解析提示文本
+                    "count": res.data.total, //解析数据长度
+                    "data": res.data.rows, //解析数据列表
+                };
+            }
+        });
+        // var render = table.render({
+        //         elem:'#currentTableId',
+        //         data: prjAnnualbudget,
+        //         cols:[newcols],
+        //         autoSort: false,
+        //         limits: [20, 25, 50, 100],
+        //         limit: 30,
+        //         maxmin:true,
+        //         page: 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>

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

@@ -217,6 +217,9 @@
                         width = 750;
                         height = 950;
                         content += 'staPayapproval/forView/' + data[0].xmid
+                    } else if (data[0].tablename == 'prj_AnnualBudgetRecord') {
+                        height = 1015;
+                        content += 'PrjAnnualBudgetRecord/forView/' + data[0].xmid
                     }
                     layer.open({
                         title: title,
@@ -302,6 +305,8 @@
                         content += 'staBudgetapproval';
                     else if (data[0].tablename == 'sta_Reimbursement')
                         content += 'staReimbursement';
+                    else if (data[0].tablename == 'prj_AnnualBudgetRecord')
+                        content += 'PrjAnnualBudgetRecord';
                     else if (data[0].tablename == 'sta_PayApproval')
                         content += 'staPayapproval';
                     content += '/forApproveList?mc=' + data[0].xm;
@@ -433,6 +438,13 @@
                 "xmzys": data[0].xmzys
             };
             content += 'prjAnnualbudget/forApproveUpdate/' + data[0].xmid + '?spzt=' + data[0].spzt;
+        }  else if (data[0].tablename == 'prj_AnnualBudgetRecord') {
+            xmApproval = {
+                "xmid": data[0].xmid,
+                "xm": data[0].xm,
+                "xmzys": data[0].xmzys
+            };
+            content += 'PrjAnnualBudgetRecord/forApproveUpdate/' + data[0].xmid + '?spzt=' + data[0].spzt;
         } else if (data[0].tablename == 'sta_BudgetApproval') {
             xmApproval = {
                 "xmid": data[0].xmid,
@@ -578,6 +590,27 @@
                 error: function (error) {
                 }
             });
+        }else if (data.tablename == 'prj_AnnualBudgetRecord') {
+            var xmApprovalBath = {
+                "xmid": data.xmid,
+                "xm": data.xm,
+                "xmzys": data.xmzys
+            };
+            //修改审批记录表
+            AjaxUtil.post({
+                url: AjaxUtil.ctx + "prjApproverecord/doUpdateApprove",
+                data: res.approveInfo,
+                success: function (res) {
+
+                    var project = {
+                        "id": xmApprovalBath.xmid,
+                        "spzt": '审批结束'
+                    }
+                    //修改年度预算明细表
+                },
+                error: function (error) {
+                }
+            });
         } else if (data.tablename == 'sta_BudgetApproval') {
             var xmApprovalBath = {
                 "xmid": data.xmid,