修改付款计划保存逻辑，付款计划必须一次性创建完成并且付款计划总金额等于合同金额

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

@@ -6,6 +6,7 @@ import com.liang.common.base.BaseController;
 import com.liang.common.base.BaseResult;
 import com.liang.entity.PrjPayplan;
 import com.liang.entity.PrjProject;
+import com.liang.entity.StaExpertFee;
 import com.liang.entity.StaPayapproval;
 import com.liang.service.PrjPayplanService;
 import com.liang.service.PrjPayplannameService;
@@ -19,6 +20,7 @@ import org.springframework.web.bind.annotation.*;
 
 import javax.annotation.Resource;
 import java.math.BigDecimal;
+import java.sql.Date;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -144,20 +146,50 @@ public class PrjPayplanController extends BaseController {
 
     }
 
+    @ResponseBody
+    @RequestMapping(value = "/doAdd1", method = RequestMethod.POST)
+        public BaseResult doAdd( @RequestBody String data,
+                            @RequestParam(required = false,value = "htje")Double htje) {
+        List<PrjPayplan> prjPayplanList = JsonTool.parseArray(data, PrjPayplan.class);
+        //先清空该合同下的所有付款计划
+        Integer ht = prjPayplanList.get(0).getHt();
+        prjPayplanService.deleteByHtId(ht);
+        //再次校验付款计划总金额
+        Double count = 0.0;
+        for (int i = 0; i <prjPayplanList.size(); i++) {
+            count +=prjPayplanList.get(i).getZfje();
+        }
+        BigDecimal countBD = BigDecimal.valueOf(count);
+        BigDecimal htjeBD = BigDecimal.valueOf(htje);
+        if (countBD.compareTo(htjeBD) == 0) {
+            for (int i = 0; i < prjPayplanList.size(); i++) {
+                prjPayplanList.get(i).setCjr(getSysUserId());
+                prjPayplanList.get(i).setCjsj(new Date(System.currentTimeMillis()));
+            }
+            int num = prjPayplanService.insertBatch(prjPayplanList);
+            if (num > 0)
+                return BaseResult.success("保存成功!", prjPayplanList);
+            else
+                return BaseResult.failure("保存失败!");
+        }else {
+            return BaseResult.failure("保存失败，付款计划总金额不等于合同金额!");
+        }
+
+    }
+
     /**
      * 编辑数据
      *
      * @return
      */
-    @RequestMapping(value = "/forUpdate/{id}", method = RequestMethod.GET)
-    public String forUpdate(Model model, @PathVariable Integer id) {
-        //当前项目
-        PrjPayplan payplan = prjPayplanService.queryById(id);
-        model.addAttribute("payplan", payplan);
+    @RequestMapping(value = "/forUpdate", method = RequestMethod.GET)
+    public String forUpdate() {
+//        //当前项目
+//        PrjPayplan payplan = prjPayplanService.queryById(id);
+//        model.addAttribute("payplan", payplan);
 
         return "prjpayplan/update";
     }
-
     /**
      * 更新数据
      *
@@ -186,6 +218,11 @@ public class PrjPayplanController extends BaseController {
 
         return "prjpayplan/view";
     }
+    @RequestMapping(value = "/forView1", method = RequestMethod.GET)
+    public String forView1(Model model) {
+        //当前项目
+        return "prjpayplan/view1";
+    }
 
     /**
      * 批量删除

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

@@ -71,4 +71,8 @@ public interface PrjPayplanService {
      * @return
      */
     List<PrjPayplan> getPayPlanList(Integer ht);
+
+    int insertBatch(List<PrjPayplan> prjPayplanList);
+
+    void deleteByHtId(Integer ht);
 }

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

@@ -92,4 +92,14 @@ public class PrjPayplanServiceImpl implements PrjPayplanService {
     public List<PrjPayplan> getPayPlanList(Integer ht) {
         return this.prjPayplanDao.getPayPlanList(ht);
     }
+
+    @Override
+    public int insertBatch(List<PrjPayplan> prjPayplanList) {
+        return this.prjPayplanDao.insertBatch(prjPayplanList);
+    }
+
+    @Override
+    public void deleteByHtId(Integer ht) {
+        prjPayplanDao.deleteByHtId(ht);
+    }
 }

src/main/resources/mapper/PrjPayplanDao.xml

@@ -109,11 +109,11 @@
     </insert>
 
     <insert id="insertBatch" keyProperty="id" useGeneratedKeys="true">
-        insert into prj_PayPlan(FKYQ, ZFBL, ZFJE, CJR, CJSJ, RWS, FYSQ, JHMC, HT)
+        insert into prj_PayPlan(FKYQ, ZFBL, ZFJE, CJR, CJSJ, RWS, FYSQ, JHMC, HT,FKXX)
         values
         <foreach collection="entities" item="entity" separator=",">
             (#{entity.fkyq}, #{entity.zfbl}, #{entity.zfje}, #{entity.cjr}, #{entity.cjsj}, #{entity.rws},
-            #{entity.fysq}, #{entity.jhmc}, #{entity.ht})
+            #{entity.fysq}, #{entity.jhmc}, #{entity.ht},#{entity.fkxx})
         </foreach>
     </insert>
 

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

@@ -156,9 +156,17 @@
 
                         <table class="layui-hide" id="currentTableId3" name="currentTableId3"
                                lay-filter="currentTableFilter3"></table>
-
+                        <div class="layui-form-item layui-inline" style="width: 100%">
+                            <div class="layui-input-block" style="margin-left: 1%; width: 85%;">
+                                <p style="color: red;">注:现要求付款计划必须一次性填写完成，并且付款计划总金额等于合同金额!!
+                                </p>
+                            </div>
+                        </div>
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn" style="margin-bottom: 5px">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="saveBtn2">
+                                <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>
@@ -181,6 +189,7 @@
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     var updateflag = 0;//更新标志
     var htInfo = {};
+    var fkjh = [];
 
     layui.use(['form', 'table', 'treeTable', 'layCascader', 'upload','laydate'], function () {
         var form = layui.form,
@@ -552,20 +561,20 @@
         //付款计划
         var dataFkjh = new Array();
 
-        function freshFkjh() {
-            $.ajax({
-                url: AjaxUtil.ctx + 'prjPayplan/list/' + htId,
-                type: "post",
-                async: false,
-                dataType: "json",
-                success: function (result) {
-                    dataFkjh = result.data.rows;
-                    table.reload('currentTableId3', {
-                        data: dataFkjh
-                    });
-                }
-            });
-        }
+        // function freshFkjh() {
+        //     $.ajax({
+        //         url: AjaxUtil.ctx + 'prjPayplan/list/' + htId,
+        //         type: "post",
+        //         async: false,
+        //         dataType: "json",
+        //         success: function (result) {
+        //             dataFkjh = result.data.rows;
+        //             table.reload('currentTableId3', {
+        //                 data: dataFkjh
+        //             });
+        //         }
+        //     });
+        // }
 
         var currTable3 = table.render({
             elem: '#currentTableId3',
@@ -612,8 +621,28 @@
                     end: function (index) {
                         // 重载表格
                         if (updateflag == 1)
-                            freshFkjh();
+                            // freshFkjh();
+                            var oldData = table.cache["currentTableId3"];
+                             console.log(oldData)
+                            oldData.push(fkjh);
+                             if (oldData != '' && oldData !=null) {
+                                 table.reload('currentTableId3', {
+                                     data: oldData,
+                                 })
+                             }
                         updateflag = 0;
+                        for (var i = 0; i < subTopics.length; i++) {
+                            var item = subTopics[i];
+                            if (item.LAY_CHECKED) {//选中
+                                subTopics[i] = fkjh;
+                                break;
+                            }
+                        }
+                        //刷新表格
+                        var currData = subTopics;
+                        table.reload('currentTableId3', {
+                            data: currData
+                        });
                     }
                 });
             }
@@ -622,8 +651,9 @@
         // 监听编辑按钮(付款计划)
         $("button[lay-filter='btnEdit2']").click(function () {
             var subTopics = table.cache["currentTableId3"];
-            if (subTopics.length == 0)
+            if (subTopics && subTopics.length === 0) {
                 return;
+            }
 
             var checkStatus = table.checkStatus('currentTableId3')
                 , data = checkStatus.data;
@@ -635,17 +665,30 @@
                 htInfo = {
                     "htje": $("#htje").val()
                 }
+                fkjh = {
+                    'fysq':data[0].fysq,
+                    'rws':data[0].rws,
+                    'ht':data[0].ht,
+                    'cjr':data[0].cjr,
+                    'jhmc':data[0].jhmc,
+                    'fkyq':data[0].fkyq,
+                    'zfbl':data[0].zfbl,
+                    'zfje':data[0].zfje,
+                    'cjsj':data[0].cjsj,
+                    'fkxx':data[0].fkxx,
+                }
+
                 layer.open({
                     title: '编辑付款计划',
                     type: 2,
                     maxmin: true,
                     shade: 0.2,
                     area: [layerwidth + 'px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'prjPayplan/forUpdate/' + data[0].id,
+                    content: AjaxUtil.ctx + 'prjPayplan/forUpdate',
                     end: function (index) {
                         // 重载表格
                         if (updateflag == 1)
-                            freshFkjh();
+                            // freshFkjh();
                         updateflag = 0;
                     }
                 });
@@ -664,16 +707,25 @@
             } else if (data.length > 1) {
                 Message.warning("请选择一条记录进行浏览！", 1500);
             } else {
+                fkjh = {
+                    'jhmc':data[0].jhmc,
+                    'fkyq':data[0].fkyq,
+                    'zfbl':data[0].zfbl,
+                    'zfje':data[0].zfje,
+                    'cjsj':data[0].cjsj,
+                    'fkxx':data[0].fkxx,
+                }
                 layer.open({
                     title: '浏览付款计划',
                     type: 2,
                     maxmin: true,
                     shade: 0.2,
                     area: [layerwidth + 'px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'prjPayplan/forView/' + data[0].id,
+                    content: AjaxUtil.ctx + 'prjPayplan/forView1',
                     end: function () {
                     }
                 });
+
             }
         });
         // 监听删除按钮(付款计划)
@@ -687,24 +739,19 @@
             if (data == null || data.length === 0) {
                 Message.warning("请选择要删除的付款计划！", 1500);
             } else {
-                layer.confirm('确定批量删除付款计划吗？', function (index) {
+                layer.confirm('确定删除所选中的付款计划吗？', function (index) {
                     layer.close(index);
-                    AjaxUtil.post({
-                        url: AjaxUtil.ctx + "prjPayplan/batchDelete",
-                        contentType: "application/json",
-                        data: JSON.stringify(data),
-                        success: function (res) {
-                            if (res.code === 0) {
-                                Message.success(1000, res.message, function () {
-                                    // 重载表格
-                                    freshFkjh();
-                                });
-                            } else {
-                                Message.error(res.message, 1000);
-                            }
-                        },
-                        error: function (error) {
+                    for (var i = 0; i < subTopics.length; i++) {
+                        var item = subTopics[i];
+                        if (item.LAY_CHECKED) {//条件：选中
+                            subTopics.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                            i--;
                         }
+                    }
+                    //刷新表格
+                    var currData = subTopics;
+                    table.reload('currentTableId3', {
+                        data: currData
                     });
                 });
             }
@@ -712,18 +759,77 @@
         //双击（付款计划）
         table.on('rowDouble(currentTableFilter3)', function (obj) {
             var data = obj.data;
+            fkjh = {
+                'jhmc':data.jhmc,
+                'fkyq':data.fkyq,
+                'zfbl':data.zfbl,
+                'zfje':data.zfje,
+                'cjsj':data.cjsj,
+                'fkxx':data.fkxx,
+            }
             layer.open({
                 title: '浏览付款计划',
                 type: 2,
                 maxmin: true,
                 shade: 0.2,
                 area: [layerwidth + 'px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'prjPayplan/forView/' + data.id,
+                content: AjaxUtil.ctx + 'prjPayplan/forView1',
                 end: function (index) {
                     layer.close(index);
                 }
             });
         });
+        form.on('submit(saveBtn2)', function (data) {
+            var subTopics = table.cache["currentTableId3"];
+            var htje =parseFloat($("#htje").val())
+            var prjPayplanList =[];
+            var count = 0;
+            if (!subTopics && subTopics.length === 0) {
+                Message.warning("请先创建付款计划！！！", 1500);
+                return;
+            }
+            for (let i = 0; i < subTopics.length; i++) {
+                count += parseFloat(subTopics[i].zfje) || 0;
+            }
+            for (const item of subTopics) {
+                var prjPayplan = {
+                    "fkxx": item.fkxx,
+                    "fkyq": item.fkyq,
+                    "ht": item.ht,
+                    "jhmc": item.jhmc,
+                    "rws": item.rws,
+                    "zfbl": item.zfbl,
+                    "zfje": item.zfje,
+                };
+                prjPayplanList.push(prjPayplan);
+            }
+            console.log(count)
+            console.log(htje)
+            console.log(subTopics)
+            if (count>htje){
+                Message.warning("付款计划付款总金额大于合同金额！！！", 1500);
+                return;
+            }else if (count<htje){
+                Message.warning("付款计划付款总金额小于合同金额！！！", 1500);
+                return;
+            }else {
+                var index = layer.load(0, {shade: 0.1});
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + "prjPayplan/doAdd1/?htje="+htje,
+                    contentType: "application/json",
+                    data: JSON.stringify(prjPayplanList),
+                    success: function (res) {
+                        layer.close(index);
+                            layer.msg(res.message);
+                        var iframeIndex = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(iframeIndex);
+                    },
+                    error: function (error) {
+                        Message.error(error.message, 1000);
+                    }
+                });
+            }
+        });
 
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
@@ -735,7 +841,12 @@
     function getHtInfo() {
         return htInfo;
     }
-
+    function getFkjh() {
+        return fkjh;
+    }
+    function setFkjh(expense) {
+        fkjh = expense;
+    }
     function setUpdateFlag() {
         updateflag = 1;
     }

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

@@ -207,9 +207,17 @@
 
                         <table class="layui-hide" id="currentTableId3" name="currentTableId3"
                                lay-filter="currentTableFilter3"></table>
-
+                        <div class="layui-form-item layui-inline" style="width: 100%">
+                            <div class="layui-input-block" style="margin-left: 1%; width: 85%;">
+                                <p style="color: red;">注:现要求付款计划必须一次性填写完成，并且付款计划总金额等于合同金额!!
+                                </p>
+                            </div>
+                        </div>
                         <!-- 右侧悬浮按钮 -->
                         <div class="right-bottom-btn" style="margin-bottom: 5px">
+                            <button type="button" class="layui-btn" lay-submit lay-filter="saveBtn2">
+                                <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>
@@ -232,6 +240,7 @@
     AjaxUtil.ctx = /*[[@{/}]]*/'';
     var updateflag = 0;//更新标志
     var htInfo = {};
+    var fkjh = [];
 
     layui.use(['form', 'table', 'treeTable', 'layCascader', 'upload','laydate'], function () {
         var form = layui.form,
@@ -535,11 +544,14 @@
             return false;
         });
 
+        var dataFkjh = [[${dataFkjh}]]
+
         //付款计划
         var currTable3 = table.render({
             elem: '#currentTableId3',
-            url: AjaxUtil.ctx + 'prjPayplan/list/' + htId,
-            method: 'post',
+            // url: AjaxUtil.ctx + 'prjPayplan/list/' + htId,
+            // method: 'post',
+            data: dataFkjh,
             cols: [
                 [
                     {type: "checkbox"},
@@ -578,7 +590,16 @@
                 end: function (index) {
                     // 重载表格
                     if (updateflag == 1)
-                        currTable3.reload();
+                        // currTable3.reload()
+                        var oldData = table.cache["currentTableId3"];
+                    console.log('新建前'+oldData)
+                    oldData.push(fkjh);
+                    console.log('新建后'+oldData)
+                    if (oldData != '' && oldData !=null) {
+                        table.reload('currentTableId3', {
+                            data: oldData,
+                        })
+                    }
                     updateflag = 0;
                 }
             });
@@ -599,18 +620,44 @@
                 htInfo = {
                     "htje": $("#htje").val()
                 }
+                fkjh = {
+                    'fysq':data[0].fysq,
+                    'rws':data[0].rws,
+                    'ht':data[0].ht,
+                    'cjr':data[0].cjr,
+                    'jhmc':data[0].jhmc,
+                    'fkyq':data[0].fkyq,
+                    'zfbl':data[0].zfbl,
+                    'zfje':data[0].zfje,
+                    'cjsj':data[0].cjsj,
+                    'fkxx':data[0].fkxx,
+                }
                 layer.open({
                     title: '编辑付款计划',
                     type: 2,
                     maxmin: true,
                     shade: 0.2,
                     area: [layerwidth + 'px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'prjPayplan/forUpdate/' + data[0].id,
+                    content: AjaxUtil.ctx + 'prjPayplan/forUpdate',
                     end: function (index) {
                         // 重载表格
                         if (updateflag == 1)
-                            currTable3.reload();
+                            console.log('编辑前'+subTopics)
                         updateflag = 0;
+                        for (var i = 0; i < subTopics.length; i++) {
+                            var item = subTopics[i];
+                            if (item.LAY_CHECKED) {//选中
+                                subTopics[i] = fkjh;
+                                break;
+                            }
+                        }
+                        //刷新表格
+                        var currData = subTopics;
+                        console.log('编辑后'+currData)
+                        console.log(currData)
+                        table.reload('currentTableId3', {
+                            data: currData
+                        });
                     }
                 });
             }
@@ -628,13 +675,21 @@
             } else if (data.length > 1) {
                 Message.warning("请选择一条记录进行浏览！", 1500);
             } else {
+                fkjh = {
+                    'jhmc':data[0].jhmc,
+                    'fkyq':data[0].fkyq,
+                    'zfbl':data[0].zfbl,
+                    'zfje':data[0].zfje,
+                    'cjsj':data[0].cjsj,
+                    'fkxx':data[0].fkxx,
+                }
                 layer.open({
                     title: '浏览付款计划',
                     type: 2,
                     maxmin: true,
                     shade: 0.2,
                     area: [layerwidth + 'px', layerheight + 'px'],
-                    content: AjaxUtil.ctx + 'prjPayplan/forView/' + data[0].id,
+                    content: AjaxUtil.ctx + 'prjPayplan/forView1',
                     end: function () {
                     }
                 });
@@ -650,25 +705,19 @@
             if (data == null || data.length === 0) {
                 Message.warning("请选择要删除的付款计划！", 1500);
             } else {
-                layer.confirm('确定批量删除付款计划吗？', function (index) {
+                layer.confirm('确定删除所选中的付款计划吗？', function (index) {
                     layer.close(index);
-                    AjaxUtil.post({
-                        url: AjaxUtil.ctx + "prjPayplan/batchDelete",
-                        contentType: "application/json",
-                        data: JSON.stringify(data),
-                        success: function (res) {
-                            if (res.code === 0) {
-                                layer.msg(res.message,{icon:3},function () {
-                                    // 重载表格
-                                    currTable3.reload();
-                                });
-                            } else {
-                                layer.msg(res.message,{icon:3});
-                            }
-                        },
-                        error: function (error) {
-                            layer.msg(res.message,{icon:3});
+                    for (var i = 0; i < subTopics.length; i++) {
+                        var item = subTopics[i];
+                        if (item.LAY_CHECKED) {//条件：选中
+                            subTopics.splice(i, 1);//移除后后造成数组下标索引发生变化，所以下面需要i--
+                            i--;
                         }
+                    }
+                    //刷新表格
+                    var currData = subTopics;
+                    table.reload('currentTableId3', {
+                        data: currData
                     });
                 });
             }
@@ -676,18 +725,78 @@
         //双击（付款计划）
         table.on('rowDouble(currentTableFilter3)', function (obj) {
             var data = obj.data;
+            fkjh = {
+                'jhmc':data.jhmc,
+                'fkyq':data.fkyq,
+                'zfbl':data.zfbl,
+                'zfje':data.zfje,
+                'cjsj':data.cjsj,
+                'fkxx':data.fkxx,
+            }
             layer.open({
                 title: '浏览付款计划',
                 type: 2,
                 maxmin: true,
                 shade: 0.2,
                 area: [layerwidth + 'px', layerheight + 'px'],
-                content: AjaxUtil.ctx + 'prjPayplan/forView/' + data.id,
+                content: AjaxUtil.ctx + 'prjPayplan/forView1',
                 end: function (index) {
                     layer.close(index);
                 }
             });
         });
+        //监听付款计划保存按钮
+        form.on('submit(saveBtn2)', function (data) {
+            var subTopics = table.cache["currentTableId3"];
+            var htje =parseFloat($("#htje").val())
+            var prjPayplanList =[];
+            var count = 0;
+            if (!subTopics && subTopics.length === 0) {
+                Message.warning("请先创建付款计划！！！", 1500);
+                return;
+            }
+            for (let i = 0; i < subTopics.length; i++) {
+                count += parseFloat(subTopics[i].zfje) || 0;
+            }
+            for (const item of subTopics) {
+                var prjPayplan = {
+                    "fkxx": item.fkxx,
+                    "fkyq": item.fkyq,
+                    "ht": item.ht,
+                    "jhmc": item.jhmc,
+                    "rws": item.rws,
+                    "zfbl": item.zfbl,
+                    "zfje": item.zfje,
+                };
+                prjPayplanList.push(prjPayplan);
+            }
+            console.log(count)
+            console.log(htje)
+            console.log(subTopics)
+            if (count>htje){
+                Message.warning("付款计划付款总金额大于合同金额！！！", 1500);
+                return;
+            }else if (count<htje){
+                Message.warning("付款计划付款总金额小于合同金额！！！", 1500);
+                return;
+            }else {
+                var index = layer.load(0, {shade: 0.1});
+                AjaxUtil.post({
+                    url: AjaxUtil.ctx + "prjPayplan/doAdd1/?htje="+htje,
+                    contentType: "application/json",
+                    data: JSON.stringify(prjPayplanList),
+                    success: function (res) {
+                        layer.close(index);
+                        layer.msg(res.message);
+                        var iframeIndex = parent.layer.getFrameIndex(window.name);
+                        parent.layer.close(iframeIndex);
+                    },
+                    error: function (error) {
+                        Message.error(error.message, 1000);
+                    }
+                });
+            }
+        });
 
         // 监听取消按钮
         $("button[lay-filter='cancleBtn']").click(function () {
@@ -699,7 +808,12 @@
     function getHtInfo() {
         return htInfo;
     }
-
+    function getFkjh() {
+        return fkjh;
+    }
+    function setFkjh(expense) {
+        fkjh = expense;
+    }
     function setUpdateFlag() {
         updateflag = 1;
     }

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

@@ -124,26 +124,28 @@
                 layer.msg('支付金额不能大于合同总金额!');
                 return false;
             }
-            var index = layer.load(0, {shade: 0.1});
-            AjaxUtil.post({
-                url: AjaxUtil.ctx + "prjPayplan/doAdd/?htje="+htje,
-                data: data.field,
-                success: function (res) {
-                    layer.close(index);
-                    if (res.code === 0) {
-                        parent.setUpdateFlag();
-                        parent.layer.close(parent.layer.getFrameIndex(window.name));
-                    } else {
-                        layer.msg(res.message);
-                    }
-
-                },
-                error: function (error) {
-                    Message.error(error.message, 1000);
-                }
-            });
-
-            return false;
+            // var index = layer.load(0, {shade: 0.1});
+            // AjaxUtil.post({
+            //     url: AjaxUtil.ctx + "prjPayplan/doAdd/?htje="+htje,
+            //     data: data.field,
+            //     success: function (res) {
+            //         layer.close(index);
+            //         if (res.code === 0) {
+            //             parent.setUpdateFlag();
+            //             parent.layer.close(parent.layer.getFrameIndex(window.name));
+            //         } else {
+            //             layer.msg(res.message);
+            //         }
+            //
+            //     },
+            //     error: function (error) {
+            //         Message.error(error.message, 1000);
+            //     }
+            // });
+            parent.setFkjh(data.field);
+            parent.setUpdateFlag();
+            parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+            // return false;
         });
         var prjPayplan = new Array();
         var currTable2 = table.render({

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

@@ -16,20 +16,20 @@
 <body>
 <form class="layui-form" action="" lay-filter="formDemo">
     <div class="layui-form layuimini-form" style="margin-right: 20px">
-        <input type="hidden" id="rws" name="rws" class="layui-input" th:value="${rws}">
-        <input type="hidden" id="ht" name="ht" class="layui-input" th:value="${ht}">
+        <input type="hidden" id="rws" name="rws" class="layui-input" >
+        <input type="hidden" id="ht" name="ht" class="layui-input" >
         <div class="layui-form-item">
             <label class="layui-form-label required" style="width: 70px">计划名称</label>
             <div class="layui-input-block">
-                <input type="hidden" id="id" name="id" class="layui-input" th:value="${payplan.id}">
-                <input type="text" id="jhmc" name="jhmc" class="layui-input" th:value="${payplan.jhmc}" readonly>
+                <input type="hidden" id="id" name="id" class="layui-input" >
+                <input type="text" id="jhmc" name="jhmc" class="layui-input" readonly>
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label" style="width: 70px">付款要求</label>
             <div class="layui-input-block">
                 <textarea id="fkyq" name="fkyq" class="layui-textarea" style="width: 100%;height: 100px"
-                          th:text="${payplan.fkyq}"></textarea>
+                         ></textarea>
                 <tip>按合同约定填写</tip>
             </div>
         </div>
@@ -38,14 +38,14 @@
             <label class="layui-form-label" style="width: 90px; margin-left: -20px">支付比例(%)</label>-->
             <div class="layui-input-block">
                 <!--                <input type="number" id="zfbl" name="zfbl" autocomplete="off" th:value="${payplan.zfbl}" class="layui-input" lay-verify="required" lay-reqtext="支付比例不能为空">-->
-                <input type="number" id="zfbl" name="zfbl" autocomplete="off" th:value="${payplan.zfbl}"
+                <input type="number" id="zfbl" name="zfbl" autocomplete="off"
                        class="layui-input">
             </div>
         </div>
         <div class="layui-form-item">
             <label class="layui-form-label required" style="width: 70px">支付金额(万元)</label>
             <div class="layui-input-block">
-                <input type="number" id="zfje" name="zfje" autocomplete="off" th:value="${payplan.zfje}"
+                <input type="number" id="zfje" name="zfje" autocomplete="off"
                        class="layui-input" lay-verify="required" lay-reqtext="支付金额不能为空">
             </div>
         </div>
@@ -86,6 +86,20 @@
             layer = layui.layer;
 
         var htInfo = parent.getHtInfo();
+        var fkjh = parent.getFkjh();
+        var prjPayplan = new Array();
+        console.log(fkjh)
+        console.log(fkjh.fkxx)
+        if (fkjh.fkxx != null && fkjh.fkxx != "") {
+            prjPayplan = eval('(' + fkjh.fkxx + ')');
+        }
+        console.log(fkjh)
+        $("#jhmc").val(fkjh.jhmc);
+        $("#fkyq").val(fkjh.fkyq);
+        $("#zfbl").val(fkjh.zfbl);
+        $("#zfje").val(fkjh.zfje);
+        $("#rws").val(fkjh.rws);
+        $("#ht").val(fkjh.ht);
         //支付比例
         $("#zfbl").on("input", function (e) {
             //获取input输入的值
@@ -95,10 +109,6 @@
                 $("#zfje").val(zfje.toFixed(2));
             }
         });
-        var prjPayplan = new Array();
-        if ([[${payplan.fkxx}]] != null && [[${payplan.fkxx}]] != "") {
-            prjPayplan = eval('(' + [[${payplan.fkxx}]] + ')');
-        }
         var currTable2 = table.render({
             elem: '#currentTableId2',
             data: prjPayplan,
@@ -134,25 +144,27 @@
             }
             $("#fkxx").val(JSON.stringify(data_prjPayplan));
             data.field.fkxx = JSON.stringify(data_prjPayplan);
-            var index = layer.load(0, {shade: 0.1});
-            AjaxUtil.post({
-                url: AjaxUtil.ctx + "prjPayplan/doUpdate",
-                data: data.field,
-                success: function (res) {
-                    layer.close(index);
-                    if (res.code === 0) {
-                        parent.setUpdateFlag();
-                    } else {
-                        // Message.error(res.message, 1000);
-                    }
-                    parent.layer.close(parent.layer.getFrameIndex(window.name));
-                },
-                error: function (error) {
-                    Message.error(error.message, 1000)
-                }
-            });
-
-            return false;
+            // var index = layer.load(0, {shade: 0.1});
+            // AjaxUtil.post({
+            //     url: AjaxUtil.ctx + "prjPayplan/doUpdate",
+            //     data: data.field,
+            //     success: function (res) {
+            //         layer.close(index);
+            //         if (res.code === 0) {
+            //             parent.setUpdateFlag();
+            //         } else {
+            //             // Message.error(res.message, 1000);
+            //         }
+            //         parent.layer.close(parent.layer.getFrameIndex(window.name));
+            //     },
+            //     error: function (error) {
+            //         Message.error(error.message, 1000)
+            //     }
+            // });
+            parent.setFkjh(data.field);
+            parent.setUpdateFlag();
+            parent.layer.close(parent.layer.getFrameIndex(window.name));// 关闭子窗口
+            // return false;
         });
         //监听添加行按钮
         $("button[lay-filter='add']").click(function () {

src/main/resources/templates/prjpayplan/view1.html

@@ -0,0 +1,114 @@
+<!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="margin-right: 20px">
+        <div class="layui-form-item">
+            <label class="layui-form-label" style="width: 70px">计划名称</label>
+            <div class="layui-input-block">
+                <input type="text" id="jhmc" name="jhmc" class="layui-input" readonly>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label" style="width: 70px">付款要求</label>
+            <div class="layui-input-block">
+                <textarea id="fkyq" name="fkyq" class="layui-textarea" style="width: 100%;height: 100px"
+                           readonly></textarea>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label" style="width: 80px; margin-left: -10px">支付比例(%)</label>
+            <div class="layui-input-block">
+                <input type="text" id="zfbl" name="zfbl" class="layui-input"  readonly>
+            </div>
+        </div>
+        <div class="layui-form-item">
+            <label class="layui-form-label" style="width: 70px">支付金额(万元)</label>
+            <div class="layui-input-block">
+                <input type="text" id="zfje" name="zfje" class="layui-input"  readonly>
+            </div>
+        </div>
+        <div class="layui-form-item layui-inline" style="width: 100%">
+            <label class="layui-form-label" style="width: 10%">付款信息</label>
+            <div class="layuimini-container" style="margin-left: 13%; padding-bottom: 10px;width: 90%">
+                <input type="hidden" id="fkxx" name="fkxx" class="layui-input">
+                <table class="layui-hide" id="currentTableId2" name="currentTableId2" lay-filter="currentTableFilter2" style="padding-top: 0px;margin-top: 0px"></table>
+            </div>
+        </div>
+
+
+        <!-- 右侧悬浮按钮 -->
+        <div class="right-bottom-btn">
+            <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="@{/js/lay-config.js}" charset="utf-8"></script>
+<script type="text/javascript" th:inline="javascript">
+    AjaxUtil.ctx = /*[[@{/}]]*/'';
+    layui.use(['form', 'layer', 'tableSelect','table'], function () {
+        var table = layui.table;
+        var fkjh = parent.getFkjh();
+        // 用于存放表格数据
+        var prjPayplan = new Array();
+        console.log(fkjh)
+        console.log(fkjh.fkxx)
+        if (fkjh.fkxx != null && fkjh.fkxx != "") {
+            prjPayplan = eval('(' + fkjh.fkxx + ')');
+        }
+                console.log(fkjh)
+                $("#jhmc").val(fkjh.jhmc);
+                $("#fkyq").val(fkjh.fkyq);
+                $("#zfbl").val(fkjh.zfbl);
+                $("#zfje").val(fkjh.zfje);
+        console.log(prjPayplan)
+        var currTable2 = table.render({
+            elem: '#currentTableId2',
+            data: prjPayplan,
+            cols: [
+                [
+                    {type: "checkbox", align: 'center'},
+                    {type: 'numbers', align: 'center'},
+                    {field: 'name', title: '公司名称', width: '30%',align:'center',edit: 'text'},
+                    {field: 'fkje', title: '付款金额', width: '15%', align: 'center',edit:'text'},
+                    {field: 'fksm', title: '付款说明', align: 'center',edit: 'text'}
+                ]
+            ],
+            autoSort: false,
+
+            limit: Number.MAX_VALUE,
+            page: false,
+            skin: 'grid',
+            done: function (res, curr, count) { // done为数据渲染完的回调
+            }
+        });
+
+
+        // 监听取消按钮
+        $("button[lay-filter='cancleBtn']").click(function () {
+            var iframeIndex = parent.layer.getFrameIndex(window.name);
+            parent.layer.close(iframeIndex);
+        });
+    });
+</script>
+</body>
+</html>