From f71d2a9a42ea8cb17589523781272d4be47b5b97 Mon Sep 17 00:00:00 2001
From: caishi <1149225589@qq.com>
Date: Fri, 24 May 2019 14:54:16 +0800
Subject: [PATCH] =?UTF-8?q?=E6=9D=83=E9=99=90=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../_partner_addControlTeam.html.erb          | 23 ++++++++++++++++++
 .../_partner_controlManage.html.erb           | 24 +++++++++++++++++--
 app/views/cooperates/partner_list.html.erb    | 11 ++++++---
 public/stylesheets/educoder/edu-all.css       |  2 +-
 4 files changed, 54 insertions(+), 6 deletions(-)
 create mode 100644 app/views/cooperates/_partner_addControlTeam.html.erb

diff --git a/app/views/cooperates/_partner_addControlTeam.html.erb b/app/views/cooperates/_partner_addControlTeam.html.erb
new file mode 100644
index 00000000..acf978bf
--- /dev/null
+++ b/app/views/cooperates/_partner_addControlTeam.html.erb
@@ -0,0 +1,23 @@
+<div class="task-popup" style="width:480px;"><div class="task-popup-title clearfix">新建</div>
+  <li class="df pl30 pr30 pt30">
+    <span class="fl mr10 mt4">名称:</span>
+    <div class="flex1">
+      <input type="text" class="input-100-35" maxlength="20" name="controlName" placeholder="请输入名称"/>
+      <p style="height: 20px;line-height: 20px"><span class="notice_input color-orange-tip none"></span></p>
+    </div>
+  </li>
+
+  <div class="task-popup-OK clearfix">
+    <a href="javascript:void(0);" onclick="hideModal();" class="task-btn mr20">取消</a>
+    <a href="javascript:void(0)" class="task-btn task-btn-orange" onclick="saveTeam();">保存</a>
+  </div>
+</div>
+<script>
+  function saveTeam(){
+      var name=$("input[name='controlName']").val();
+      if(name == ""){
+          $(".notice_input").html("请输入名称").removeClass("none");
+          return;
+      }
+  }
+</script>
diff --git a/app/views/cooperates/_partner_controlManage.html.erb b/app/views/cooperates/_partner_controlManage.html.erb
index 10bb7fd4..8369f80c 100644
--- a/app/views/cooperates/_partner_controlManage.html.erb
+++ b/app/views/cooperates/_partner_controlManage.html.erb
@@ -1,6 +1,6 @@
 <p class="clearfix padding20-30 edu-back-white mb20">
   <span class="fl font-16 lineh-40">共<span class="color-orange-tip">2</span>个权限组</span>
-  <a class="fr addControl" href="">
+  <a class="fr addControl" href="javascript:void(0)" onclick="addControlTeam();">
     <i class="iconfont icon-tianjiachengyuan color-blue font-16 mr5"></i>新增权限组
   </a>
 </p>
@@ -25,4 +25,24 @@
     </div>
   </ul>
   </div>
-</div>
\ No newline at end of file
+</div>
+<div class="edu-back-white">
+  <p class="bor-bottom-greyE padding20-30 clearfix">
+    <span class="font-16 fl mt3">本科学校组</span>
+    <span class="fl ml3 mt5">(访问权限范围：客户列表中“权限控制”勾选了本组的客户)</span>
+    <span class="fr">
+      <!--删除整组-->
+      <a href="javascript:void(0)" onclick="notice_operation_box('','是否确认删除?','确定')" class="mr20"><i class="iconfont icon-shanchu font-18 color-greey-9"></i></a>
+    </span>
+  </p>
+  <div>
+    <!--内容同上-->
+  </div>
+</div>
+
+<script>
+  function addControlTeam(){
+      var html="<%= j(render :partial => 'cooperates/partner_addControlTeam') %>";
+      pop_box_new(html,400,300);
+  }
+</script>
\ No newline at end of file
diff --git a/app/views/cooperates/partner_list.html.erb b/app/views/cooperates/partner_list.html.erb
index 91fe2363..3c73ad0d 100644
--- a/app/views/cooperates/partner_list.html.erb
+++ b/app/views/cooperates/partner_list.html.erb
@@ -3,7 +3,7 @@
       <li class="active"><a href="javascript:void(0)">客户列表</a></li>
       <li><a href="javascript:void(0)">权限管理</a></li>
     </ul>
-  <% if false %>
+  <div class="tabMenuContent">
     <div class="clearfix padding20-30 bor-bottom-greyE edu-back-white">
       <span class="fl font-12 mt5">
         <span class="color-orange-tip mr3" id="search_partner_count"><%= @obj_count %></span>
@@ -18,8 +18,10 @@
     <div class="ListTableLine ListTableLines edu-back-white" id="partner_school_list">
       <%= render :partial => "partner_item" %>
     </div>
-      <% end %>
-  <%= render :partial => "partner_controlManage" %>
+  </div>
+  <div class="tabMenuContent none">
+    <%= render :partial => "partner_controlManage" %>
+  </div>
 </div>
 
 <script>
@@ -27,6 +29,9 @@
         $(".tabMenu").on("click","li",function(){
             $(".tabMenu li").removeClass("active")
             $(this).addClass("active");
+            var index=$(this).index();
+            $(".tabMenuContent").addClass("none");
+            $(".tabMenuContent").eq(index).removeClass("none");
         })
 
         $("#pollingPanel").on("keydown", "input[name='search']", function(e){
diff --git a/public/stylesheets/educoder/edu-all.css b/public/stylesheets/educoder/edu-all.css
index 2a891d0b..8d7a8ead 100644
--- a/public/stylesheets/educoder/edu-all.css
+++ b/public/stylesheets/educoder/edu-all.css
@@ -3146,7 +3146,7 @@ line-height: 20px;display: inline-block;color: rgba(65, 140, 205, 1) !important;
 .tabMenu li.active a{color: #4cacff}
 
 /*权限管理*/
-.addControl{padding: 0px 15px;border:1px solid #4cacff;color: #4cacff;border-radius: 20px;height: 40px;line-height: 40px;}
+.addControl{padding: 0px 15px;border:1px solid #4cacff;color: #4cacff!important;border-radius: 20px;height: 40px;line-height: 40px;}
 /*用户列表*/
 .managerPanels a{margin-right:24px;}
 .managerPanels a:nth-child(16n){margin-right: 0px;}