'commit'

3 years ago · 9e5ecb83ba
parent 439548129e
commit 9e5ecb83ba
4 changed files with 57 additions and 13 deletions
--- a/WebRoot/html/formDesign/ayq/modules/formDesigner.js
+++ b/WebRoot/html/formDesign/ayq/modules/formDesigner.js
@ -4663,7 +4663,7 @@ layui.config({base: './ayq/modules/'}).define(["layer", 'flow', "laytpl", "eleme
                    success: function (result) {
                        layer.msg('保存成功!', {icon: 1, time: 1500},
                            function (index) {
-                                if (flag) window.location.href = "listPageInfo.html?module_id=" + module_id;
+                                if (flag) window.location.href = "listModulePageInfo.html?module_id=" + module_id;
                            }
                        );
                        return;
--- a/WebRoot/html/formDesign/fill.html
+++ b/WebRoot/html/formDesign/fill.html
@ -3,7 +3,7 @@
 <head>
    <meta charset="utf-8">
    <meta name="viewport" content="width=device-width, initial-scale=1, maximum-scale=1">
-    <title>Layui</title>
+    <title>填报内容</title>
    <link rel="stylesheet" href="./layui/css/layui.css"/>
    <link rel="stylesheet" href="./ayq/modules/formDesigner.css"/>
    <link rel="stylesheet" href="./ayq/modules/cron.css"/>
@ -22,6 +22,9 @@
 <script type="text/javascript" src="./layui/layui.js"></script>
 <script type="text/javascript" src="./ayq/modules/Sortable/Sortable.js"></script>
 <script type="text/javascript" src="./ayq/modules/iceEditor/iceEditor.js"></script>
+<!--引用新版本Jquery-->
+<script type="text/javascript" src="../../js/jquery-3.6.0.min.js"></script>
+<script type="text/javascript" src="../../js/jquery_Extend.js"></script>

 <script>
    var data = [];
@ -48,6 +51,7 @@
            }
            return res;
        }
+
        //利用Ajax读取出已经录入数据
        let task_id = $.getUrlParam('task_id');
        let page = $.getUrlParam('page');
@ -62,6 +66,7 @@
            },
            async: false,
            success: function (result) {
+                console.log(result);
                data = result;
                render = formDesigner.render({
                    elem: '#workspace',
@ -173,18 +178,29 @@
        });
        //监听提交
        form.on('submit(demo1)', function (data) {
-            var json = render.getFormData();
-            console.log(json);
-            layer.msg(JSON.stringify(json), {icon: 6});
+            let jsonStr = render.getFormData();
+            let json = JSON.stringify(jsonStr);
+            $.ajax({
+                type: "POST",
+                dataType: "json",
+                url: "/FengHuang/zjb/saveFillPage",
+                data: {
+                    "task_id": task_id,
+                    "page": page,
+                    "json": json
+                },
+                async: false,
+                success: function (result) {
+                    layer.msg('保存成功!', {icon: 1, time: 1500},
+                        function (index) {
+                            window.location.href = "listTaskPageInfo.html?task_id=" + task_id;
+                        }
+                    );
+                }
+            });
            return false;
        });
    });
-
-    function getSubmitData() {
-        var data = $('#workspace').form[0].serialize();
-        console.log(data);
-        return data;
-    }
 </script>
 </body>
 </html>
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
@ -21,6 +21,13 @@ public class ZjbController extends Controller {
        renderJson(CommonUtil.returnMessageJson(true, "保存成功!"));
    }

+    @Before({POST.class})
+    @IsNumericInterface({"task_id", "page"})
+    public void saveFillPage(int task_id,int page,String json){
+        zm.saveFillPage(task_id, page, json);
+        renderJson(CommonUtil.returnMessageJson(true, "保存成功!"));
+    }
+
    @Before({GET.class})
    @IsNumericInterface({"module_id", "page"})
    public void getModulePage(int module_id, int page) {
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
@ -1,5 +1,6 @@
 package com.dsideal.FengHuang.Zjb.Model;

+import cn.hutool.core.date.DateTime;
 import com.dsideal.FengHuang.LoginPerson.Model.LoginPersonModel;
 import com.dsideal.FengHuang.Util.CommonUtil;
 import com.dsideal.FengHuang.Util.IpUtil;
@ -23,6 +24,11 @@ public class ZjbModel {
        Db.update(sql, module_id, page);
    }

+    public void delFillPage(int task_id, int page) {
+        String sql = "delete from t_zjb_task_fill where task_id=? and page=?";
+        Db.update(sql, task_id, page);
+    }
+
    /*
    功能：保存模块页面的内容
    作者：黄海
@ -37,6 +43,19 @@ public class ZjbModel {
        Db.save("t_zjb_module_page", "module_id,page", record);
    }

+    public void saveFillPage(int task_id,int page,String json){
+        delFillPage(task_id,page);
+        Record record = new Record();
+        record.set("task_id", task_id);
+        Record rTask = getTaskInfo(task_id);
+        int module_id = rTask.getInt("module_id");
+        record.set("module_id", module_id);
+        record.set("page", page);
+        record.set("json", json);
+        record.set("create_time", DateTime.now());
+        Db.save("t_zjb_task_fill", "task_id,page", record);
+    }
+
    /*
    功能：获取指定模板，指定页码的JSON内容
     */
@ -51,7 +70,9 @@ public class ZjbModel {
        String sql = "select json from t_zjb_task_fill where task_id=? and page=?";
        List<Record> list = Db.find(sql, task_id, page);
        if (list.size() > 0) return list.get(0).getStr("json");
-        return "[]";
+        //直接获取原始模板json进行显示
+        Record record = getTaskInfo(task_id);
+        return getModulePage(record.getInt("module_id"), page);
    }

    public Record getMoudleInfo(int module_id) {