From 01c74da3b8cb3e5f95e4cf41c8fdcd99c0d4aae2 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E4=B8=81=E7=91=9E=E8=B6=85?= <281809423@qq.com>
Date: Wed, 4 Nov 2020 18:11:31 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9C=8D=E5=8A=A1=E7=BB=84=E7=BB=87?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../front/organization/organization.html      | 54 +++++++++----------
 1 file changed, 27 insertions(+), 27 deletions(-)

diff --git a/ruoyi-front/src/main/resources/templates/front/organization/organization.html b/ruoyi-front/src/main/resources/templates/front/organization/organization.html
index 9de14a2e0..7d9a8310a 100644
--- a/ruoyi-front/src/main/resources/templates/front/organization/organization.html
+++ b/ruoyi-front/src/main/resources/templates/front/organization/organization.html
@@ -14,44 +14,44 @@
                                 <label>企业名称：</label>
                                 <input type="text" name="name"/>
                             </li>
-                            <li>
+                           <!-- <li>
                                 <label>联系人：</label>
                                 <input type="text" name="contacts"/>
                             </li>
                             <li>
                                 <label>联系电话：</label>
                                 <input type="text" name="phone"/>
-                            </li>
-                            <li>
+                            </li>-->
+                           <!-- <li>
                                 <label>标题：</label>
                                 <input type="text" name="title"/>
                             </li>
                             <li>
                                 <label>简介：</label>
                                 <input type="text" name="introduction"/>
-                            </li>
-                            <li>
+                            </li>-->
+                            <!--<li>
                                 <label>点击量：</label>
                                 <input type="text" name="hits"/>
+                            </li>-->
+                            <li>
+                                <label>审核状态：</label>
+                                    <select name="auditStatus" th:with="type=${@dict.getType('audit_status')}">
+                                        <option value="">所有</option>
+                                        <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
+                                    </select>
                             </li>
                             <li>
                                 <label>状态：</label>
-                                <select name="auditStatus">
+                                <select name="status" th:with="type=${@dict.getType('sys_normal_disable')}">
                                     <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
+                                    <option th:each="dict : ${type}" th:text="${dict.dictLabel}" th:value="${dict.dictValue}"></option>
                                 </select>
                             </li>
-                            <li>
-                                <label>状态：</label>
-                                <select name="status">
-                                    <option value="">所有</option>
-                                    <option value="-1">代码生成请选择字典属性</option>
-                                </select>
-                            </li>
-                            <li>
+                           <!-- <li>
                                 <label>审核者：</label>
                                 <input type="text" name="checkBy"/>
-                            </li>
+                            </li>-->
                             <li class="select-time">
                                 <label>审核时间：</label>
                                 <input type="text" class="time-input" id="startTime" placeholder="开始时间" name="params[beginCheckTime]"/>
@@ -77,9 +77,9 @@
                 <a class="btn btn-danger multiple disabled" onclick="$.operate.removeAll()" shiro:hasPermission="front:organization:remove">
                     <i class="fa fa-remove"></i> 删除
                 </a>
-                <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:organization:export">
+               <!-- <a class="btn btn-warning" onclick="$.table.exportExcel()" shiro:hasPermission="front:organization:export">
                     <i class="fa fa-download"></i> 导出
-                </a>
+                </a>-->
             </div>
             <div class="col-sm-12 select-table table-striped">
                 <table id="bootstrap-table"></table>
@@ -122,31 +122,31 @@
                 },
                 {
                     field: 'licenseUrl',
-                    title: '营业执照图片地址'
+                    title: '营业执照'
                 },
-                {
+               /* {
                     field: 'title',
                     title: '标题'
-                },
-                {
+                },*/
+              /*  {
                     field: 'introduction',
                     title: '简介'
-                },
-                {
+                },*/
+                /*{
                     field: 'content',
                     title: '机构详情内容'
-                },
+                },*/
                 {
                     field: 'hits',
                     title: '点击量'
                 },
                 {
                     field: 'auditStatus',
-                    title: '状态'
+                    title: '审核状态'
                 },
                 {
                     field: 'pictureUrl',
-                    title: '图片地址'
+                    title: '图片'
                 },
                 {
                     field: 'status',