报账页面 BUG 问题修复

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

@@ -479,50 +479,14 @@ public class StaReimbursementController extends BaseController {
      */
     @ResponseBody
     @RequestMapping(value = "/doUpdate", method = RequestMethod.POST)
-    public BaseResult doUpdate(@RequestBody String reimbursements){
+    public BaseResult doUpdate(StaReimbursement reimbursement){
         // 获取当前人员账户
-        StaReimbursement reimbursement = JsonTool.parseObject(reimbursements,StaReimbursement.class);
         SysUserInfo  sysUserInfo = getSysUserInfo();
         StaBudgetapproval staBudgetapproval =  staBudgetapprovalService.getBayID(reimbursement.getFysq());
         StaReimbursement reimbursement1 = staReimbursementService.queryById(reimbursement.getId());
         staBudgetapproval.setBzje(reimbursement.getBzje());
         staBudgetapproval.setBhsje(reimbursement.getBhsje());
-        // 修改后改变当前审批状态
-        // 同步修改审批列表  sta_Reimbursement
-        // 获取当前人员登录 id
-        // 意见模板 ： xx 修改报账金额 原报账金额为xx ，现金额为 xx 税率(原)：XX，税率（现）：XX，不含税金额(原)： XX ，不含税金额（现）：税费（原）：xx， 税费（现）：XX ，状态提交至
-        //
         int nm = staBudgetapprovalService.update(staBudgetapproval);
-        // 这个只修改了 保障表 未同步修改费用申请表
-        // prj_ApproveRecord 审批表
-
-/*        StaReimbursement staReimbursement = staReimbursementService.queryById(reimbursement.getId());
-        PrjApproverecord prjApproverecord = new PrjApproverecord();
-
-        prjApproverecord.setYj(
-                sysUserInfo.getName()
-                +"修改报账金额,报账金额（现）："
-                +reimbursement.getBzje()
-                +"报账金额（原）："
-                +staReimbursement.getBzje()
-                +"税率（现）"
-                + reimbursement.getSl()
-                +"税率（原）"
-                + staReimbursement.getSl()
-                + "不含税金额（现）"
-                + reimbursement.getBhsje()
-                + "不含税金额（原）"
-                + staReimbursement.getBhsje()
-                + "税费（现）："
-                + reimbursement.getSf()
-                + "税费（原）"
-                + staReimbursement.getSf()
-        );
-        prjApproverecord.setSpzt("未提交（返回）");
-        prjApproverecord.setWc();
-        prjApproverecordService.update();
-
-        reimbursement.setSpzt("未提交(返回)");*/
         reimbursement.setSpzt(reimbursement1.getSpzt());
         int num = staReimbursementService.update(reimbursement);
         if (num > 0 || nm > 0 ) {
@@ -541,6 +505,7 @@ public class StaReimbursementController extends BaseController {
     public String forUpdate(Model model, @PathVariable Integer id) {
         StaReimbursement reimbursement = staReimbursementService.queryById(id);
         model.addAttribute("reimbursement", reimbursement);
+
         PrjReimbursementPlan prjReimbursementPlan =prjReimbursementPlanService.queryById(reimbursement.getBzjh());
         if (prjReimbursementPlan!=null) {
             //获取合同信息

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

@@ -644,7 +644,6 @@
                "bhsje": data.field.id,
                 "bxpz": data.field.bzje,
                 "bzje": data.field.bzje,
-                "bzjh": data.field.bzjh,
                 "file": data.field.file,
                 "fylb": data.field.fylb,
                 "fylbmc" : data.field.fylbmc,
@@ -658,66 +657,67 @@
                 "slval": data.field.slval,
                 "sqje": data.field.sqje
             }
-            console.log(datas);
-            AjaxUtil.post({
-                url: AjaxUtil.ctx + "staReimbursement/doUpdate",
-                data: JSON.stringify(data.field),
-                contentType: "application/json",
-                success: function (res) {
-                    layer.close(index);
-                    if (res.code === 0) {
-                        Message.success(1500, res.message, function () {
-                            parent.setUpdateFlag();
-                            //差旅费
-                            var travleExpenses = [];
-                            for (const item of dataExpense) {
-                                var expense = {
-                                    "zb": fysq,
-                                    "xh": item.xh,
-                                    "ccr": item.ccr,
-                                    "ccsy": item.ccsy,
-                                    "ccdd": item.ccdd,
-                                    "qsrq": item.qsrq,
-                                    "jtf": item.jtf,
-                                    "zsf": item.zsf,
-                                    "cb": item.cb,
-                                    "jsrq": item.jsrq,
-                                    "ccts": item.ccts,
-                                    "zj": item.zj,
-                                    "rpj": item.rpj,
-                                    "ccsy": item.ccsy
-                                };
-                                travleExpenses.push(expense);
-                            }
-                            //保存差旅费
-                            AjaxUtil.post({
-                                url: AjaxUtil.ctx + "staActualexpenses/batchInsert/" + fysq,
-                                contentType: "application/json",
-                                data: JSON.stringify(travleExpenses),
-                                success: function (res) {
-                                    if (res.code === 0) {
-                                        // Message.success(1500, res.message, function () {
-                                        //
-                                        // });
-                                    } else {
-                                        // Message.error(res.message, 1000);
-                                    }
-                                },
-                                error: function (error) {
+            setTimeout(function () {
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + "staReimbursement/doUpdate",
+                    data: datas,
+                    success: function (res) {
+                        layer.close(index);
+                        if (res.code === 0) {
+                            Message.success(1500, res.message, function () {
+                                parent.setUpdateFlag();
+                                //差旅费
+                                var travleExpenses = [];
+                                for (const item of dataExpense) {
+                                    var expense = {
+                                        "zb": fysq,
+                                        "xh": item.xh,
+                                        "ccr": item.ccr,
+                                        "ccsy": item.ccsy,
+                                        "ccdd": item.ccdd,
+                                        "qsrq": item.qsrq,
+                                        "jtf": item.jtf,
+                                        "zsf": item.zsf,
+                                        "cb": item.cb,
+                                        "jsrq": item.jsrq,
+                                        "ccts": item.ccts,
+                                        "zj": item.zj,
+                                        "rpj": item.rpj,
+                                        "ccsy": item.ccsy
+                                    };
+                                    travleExpenses.push(expense);
                                 }
-                            });
+                                //保存差旅费
+                                AjaxUtil.post({
+                                    url: AjaxUtil.ctx + "staActualexpenses/batchInsert/" + fysq,
+                                    contentType: "application/json",
+                                    data: JSON.stringify(travleExpenses),
+                                    success: function (res) {
+                                        if (res.code === 0) {
+                                            // Message.success(1500, res.message, function () {
+                                            //
+                                            // });
+                                        } else {
+                                            // Message.error(res.message, 1000);
+                                        }
+                                    },
+                                    error: function (error) {
+                                    }
+                                });
 
-                            var iframeIndex = parent.layer.getFrameIndex(window.name);
-                            parent.layer.close(iframeIndex);
-                        });
-                    } else {
-                        Message.error(res.message, 1000);
+                                var iframeIndex = parent.layer.getFrameIndex(window.name);
+                                parent.layer.close(iframeIndex);
+                            });
+                        } else {
+                            Message.error(res.message, 1000);
+                        }
+                    },
+                    error: function (error) {
+                        Message.error(error.message, 1000)
                     }
-                },
-                error: function (error) {
-                    Message.error(error.message, 1000)
-                }
-            });
+                });
+            },1500)
+
         });
 
         // 监听取消按钮