提交

contact.html

@@ -209,92 +209,134 @@
               <div id="panel-1" class="panel">
                 <div class="panel-hdr">
                   <div class="col-auto pr-0">
-                    <button class="btn btn-sm btn-default" type="button"><i class="fal fa-search"></i></button>
-                  </div>
-                  <div class="col-auto pr-0">
                     <div class="input-group input-group-sm bg-white shadow-inset-2">
                       <input type="text" class="form-control bg-transparent" placeholder="姓名/公司/手机/QQ">
                       <div class="input-group-append">
-                        <button class="btn btn-default waves-effect waves-themed" type="button"><i class="fal fa-search"></i></button>
+                        <button class="btn btn-default waves-effect waves-themed" type="button" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="搜索"><i class="fal fa-search"></i></button>
                       </div>
                     </div>
                   </div>
                   <div class="col-auto pr-0">
-                    <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示5列</button>
-                    <div class="dropdown-menu">
+                    <button class="btn btn-sm btn-default" type="button" data-toggle="modal" data-target="#filter"><i class="fal fa-filter"></i> 筛选</button>
+                  </div>
+                  <div class="col-auto ml-auto">
+                      <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示5列</button>
+                      <div class="dropdown-menu">
+                        <ul class="list-unstyled px-3 pt-2 mb-0">
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie1">
+                              <label class="custom-control-label" for="lie1">手机</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie2">
+                              <label class="custom-control-label" for="lie2">电话</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie3">
+                              <label class="custom-control-label" for="lie3">QQ</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie4" checked="">
+                              <label class="custom-control-label" for="lie4">部门</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie5">
+                              <label class="custom-control-label" for="lie5">职务</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie6">
+                              <label class="custom-control-label" for="lie6">办公室</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie7">
+                              <label class="custom-control-label" for="lie7">地区</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie8" checked="">
+                              <label class="custom-control-label" for="lie8">个人标签</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie10" checked="">
+                              <label class="custom-control-label" for="lie10">软件锁</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie11" checked="">
+                              <label class="custom-control-label" for="lie11">大司空</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie12" checked="">
+                              <label class="custom-control-label" for="lie12">养护云</label>
+                            </div>
+                          </li>
+                          <li class="mb-2">
+                            <div class="custom-control custom-switch">
+                              <input type="checkbox" class="custom-control-input" id="lie12" checked="">
+                              <label class="custom-control-label" for="lie12">创建人</label>
+                            </div>
+                          </li>
+                        </ul>
+                      </div>
+                  </div>
+                  <div class="col-auto pl-0">
+                    <button class="btn btn-sm btn-default" data-toggle="dropdown"><i class="fal fa-sort-amount-down"></i> 排序</button>
+                    <div class="dropdown-menu dropdown-menu-right" id="paixu">
                       <ul class="list-unstyled px-3 pt-2 mb-0">
                         <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie1">
-                            <label class="custom-control-label" for="lie1">手机</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie2">
-                            <label class="custom-control-label" for="lie2">电话</label>
+                          <div class="custom-control custom-radio">
+                            <input type="radio" class="custom-control-input" id="pai1" name="paizhi" checked="">
+                            <label class="custom-control-label" for="pai1">添加时间</label>
                           </div>
                         </li>
                         <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie3">
-                            <label class="custom-control-label" for="lie3">QQ</label>
+                          <div class="custom-control custom-radio">
+                            <input type="radio" class="custom-control-input" id="pai2" name="paizhi">
+                            <label class="custom-control-label" for="pai2">编辑时间</label>
                           </div>
                         </li>
                         <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie4" checked="">
-                            <label class="custom-control-label" for="lie4">部门</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie5">
-                            <label class="custom-control-label" for="lie5">职务</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie6">
-                            <label class="custom-control-label" for="lie6">办公室</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie7">
-                            <label class="custom-control-label" for="lie7">地区</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie8" checked="">
-                            <label class="custom-control-label" for="lie8">个人标签</label>
-                          </div>
-                        </li>
-                        <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie10" checked="">
-                            <label class="custom-control-label" for="lie10">软件锁</label>
+                          <div class="custom-control custom-radio">
+                            <input type="radio" class="custom-control-input" id="pai3" name="paizhi">
+                            <label class="custom-control-label" for="pai3">记录时间</label>
                           </div>
                         </li>
+                      </ul>
+                      <ul class="list-unstyled px-3 pt-2 mb-0 border-top">
                         <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie11" checked="">
-                            <label class="custom-control-label" for="lie11">大司空</label>
+                          <div class="custom-control custom-radio">
+                            <input type="radio" class="custom-control-input" id="pdown" name="paixu" checked="">
+                            <label class="custom-control-label" for="pdown">降序</label>
                           </div>
                         </li>
                         <li class="mb-2">
-                          <div class="custom-control custom-switch">
-                            <input type="checkbox" class="custom-control-input" id="lie12" checked="">
-                            <label class="custom-control-label" for="lie12">养护云</label>
+                          <div class="custom-control custom-radio">
+                            <input type="radio" class="custom-control-input" id="pup" name="paixu">
+                            <label class="custom-control-label" for="pup">升序</label>
                           </div>
                         </li>
                       </ul>
                     </div>
                   </div>
-                  <div class="ml-auto">
-                    <button class="btn btn-sm btn-default" type="button"><i class="fal fa-filter"></i></button>
-                  </div>
                 </div>
                 <div class="panel-container show">
                   <!--数据内容区-->
@@ -306,12 +348,13 @@
                           <th>公司</th>
                           <th>部门</th>
                           <th>个人标签</th>
+                          <th>软件锁</th>
                         </tr>
                       </thead>
                       <tbody>
-                        <tr class="pointer-hover" data-toggle="modal" data-target="#detail">
-                          <td>张三8</td>
-                          <td>xxxx公司</td>
+                        <tr>
+                          <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                          <td><a href="#com-detail" data-toggle="modal" data-target="#com-detail">xxxx公司</a></td>
                           <td>部门1</td>
                           <td><span class="badge tagcol-01">标签</span><span class="badge tagcol-02">特别关注</span>
                             <!--添加标签--><a title="添加标签" class="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i class="far fa-plus"></i></a>
@@ -446,10 +489,11 @@
                               </ul>
                             </div><!--添加标签 end-->
                           </td>
+                          <td><a href="#lock-detail" data-toggle="modal" data-target="#lock-detail">HNYH-0654</a></td>
                         </tr>
-                        <tr uclass="pointer-hover" data-toggle="modal" data-target="#detail">
-                          <td>张三8</td>
-                          <td>xxxx公司</td>
+                        <tr>
+                          <td><a href="#detail" data-toggle="modal" data-target="#detail">张三8</a></td>
+                          <td><a href="#com-detail" data-toggle="modal" data-target="#com-detail">xxxx公司</a></td>
                           <td>部门1</td>
                           <td>
                             <!--添加标签--><a title="添加标签" class="badge badge-secondary tagcol-08" href="" data-toggle="dropdown"><i class="far fa-plus"></i></a>
@@ -584,6 +628,7 @@
                               </ul>
                             </div><!--添加标签 end-->
                           </td>
+                          <td></td>
                         </tr>
                       </tbody>
                     </table>
@@ -1888,12 +1933,10 @@
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">
-                        										确认升级
-                        									</h4>
+          <h4 class="modal-title">确认升级</h4>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
+            <span aria-hidden="true"><i class="fal fa-times"></i></span>
+          </button>
         </div>
         <div class="modal-body">
           为用户 <b>15811111111,张三</b> 升级 <b>广东养护(2018)专业版</b>
@@ -1910,12 +1953,10 @@
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">
-                        										确认移除
-                        									</h4>
+          <h4 class="modal-title">确认移除</h4>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
+            <span aria-hidden="true"><i class="fal fa-times"></i></span>
+          </button>
         </div>
         <div class="modal-body">
           为联系人 <b>张三</b> 移除 <b>珠海纵横创新软件有限公司</b>
@@ -1932,12 +1973,10 @@
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">
-                        										确认移除
-                        									</h4>
+          <h4 class="modal-title">确认移除</h4>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
+              <span aria-hidden="true"><i class="fal fa-times"></i></span>
+          </button>
         </div>
         <div class="modal-body">
           为通行账号 <b>15800000001</b> 移除联系人 <b>张三</b>
@@ -1954,12 +1993,10 @@
     <div class="modal-dialog modal-dialog-centered">
       <div class="modal-content">
         <div class="modal-header">
-          <h4 class="modal-title">
-                        										添加服务记录
-                        									</h4>
+          <h4 class="modal-title">添加服务记录</h4>
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
+            <span aria-hidden="true"><i class="fal fa-times"></i></span>
+          </button>
         </div>
         <div class="modal-body">
           <!--单位下添加服务记录-->
@@ -2562,6 +2599,24 @@
           </div>
       </div>
   </div>
+    <!--BEGIN 筛选-->
+  <div class="modal fade" id="filter" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">筛选</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"><i class="fal fa-times"></i></span></button>
+        </div>
+        <div class="modal-body">
+
+        </div>
+        <div class="modal-footer">
+          <button type="button" class="btn btn-secondary waves-effect waves-themed" data-dismiss="modal">关闭</button>
+          <button type="button" class="btn btn-primary waves-effect waves-themed">确定</button>
+        </div>
+      </div>
+    </div>
+  </div>
 </body>
 <!-- base vendor bundle:
 		 DOC: if you remove pace.js from core please note on Internet Explorer some CSS animations may execute before a page is fully loaded, resulting 'jump' animations
@@ -2586,34 +2641,29 @@
 </script>-->
 <script type="text/javascript">
   autoFlashHeight();
-</script>
-<script type="text/javascript">
   $('.slimScroll1').slimScroll({
     position: 'right',
     height: 'auto',
     railVisible: true
   });
-</script>
-<script type="text/javascript">
   $('.slimScrol2').slimScroll({
     position: 'right',
     height: 'auto',
     railVisible: true
   });
-</script>
-<script type="text/javascript">
   $('.slimScrol3').slimScroll({
     position: 'right',
     height: 'auto',
     railVisible: true
   });
-</script>
-<script type="text/javascript">
   $('.slimScrol4').slimScroll({
     position: 'right',
     height: 'auto',
     railVisible: true
   });
 </script>
+<script>
 
+
+  </script>
 </html>

css/cld-custom.css

@@ -186,7 +186,7 @@
   width:100%;
   z-index:999;
 }
-.custom-checkbox .custom-control-label,.custom-radio .custom-control-label{
+.custom-checkbox .custom-control-label,.custom-radio .custom-control-label,.custom-switch .custom-control-label{
   cursor: pointer;
 }
 .tagcol-01{