From a66a8de9e35c3080c2068b110f34c5ae05ae5bbf Mon Sep 17 00:00:00 2001
From: zkr_liushenlu <liushenlu@sinosoft.com.cn>
Date: Tue, 6 Apr 2021 16:56:49 +0800
Subject: [PATCH] =?UTF-8?q?=E6=96=87=E7=AB=A0=E7=AE=A1=E7=90=86=E7=82=B9?=
 =?UTF-8?q?=E5=87=BB=E9=87=8F=E6=9F=A5=E8=AF=A2=E9=80=BB=E8=BE=91=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../content/article/articleManage.html        |  6 +-
 .../templates/content/column/column.html      | 70 ++++++++++---------
 2 files changed, 39 insertions(+), 37 deletions(-)

diff --git a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
index 8056d2f94..90ccbe510 100644
--- a/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
+++ b/ruoyi-content/src/main/resources/templates/content/article/articleManage.html
@@ -210,19 +210,19 @@
                                 </select>
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">必须授权才能观看：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isAuthorization" style="margin-top: 9px;">
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">是否添加预约按钮：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isReserve" style="margin-top: 9px;">
                             </div>
                         </div>
-                        <div class="form-group">
+                        <div class="form-group" style="display: none;">
                             <label class="col-sm-4 control-label">优选活动报名：</label>
                             <div class="col-sm-8">
                                 <input type="checkbox" id="isJoinActive" style="margin-top: 9px;">
diff --git a/ruoyi-content/src/main/resources/templates/content/column/column.html b/ruoyi-content/src/main/resources/templates/content/column/column.html
index cd36f518c..8fd8e91e7 100644
--- a/ruoyi-content/src/main/resources/templates/content/column/column.html
+++ b/ruoyi-content/src/main/resources/templates/content/column/column.html
@@ -187,7 +187,8 @@
                         <div class="form-group" style="display:none" id="secSelect">
                             <label class="col-sm-4 control-label">所属栏目:</label>
                             <div class="col-sm-6">
-                                <select class="selectpicker form-control" th:id="cType" name="cType"></select>
+                                <!--                                <select class="selectpicker form-control" th:id="cType" name="cType"></select>-->
+                                <input th:hidden="true" th:id="cType" name="cType">
                             </div>
                         </div>
 
@@ -590,6 +591,7 @@
         var rowData = $("#" + table.options.id).bootstrapTable('getRowByUniqueId', id);
         $("#cName").val(rowData.codeCname);
         $("#cOrderNo").val(rowData.orderNo);
+        $("#cType").val(rowData.codeType);
         // 处理公司下拉框
         $("#branchIdEdit option").remove();
         $.ajax({
@@ -617,39 +619,39 @@
         })
 
         // 处理一级栏目下拉
-        $("#cType option").remove();
-        var objc = [];
-        if (rowData.codeType.indexOf("文库-") == -1) {
-            $("#secSelect").hide();
-            objc = baseDataList;
-            for (var i = 0; i < objc.length; i++) {
-                var codeType = rowData.codeType;
-                if (objc[i].codeCname == codeType) {
-                    $("#cType").append(
-                        "<option selected=\"true\" value='" + objc[i].codeCode
-                        + "'>" + objc[i].codeCname + "</option>");
-                } else {
-                    $("#cType").append(
-                        "<option value='" + objc[i].codeCode + "'>"
-                        + objc[i].codeCname + "</option>");
-                }
-            }
-        } else {
-            objc = articleSecList;
-            $("#secSelect").show();
-            for (var i = 0; i < objc.length; i++) {
-                var codeType = rowData.codeType.split("-")[1];
-                if (objc[i].codeCname == codeType) {
-                    $("#cType").append(
-                        "<option selected=\"true\" value='" + objc[i].codeCode
-                        + "'>" + objc[i].codeCname + "</option>");
-                } else {
-                    $("#cType").append(
-                        "<option value='" + objc[i].codeCode + "'>"
-                        + objc[i].codeCname + "</option>");
-                }
-            }
-        }
+        // $("#cType option").remove();
+        // var objc = [];
+        // if (rowData.codeType.indexOf("文库-") == -1) {
+        //     $("#secSelect").hide();
+        //     objc = baseDataList;
+        //     for (var i = 0; i < objc.length; i++) {
+        //         var codeType = rowData.codeType;
+        //         if (objc[i].codeCode == codeType) {
+        //             $("#cType").append(
+        //                 "<option selected=\"true\" value='" + objc[i].codeCode
+        //                 + "'>" + objc[i].codeCname + "</option>");
+        //         } else {
+        //             $("#cType").append(
+        //                 "<option value='" + objc[i].codeCode + "'>"
+        //                 + objc[i].codeCname + "</option>");
+        //         }
+        //     }
+        // } else {
+        //     objc = articleSecList;
+        //     $("#secSelect").show();
+        //     for (var i = 0; i < objc.length; i++) {
+        //         var codeType = rowData.codeType.split("-")[1];
+        //         if (objc[i].codeCode == codeType) {
+        //             $("#cType").append(
+        //                 "<option selected=\"true\" value='" + objc[i].codeCode
+        //                 + "'>" + objc[i].codeCname + "</option>");
+        //         } else {
+        //             $("#cType").append(
+        //                 "<option value='" + objc[i].codeCode + "'>"
+        //                 + objc[i].codeCname + "</option>");
+        //         }
+        //     }
+        // }
     };
 
     // 编辑后保存操作