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] =?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',