From 024f485edbbf31f8d877b79b576c089fca6e3d46 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E9=BB=84=E6=B5=B7?= <10402852@qq.com>
Date: Tue, 27 Dec 2022 11:34:49 +0800
Subject: [PATCH] 'commit'

---
 .../formDesign/ayq/modules/staticField.js     |  4 +-
 WebRoot/html/formDesign/fill.html             |  7 +++-
 WebRoot/html/formDesign/listTaskPageInfo.html | 41 ++++++++++++++-----
 .../Zjb/Controller/ZjbController.java         |  7 ++++
 .../dsideal/FengHuang/Zjb/Model/ZjbModel.java |  5 +++
 5 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/WebRoot/html/formDesign/ayq/modules/staticField.js b/WebRoot/html/formDesign/ayq/modules/staticField.js
index 14ec06a..4517bf0 100644
--- a/WebRoot/html/formDesign/ayq/modules/staticField.js
+++ b/WebRoot/html/formDesign/ayq/modules/staticField.js
@@ -258,8 +258,8 @@ layui.define(['layer'], function (exports) {
             '</div>',
         formDefaultButton:'<div class="layui-form-item">\n' +
             '    <div class="layui-input-block">\n' +
-            '        <button type="submit" class="layui-btn" lay-submit="" lay-filter="demo1">提交</button>\n' +
-          // '        <button type="reset" class="layui-btn layui-btn-primary">重置</button>\n' +
+            '        <button type="submit" class="layui-btn" lay-submit="" lay-filter="tj">提交</button>\n' +
+            '        <button lay-submit class="layui-btn layui-btn-primary" lay-filter="back" >返回</button>\n' +
             '    </div>\n' +
             '</div>',
         importHtml:'<div class="importjsoncodeview layui-layer-wrap" style="display: none;">\n' +
diff --git a/WebRoot/html/formDesign/fill.html b/WebRoot/html/formDesign/fill.html
index 08881e4..20f1d6d 100644
--- a/WebRoot/html/formDesign/fill.html
+++ b/WebRoot/html/formDesign/fill.html
@@ -188,7 +188,7 @@
             }
         });
         //监听提交
-        form.on('submit(demo1)', function (data) {
+        form.on('submit(tj)', function (data) {
             let jsonStr = render.getFormData();
             let json = JSON.stringify(jsonStr);
             $.ajax({
@@ -211,6 +211,11 @@
             });
             return false;
         });
+
+        form.on('submit(back)', function (data) {
+            window.location.href = "listTaskPageInfo.html?task_id=" + task_id;
+            return false;
+        });
     });
 </script>
 </body>
diff --git a/WebRoot/html/formDesign/listTaskPageInfo.html b/WebRoot/html/formDesign/listTaskPageInfo.html
index 579bc84..df35509 100644
--- a/WebRoot/html/formDesign/listTaskPageInfo.html
+++ b/WebRoot/html/formDesign/listTaskPageInfo.html
@@ -15,11 +15,12 @@
 <table class="layui-table" lay-filter="idTest" id="idTest"></table>
 <script type="text/html" id="barDemo">
     {{#if(d.page_finish){ }}
-    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="modify">修改</a>
+    <a class="layui-btn layui-btn-xs layui-btn-normal" lay-event="view">查看Word</a>
+    <a class="layui-btn layui-btn-xs layui-btn-warm" lay-event="modify">重新填写</a>
     {{#}else{ }}
-        {{#if(d.module_finish){ }}
-            <a class="layui-btn layui-btn-xs layui-btn" lay-event="modify">填写</a>
-        {{#} }}
+    {{#if(d.module_finish){ }}
+    <a class="layui-btn layui-btn-xs layui-btn" lay-event="modify">填写</a>
+    {{#} }}
     {{#} }}
 </script>
 
@@ -39,27 +40,45 @@
             }
             , cols: [[
                 {field: '', title: '序号', align: 'center', type: 'numbers', fixed: true, width: '5%'}
-                , {field: 'module_finish', title: '模板', align: 'center',templet:function(d){
-                        if(d.module_finish== 0)
+                , {
+                    field: 'module_finish', title: '模板', align: 'center', templet: function (d) {
+                        if (d.module_finish == 0)
                             return '未填写'
                         else
                             return '已填写'
-                    }}
-                , {field: 'page_finish', title: '内容', align: 'center',templet:function(d){
-                        if(d.page_finish== 0)
+                    }
+                }
+                , {
+                    field: 'page_finish', title: '内容', align: 'center', templet: function (d) {
+                        if (d.page_finish == 0)
                             return '未填写'
                         else
                             return '已填写'
-                    }}
+                    }
+                }
                 , {fixed: 'right', title: '操作', toolbar: '#barDemo', align: 'center', width: 480}
             ]]
             , page: false
             , height: 'full'
         });
+
         table.on('tool(idTest)', function (obj) {
             var data = obj.data;
             if (obj.event === "modify") {
-                window.location.href = "fill.html?task_id=" + task_id + "&page=" + data.page+"&module_id="+data.module_id;
+                //调用Ajax清空相关填写内容，重新填写,只清除上传的图片和文件
+                $.ajax({
+                    type: "POST",
+                    dataType: "json",
+                    url: "/FengHuang/zjb/clearUpload",
+                    data: {
+                        "task_id": task_id,
+                        "page": data.page
+                    },
+                    async: false,
+                    success: function (result) {
+                        window.location.href = "fill.html?task_id=" + task_id + "&page=" + data.page + "&module_id=" + data.module_id;
+                    }
+                });
             }
         });
     });
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
index 3f4113a..21d3fec 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Controller/ZjbController.java
@@ -84,4 +84,11 @@ public class ZjbController extends Controller {
         zm.saveUploadFile(task_id, page, upload_id, target.getName());
         renderJson(CommonUtil.returnMessageJson(true, "上传成功！"));
     }
+
+    @Before({POST.class})
+    @IsNumericInterface({"task_id", "page"})
+    public void clearUpload(int task_id, int page) {
+        zm.clearUpload(task_id, page);
+        renderJson(CommonUtil.returnMessageJson(true, "清除成功！"));
+    }
 }
\ No newline at end of file
diff --git a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
index 4555a36..65a4368 100644
--- a/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
+++ b/src/main/java/com/dsideal/FengHuang/Zjb/Model/ZjbModel.java
@@ -161,4 +161,9 @@ public class ZjbModel {
         record.set("file_name", file_name);
         Db.save("t_zjb_task_fill_upload", "task_id,page,upload_id,file_name", record);
     }
+
+    public void clearUpload(int task_id, int page) {
+        String sql = "delete from t_zjb_task_fill_upload where task_id=? and page=?";
+        Db.update(sql, task_id, page);
+    }
 }
\ No newline at end of file