From e8568e7d8215f372dfe446f1cbc4ac9661a0a318 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com>
Date: Tue, 3 Nov 2020 12:48:56 +0800
Subject: [PATCH 1/3] =?UTF-8?q?=20=E5=90=88=E5=90=8C=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=EF=BC=8C=E5=90=88=E5=90=8C=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/ContractTemplateController.java     |  16 +--
 .../front/ContractTypeController.java         |  18 +--
 .../com/ruoyi/front/domain/ClasssicCases.java |   1 -
 .../templates/front/contract/add.html         |  49 -------
 .../templates/front/contract/edit.html        |  44 -------
 .../front/contract_template/add.html          | 124 ++++++++++++++++++
 .../front/contract_template/edit.html         | 123 +++++++++++++++++
 .../template.html}                            |  72 +++++++---
 8 files changed, 319 insertions(+), 128 deletions(-)
 delete mode 100644 ruoyi-front/src/main/resources/templates/front/contract/add.html
 delete mode 100644 ruoyi-front/src/main/resources/templates/front/contract/edit.html
 create mode 100644 ruoyi-front/src/main/resources/templates/front/contract_template/add.html
 create mode 100644 ruoyi-front/src/main/resources/templates/front/contract_template/edit.html
 rename ruoyi-front/src/main/resources/templates/front/{contract/contract.html => contract_template/template.html} (57%)

diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java
index 6cbf073af..dc7aabb00 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTemplateController.java
@@ -26,15 +26,15 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2020-10-21
  */
 @Controller
-@RequestMapping("/front/template")
+@RequestMapping("/front/contractTemplate")
 public class ContractTemplateController extends BaseController
 {
-    private String prefix = "front/template";
+    private String prefix = "front/contract_template";
 
     @Autowired
     private IContractTemplateService contractTemplateService;
 
-    @RequiresPermissions("front:template:view")
+    @RequiresPermissions("front:contract_template:view")
     @GetMapping()
     public String template()
     {
@@ -44,7 +44,7 @@ public class ContractTemplateController extends BaseController
     /**
      * 查询合同模板列表
      */
-    @RequiresPermissions("front:template:list")
+    @RequiresPermissions("front:contractTemplate:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(ContractTemplate contractTemplate)
@@ -57,7 +57,7 @@ public class ContractTemplateController extends BaseController
     /**
      * 导出合同模板列表
      */
-    @RequiresPermissions("front:template:export")
+    @RequiresPermissions("front:contractTemplate:export")
     @Log(title = "合同模板", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
@@ -80,7 +80,7 @@ public class ContractTemplateController extends BaseController
     /**
      * 新增保存合同模板
      */
-    @RequiresPermissions("front:template:add")
+    @RequiresPermissions("front:contractTemplate:add")
     @Log(title = "合同模板", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -103,7 +103,7 @@ public class ContractTemplateController extends BaseController
     /**
      * 修改保存合同模板
      */
-    @RequiresPermissions("front:template:edit")
+    @RequiresPermissions("front:contract_template:edit")
     @Log(title = "合同模板", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -115,7 +115,7 @@ public class ContractTemplateController extends BaseController
     /**
      * 删除合同模板
      */
-    @RequiresPermissions("front:template:remove")
+    @RequiresPermissions("front:contractTemplate:remove")
     @Log(title = "合同模板", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
diff --git a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTypeController.java b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTypeController.java
index 4ac195b52..691de574a 100644
--- a/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTypeController.java
+++ b/ruoyi-admin/src/main/java/com/ruoyi/web/controller/front/ContractTypeController.java
@@ -26,25 +26,25 @@ import com.ruoyi.common.core.page.TableDataInfo;
  * @date 2020-10-21
  */
 @Controller
-@RequestMapping("/front/contract")
+@RequestMapping("/front/contractType")
 public class ContractTypeController extends BaseController
 {
-    private String prefix = "front/contract";
+    private String prefix = "front/contract_type";
 
     @Autowired
     private IContractTypeService contractTypeService;
 
-    @RequiresPermissions("front:contract:view")
+    @RequiresPermissions("front:contractType:view")
     @GetMapping()
     public String contract()
     {
-        return prefix + "/contract";
+        return prefix + "/type";
     }
 
     /**
      * 查询合同分类列表
      */
-    @RequiresPermissions("front:contract:list")
+    @RequiresPermissions("front:contractType:list")
     @PostMapping("/list")
     @ResponseBody
     public TableDataInfo list(ContractType contractType)
@@ -57,7 +57,7 @@ public class ContractTypeController extends BaseController
     /**
      * 导出合同分类列表
      */
-    @RequiresPermissions("front:contract:export")
+    @RequiresPermissions("front:contractType:export")
     @Log(title = "合同分类", businessType = BusinessType.EXPORT)
     @PostMapping("/export")
     @ResponseBody
@@ -80,7 +80,7 @@ public class ContractTypeController extends BaseController
     /**
      * 新增保存合同分类
      */
-    @RequiresPermissions("front:contract:add")
+    @RequiresPermissions("front:contractType:add")
     @Log(title = "合同分类", businessType = BusinessType.INSERT)
     @PostMapping("/add")
     @ResponseBody
@@ -103,7 +103,7 @@ public class ContractTypeController extends BaseController
     /**
      * 修改保存合同分类
      */
-    @RequiresPermissions("front:contract:edit")
+    @RequiresPermissions("front:contractType:edit")
     @Log(title = "合同分类", businessType = BusinessType.UPDATE)
     @PostMapping("/edit")
     @ResponseBody
@@ -115,7 +115,7 @@ public class ContractTypeController extends BaseController
     /**
      * 删除合同分类
      */
-    @RequiresPermissions("front:contract:remove")
+    @RequiresPermissions("front:contractType:remove")
     @Log(title = "合同分类", businessType = BusinessType.DELETE)
     @PostMapping( "/remove")
     @ResponseBody
diff --git a/ruoyi-front/src/main/java/com/ruoyi/front/domain/ClasssicCases.java b/ruoyi-front/src/main/java/com/ruoyi/front/domain/ClasssicCases.java
index 9f65b3393..1525b1e5b 100644
--- a/ruoyi-front/src/main/java/com/ruoyi/front/domain/ClasssicCases.java
+++ b/ruoyi-front/src/main/java/com/ruoyi/front/domain/ClasssicCases.java
@@ -39,7 +39,6 @@ public class ClasssicCases extends BaseEntity
     private Integer hits;
 
     /** 图片地址（多个地址用，分隔） */
-    @Excel(name = "图片地址", readConverterExp = "多=个地址用，分隔")
     private String pictureUrl;
 
     /** 状态（0正常 1停用） */
diff --git a/ruoyi-front/src/main/resources/templates/front/contract/add.html b/ruoyi-front/src/main/resources/templates/front/contract/add.html
deleted file mode 100644
index 7f788ba08..000000000
--- a/ruoyi-front/src/main/resources/templates/front/contract/add.html
+++ /dev/null
@@ -1,49 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('新增合同分类')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-contract-add">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">分类名称：</label>
-                <div class="col-sm-8">
-                    <input name="name" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">：</label>
-                <div class="col-sm-8">
-                    <input name="englishName" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">删除标志：</label>
-                <div class="col-sm-8">
-                    <input name="delFlag" class="form-control" type="text">
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "front/contract"
-        $("#form-contract-add").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/add", $('#form-contract-add').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract/edit.html b/ruoyi-front/src/main/resources/templates/front/contract/edit.html
deleted file mode 100644
index 6847bf771..000000000
--- a/ruoyi-front/src/main/resources/templates/front/contract/edit.html
+++ /dev/null
@@ -1,44 +0,0 @@
-<!DOCTYPE html>
-<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
-<head>
-    <th:block th:include="include :: header('修改合同分类')" />
-</head>
-<body class="white-bg">
-    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
-        <form class="form-horizontal m" id="form-contract-edit" th:object="${contractType}">
-            <input name="id" th:field="*{id}" type="hidden">
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">分类名称：</label>
-                <div class="col-sm-8">
-                    <input name="name" th:field="*{name}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">：</label>
-                <div class="col-sm-8">
-                    <input name="englishName" th:field="*{englishName}" class="form-control" type="text" required>
-                </div>
-            </div>
-            <div class="form-group">    
-                <label class="col-sm-3 control-label">备注：</label>
-                <div class="col-sm-8">
-                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
-                </div>
-            </div>
-        </form>
-    </div>
-    <th:block th:include="include :: footer" />
-    <script th:inline="javascript">
-        var prefix = ctx + "front/contract";
-        $("#form-contract-edit").validate({
-            focusCleanup: true
-        });
-
-        function submitHandler() {
-            if ($.validate.form()) {
-                $.operate.save(prefix + "/edit", $('#form-contract-edit').serialize());
-            }
-        }
-    </script>
-</body>
-</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_template/add.html b/ruoyi-front/src/main/resources/templates/front/contract_template/add.html
new file mode 100644
index 000000000..4f86b01cb
--- /dev/null
+++ b/ruoyi-front/src/main/resources/templates/front/contract_template/add.html
@@ -0,0 +1,124 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增合同模板')" />
+    <th:block th:include="include :: summernote-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-template-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">合同分类id(contract_type表主键id)：</label>
+                <div class="col-sm-8">
+                    <select name="type" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">标题：</label>
+                <div class="col-sm-8">
+                    <input name="title" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">简介：</label>
+                <div class="col-sm-8">
+                    <input name="introduction" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">详情内容：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" name="content">
+                    <div class="summernote" id="content"></div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">点击量：</label>
+                <div class="col-sm-8">
+                    <input name="hits" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">附件下载：</label>
+                <div class="col-sm-8">
+                    <textarea name="enclosureUrl" class="form-control" required></textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="status" value="">
+                        <label th:for="status" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "front/contractTemplate";
+        $("#form-template-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-template-add').serialize());
+            }
+        }
+
+        $(function() {
+            $('.summernote').summernote({
+                lang: 'zh-CN',
+                callbacks: {
+                    onChange: function(contents, $edittable) {
+                        $("input[name='" + this.id + "']").val(contents);
+                    },
+                    onImageUpload: function(files) {
+                    	var obj = this;
+                    	var data = new FormData();
+                    	data.append("file", files[0]);
+                    	$.ajax({
+                    		type: "post",
+                    		url: ctx + "common/upload",
+                    		data: data,
+                    		cache: false,
+                    		contentType: false,
+                    		processData: false,
+                    		dataType: 'json',
+                    		success: function(result) {
+                    			if (result.code == web_status.SUCCESS) {
+                    				$('#' + obj.id).summernote('insertImage', result.url);
+                    			} else {
+                    				$.modal.alertError(result.msg);
+                    			}
+                    		},
+                    		error: function(error) {
+                    			$.modal.alertWarning("图片上传失败。");
+                    		}
+                    	});
+                    }
+                }
+            });
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html b/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html
new file mode 100644
index 000000000..7fc1f1f98
--- /dev/null
+++ b/ruoyi-front/src/main/resources/templates/front/contract_template/edit.html
@@ -0,0 +1,123 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改合同模板')" />
+    <th:block th:include="include :: summernote-css" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-template-edit" th:object="${contractTemplate}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">合同分类id(contract_type表主键id)：</label>
+                <div class="col-sm-8">
+                    <select name="type" class="form-control m-b" required>
+                        <option value="">所有</option>
+                    </select>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">标题：</label>
+                <div class="col-sm-8">
+                    <input name="title" th:field="*{title}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">简介：</label>
+                <div class="col-sm-8">
+                    <input name="introduction" th:field="*{introduction}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">详情内容：</label>
+                <div class="col-sm-8">
+                    <input type="hidden" class="form-control" th:field="*{content}">
+                    <div class="summernote" id="content"></div>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">点击量：</label>
+                <div class="col-sm-8">
+                    <input name="hits" th:field="*{hits}" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">
+                <label class="col-sm-3 control-label is-required">附件下载：</label>
+                <div class="col-sm-8">
+                    <textarea name="enclosureUrl" class="form-control" required>[[*{enclosureUrl}]]</textarea>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">状态：</label>
+                <div class="col-sm-8">
+                    <div class="radio-box">
+                        <input type="radio" name="status" value="">
+                        <label th:for="status" th:text="未知"></label>
+                    </div>
+                    <span class="help-block m-b-none"><i class="fa fa-info-circle"></i> 代码生成请选择字典属性</span>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <th:block th:include="include :: summernote-js" />
+    <script th:inline="javascript">
+        var prefix = ctx + "front/contractTemplate";
+        $("#form-template-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-template-edit').serialize());
+            }
+        }
+
+        $(function() {
+            $('.summernote').each(function(i) {
+                $('#' + this.id).summernote({
+                    lang: 'zh-CN',
+                    callbacks: {
+                        onChange: function(contents, $edittable) {
+                            $("input[name='" + this.id + "']").val(contents);
+                        },
+                        onImageUpload: function(files) {
+							var obj = this;
+							var data = new FormData();
+							data.append("file", files[0]);
+							$.ajax({
+								type: "post",
+								url: ctx + "common/upload",
+								data: data,
+								cache: false,
+								contentType: false,
+								processData: false,
+								dataType: 'json',
+								success: function(result) {
+									if (result.code == web_status.SUCCESS) {
+										$('#' + obj.id).summernote('insertImage', result.url);
+									} else {
+										$.modal.alertError(result.msg);
+									}
+								},
+								error: function(error) {
+									$.modal.alertWarning("图片上传失败。");
+								}
+							});
+						}
+                    }
+                });
+                var content = $("input[name='" + this.id + "']").val();
+                $('#' + this.id).summernote('code', content);
+            })
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract/contract.html b/ruoyi-front/src/main/resources/templates/front/contract_template/template.html
similarity index 57%
rename from ruoyi-front/src/main/resources/templates/front/contract/contract.html
rename to ruoyi-front/src/main/resources/templates/front/contract_template/template.html
index bc64c888e..c1cab019b 100644
--- a/ruoyi-front/src/main/resources/templates/front/contract/contract.html
+++ b/ruoyi-front/src/main/resources/templates/front/contract_template/template.html
@@ -1,7 +1,7 @@
 <!DOCTYPE html>
 <html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
 <head>
-    <th:block th:include="include :: header('合同分类列表')" />
+    <th:block th:include="include :: header('合同模板列表')" />
 </head>
 <body class="gray-bg">
      <div class="container-div">
@@ -11,12 +11,30 @@
                     <div class="select-list">
                         <ul>
                             <li>
-                                <label>分类名称：</label>
-                                <input type="text" name="name"/>
+                                <label>合同分类id(contract_type表主键id)：</label>
+                                <select name="type">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
                             </li>
                             <li>
-                                <label>：</label>
-                                <input type="text" name="englishName"/>
+                                <label>标题：</label>
+                                <input type="text" name="title"/>
+                            </li>
+                            <li>
+                                <label>简介：</label>
+                                <input type="text" name="introduction"/>
+                            </li>
+                            <li>
+                                <label>点击量：</label>
+                                <input type="text" name="hits"/>
+                            </li>
+                            <li>
+                                <label>状态：</label>
+                                <select name="status">
+                                    <option value="">所有</option>
+                                    <option value="-1">代码生成请选择字典属性</option>
+                                </select>
                             </li>
                             <li>
                                 <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
@@ -28,16 +46,16 @@
             </div>
 
             <div class="btn-group-sm" id="toolbar" role="group">
-                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="front:contract:add">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="front:contractTemplate:add">
                     <i class="fa fa-plus"></i> 添加
                 </a>
-                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="front:contract:edit">
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="front:contractTemplate:edit">
                     <i class="fa fa-edit"></i> 修改
                 </a>
-                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:contract:remove">
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:contractTemplate:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:contract:export">
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:contractTemplate:export">
                     <i class="fa fa-download"></i> 导出
                 </a>
             </div>
@@ -48,9 +66,9 @@
     </div>
     <th:block th:include="include :: footer" />
     <script th:inline="javascript">
-        var editFlag = [[${@permission.hasPermi('front:contract:edit')}]];
-        var removeFlag = [[${@permission.hasPermi('front:contract:remove')}]];
-        var prefix = ctx + "front/contract";
+        var editFlag = [[${@permission.hasPermi('front:contractTemplate:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('front:contractTemplate:remove')}]];
+        var prefix = ctx + "front/contractTemplate";
 
         $(function() {
             var options = {
@@ -59,7 +77,7 @@
                 updateUrl: prefix + "/edit/{id}",
                 removeUrl: prefix + "/remove",
                 exportUrl: prefix + "/export",
-                modalName: "合同分类",
+                modalName: "合同模板",
                 columns: [{
                     checkbox: true
                 },
@@ -69,12 +87,32 @@
                     visible: false
                 },
                 {
-                    field: 'name',
-                    title: '分类名称'
+                    field: 'type',
+                    title: '合同分类'
                 },
                 {
-                    field: 'englishName',
-                    title: ''
+                    field: 'title',
+                    title: '标题'
+                },
+                {
+                    field: 'introduction',
+                    title: '简介'
+                },
+                {
+                    field: 'content',
+                    title: '详情内容'
+                },
+                {
+                    field: 'hits',
+                    title: '点击量'
+                },
+                {
+                    field: 'enclosureUrl',
+                    title: '附件下载'
+                },
+                {
+                    field: 'status',
+                    title: '状态'
                 },
                 {
                     field: 'remark',

From 0a4454d909c91928db2a3a77aebb75cc98c7bc43 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com>
Date: Tue, 3 Nov 2020 12:49:29 +0800
Subject: [PATCH 2/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../templates/front/contract_type/add.html    | 49 ++++++++++
 .../templates/front/contract_type/edit.html   | 44 +++++++++
 .../templates/front/contract_type/type.html   | 98 +++++++++++++++++++
 3 files changed, 191 insertions(+)
 create mode 100644 ruoyi-front/src/main/resources/templates/front/contract_type/add.html
 create mode 100644 ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
 create mode 100644 ruoyi-front/src/main/resources/templates/front/contract_type/type.html

diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/add.html b/ruoyi-front/src/main/resources/templates/front/contract_type/add.html
new file mode 100644
index 000000000..d105f9b33
--- /dev/null
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/add.html
@@ -0,0 +1,49 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('新增合同分类')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-type-add">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">分类名称：</label>
+                <div class="col-sm-8">
+                    <input name="name" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">分类英文名称：</label>
+                <div class="col-sm-8">
+                    <input name="englishName" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">删除标志：</label>
+                <div class="col-sm-8">
+                    <input name="delFlag" class="form-control" type="text">
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "front/contractType";
+        $("#form-type-add").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/add", $('#form-type-add').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html b/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
new file mode 100644
index 000000000..8736c0bc8
--- /dev/null
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
@@ -0,0 +1,44 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" >
+<head>
+    <th:block th:include="include :: header('修改合同分类')" />
+</head>
+<body class="white-bg">
+    <div class="wrapper wrapper-content animated fadeInRight ibox-content">
+        <form class="form-horizontal m" id="form-type-edit" th:object="${contractType}">
+            <input name="id" th:field="*{id}" type="hidden">
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">分类名称：</label>
+                <div class="col-sm-8">
+                    <input name="name" th:field="*{name}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label is-required">分类名称：</label>
+                <div class="col-sm-8">
+                    <input name="englishName" th:field="*{englishName}" class="form-control" type="text" required>
+                </div>
+            </div>
+            <div class="form-group">    
+                <label class="col-sm-3 control-label">备注：</label>
+                <div class="col-sm-8">
+                    <input name="remark" th:field="*{remark}" class="form-control" type="text">
+                </div>
+            </div>
+        </form>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var prefix = ctx + "front/contractType";
+        $("#form-type-edit").validate({
+            focusCleanup: true
+        });
+
+        function submitHandler() {
+            if ($.validate.form()) {
+                $.operate.save(prefix + "/edit", $('#form-type-edit').serialize());
+            }
+        }
+    </script>
+</body>
+</html>
\ No newline at end of file
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/type.html b/ruoyi-front/src/main/resources/templates/front/contract_type/type.html
new file mode 100644
index 000000000..a275b7483
--- /dev/null
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/type.html
@@ -0,0 +1,98 @@
+<!DOCTYPE html>
+<html lang="zh" xmlns:th="http://www.thymeleaf.org" xmlns:shiro="http://www.pollix.at/thymeleaf/shiro">
+<head>
+    <th:block th:include="include :: header('合同分类列表')" />
+</head>
+<body class="gray-bg">
+     <div class="container-div">
+        <div class="row">
+            <div class="col-sm-12 search-collapse">
+                <form id="formId">
+                    <div class="select-list">
+                        <ul>
+                            <li>
+                                <label>分类名称：</label>
+                                <input type="text" name="name"/>
+                            </li>
+                            <li>
+                                <label>分类名称：</label>
+                                <input type="text" name="englishName"/>
+                            </li>
+                            <li>
+                                <a class="btn btn-primary btn-rounded btn-sm" onclick="$.table.search()"><i class="fa fa-search"></i>&nbsp;搜索</a>
+                                <a class="btn btn-warning btn-rounded btn-sm" onclick="$.form.reset()"><i class="fa fa-refresh"></i>&nbsp;重置</a>
+                            </li>
+                        </ul>
+                    </div>
+                </form>
+            </div>
+
+            <div class="btn-group-sm" id="toolbar" role="group">
+                <a class="btn btn-success" onclick="$.operate.add()" shiro:hasPermission="front:contractType:add">
+                    <i class="fa fa-plus"></i> 添加
+                </a>
+                <a class="btn btn-primary single disabled" onclick="$.operate.edit()" shiro:hasPermission="front:contractType:edit">
+                    <i class="fa fa-edit"></i> 修改
+                </a>
+                <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:contractType:remove">
+                    <i class="fa fa-remove"></i> 删除
+                </a>
+                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:contractType:export">
+                    <i class="fa fa-download"></i> 导出
+                </a>
+            </div>
+            <div class="col-sm-12 select-table table-striped">
+                <table id="bootstrap-table"></table>
+            </div>
+        </div>
+    </div>
+    <th:block th:include="include :: footer" />
+    <script th:inline="javascript">
+        var editFlag = [[${@permission.hasPermi('front:contractType:edit')}]];
+        var removeFlag = [[${@permission.hasPermi('front:contractType:remove')}]];
+        var prefix = ctx + "front/contractType";
+
+        $(function() {
+            var options = {
+                url: prefix + "/list",
+                createUrl: prefix + "/add",
+                updateUrl: prefix + "/edit/{id}",
+                removeUrl: prefix + "/remove",
+                exportUrl: prefix + "/export",
+                modalName: "合同分类",
+                columns: [{
+                    checkbox: true
+                },
+                {
+                    field: 'id',
+                    title: 'ID',
+                    visible: false
+                },
+                {
+                    field: 'name',
+                    title: '分类名称'
+                },
+                {
+                    field: 'englishName',
+                    title: '分类名称'
+                },
+                {
+                    field: 'remark',
+                    title: '备注'
+                },
+                {
+                    title: '操作',
+                    align: 'center',
+                    formatter: function(value, row, index) {
+                        var actions = [];
+                        actions.push('<a class="btn btn-success btn-xs ' + editFlag + '" href="javascript:void(0)" onclick="$.operate.edit(\'' + row.id + '\')"><i class="fa fa-edit"></i>编辑</a> ');
+                        actions.push('<a class="btn btn-danger btn-xs ' + removeFlag + '" href="javascript:void(0)" onclick="$.operate.remove(\'' + row.id + '\')"><i class="fa fa-remove"></i>删除</a>');
+                        return actions.join('');
+                    }
+                }]
+            };
+            $.table.init(options);
+        });
+    </script>
+</body>
+</html>
\ No newline at end of file

From 51f79bc0f602b8c1115b6fb0dbe8989fa03e27d9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com>
Date: Tue, 3 Nov 2020 13:09:37 +0800
Subject: [PATCH 3/3] =?UTF-8?q?=E5=90=88=E5=90=8C=E5=88=86=E7=B1=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../resources/templates/front/contract_type/add.html | 10 +++++-----
 .../templates/front/contract_type/edit.html          |  6 +++---
 .../templates/front/contract_type/type.html          | 12 ++++++------
 3 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/add.html b/ruoyi-front/src/main/resources/templates/front/contract_type/add.html
index d105f9b33..ca89828fb 100644
--- a/ruoyi-front/src/main/resources/templates/front/contract_type/add.html
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/add.html
@@ -13,23 +13,23 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">分类英文名称：</label>
+                <label class="col-sm-3 control-label is-required">英文名称：</label>
                 <div class="col-sm-8">
                     <input name="englishName" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">    
+           <!-- <div class="form-group">
                 <label class="col-sm-3 control-label">删除标志：</label>
                 <div class="col-sm-8">
                     <input name="delFlag" class="form-control" type="text">
                 </div>
-            </div>
-            <div class="form-group">    
+            </div>-->
+           <!-- <div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
                     <input name="remark" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html b/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
index 8736c0bc8..b91c64426 100644
--- a/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/edit.html
@@ -14,17 +14,17 @@
                 </div>
             </div>
             <div class="form-group">    
-                <label class="col-sm-3 control-label is-required">分类名称：</label>
+                <label class="col-sm-3 control-label is-required">英文名称：</label>
                 <div class="col-sm-8">
                     <input name="englishName" th:field="*{englishName}" class="form-control" type="text" required>
                 </div>
             </div>
-            <div class="form-group">    
+            <!--<div class="form-group">
                 <label class="col-sm-3 control-label">备注：</label>
                 <div class="col-sm-8">
                     <input name="remark" th:field="*{remark}" class="form-control" type="text">
                 </div>
-            </div>
+            </div>-->
         </form>
     </div>
     <th:block th:include="include :: footer" />
diff --git a/ruoyi-front/src/main/resources/templates/front/contract_type/type.html b/ruoyi-front/src/main/resources/templates/front/contract_type/type.html
index a275b7483..3fa2c3632 100644
--- a/ruoyi-front/src/main/resources/templates/front/contract_type/type.html
+++ b/ruoyi-front/src/main/resources/templates/front/contract_type/type.html
@@ -15,7 +15,7 @@
                                 <input type="text" name="name"/>
                             </li>
                             <li>
-                                <label>分类名称：</label>
+                                <label>英文名称：</label>
                                 <input type="text" name="englishName"/>
                             </li>
                             <li>
@@ -37,9 +37,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:contractType:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:contractType:export">
+                <!--<a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:contractType:export">
                     <i class="fa fa-download"></i> 导出
-                </a>
+                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -74,12 +74,12 @@
                 },
                 {
                     field: 'englishName',
-                    title: '分类名称'
+                    title: '分类英文名称'
                 },
-                {
+                /*{
                     field: 'remark',
                     title: '备注'
-                },
+                },*/
                 {
                     title: '操作',
                     align: 'center',