Merge branch 'master' of http://192.168.1.41:3000/S.H.I.E.L.D./CLDV2.0

company.html

@@ -208,19 +208,238 @@
             <div class="col-xl-12">
               <div id="panel-1" class="panel">
                 <div class="panel-hdr">
+                  <!--地区筛选-->
                   <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" data-toggle="tooltip" data-placement="bottom" title="" data-original-title="搜索"><i class="fal fa-search"></i></button>
+                    <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">省/市/区</button>
+                    <div class="dropdown-menu" style="width:300px">
+                      <ul class="nav nav-tabs nav-tabs-clean justify-content-center" role="tablist">
+                        <li class="nav-item"><a class="nav-link text-center active" data-toggle="tab" href="#tab-province2" role="tab" aria-selected="true">省份</a></li>
+                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-city2" role="tab" aria-selected="false">市区</a></li>
+                        <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-area2" role="tab" aria-selected="false">县区</a></li>
+                      </ul>
+                      <div class="tab-content p-3">
+                        <div class="tab-pane city-item fade active show" id="tab-province2" role="tabpanel" aria-labelledby="tab-province">
+                          <!--东北地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">黑龙江省</button><button type="button" class="btn btn-xs btn-outline-default">吉林省</button><button type="button" class="btn btn-xs btn-outline-default">辽宁省</button></p>
+                          <!--华北地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">北京市</button><button type="button" class="btn btn-xs btn-outline-default">天津市</button><button type="button" class="btn btn-xs btn-outline-default">河北省</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">山西省</button><button type="button" class="btn btn-xs btn-outline-default">内蒙古自治区</button></p>
+                          <!--华中地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">河南省</button><button type="button" class="btn btn-xs btn-outline-default">湖北省</button><button type="button" class="btn btn-xs btn-outline-default">湖南省</button></p>
+                          <!--华东地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">山东省</button><button type="button" class="btn btn-xs btn-outline-default">江苏省</button><button type="button" class="btn btn-xs btn-outline-default">安徽省</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">上海市</button><button type="button" class="btn btn-xs btn-outline-default">浙江省</button><button type="button" class="btn btn-xs btn-outline-default">江西省</button><button type="button" class="btn btn-xs btn-outline-default">福建省</button>
+                              <button
+                                type="button" class="btn btn-xs btn-outline-default">台湾省</button>
+                          </p>
+                          <!--华南地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-primary">广东省</button><button type="button" class="btn btn-xs btn-outline-default">广西壮族自治区</button><button type="button" class="btn btn-xs btn-outline-default">海南省</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">香港特别行政区</button><button type="button" class="btn btn-xs btn-outline-default">澳门特别行政区</button></p>
+                          <!--西北地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">陕西省</button><button type="button" class="btn btn-xs btn-outline-default">甘肃省</button><button type="button" class="btn btn-xs btn-outline-default">宁夏回族自治区</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">青海省</button><button type="button" class="btn btn-xs btn-outline-default">新疆维吾尔自治区</button></p>
+                          <!--西南地区-->
+                          <p class="mb-1"><button type="button" class="btn btn-xs btn-outline-default">四川省</button><button type="button" class="btn btn-xs btn-outline-default">贵州省</button><button type="button" class="btn btn-xs btn-outline-default">云南省</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">重庆市</button><button type="button" class="btn btn-xs btn-outline-default">西藏自治区</button></p>
+                        </div>
+                        <div class="tab-pane city-item fade" id="tab-city2" role="tabpanel" aria-labelledby="tab-city"><button type="button" class="btn btn-xs btn-outline-default">广州市</button><button type="button" class="btn btn-xs btn-outline-default">深圳市</button><button type="button" class="btn btn-xs btn-primary">珠海市</button><button type="button"
+                            class="btn btn-xs btn-outline-default">汕头市</button><button type="button" class="btn btn-xs btn-outline-default">佛山市</button><button type="button" class="btn btn-xs btn-outline-default">韶关市</button><button type="button" class="btn btn-xs btn-outline-default">湛江市</button>
+                          <button
+                            type="button" class="btn btn-xs btn-outline-default">肇庆市</button><button type="button" class="btn btn-xs btn-outline-default">江门市</button><button type="button" class="btn btn-xs btn-outline-default">茂名市</button><button type="button" class="btn btn-xs btn-outline-default">惠州市</button>
+                            <button
+                              type="button" class="btn btn-xs btn-outline-default">梅州市</button><button type="button" class="btn btn-xs btn-outline-default">汕尾市</button><button type="button" class="btn btn-xs btn-outline-default">河源市</button><button type="button" class="btn btn-xs btn-outline-default">阳江市</button>
+                              <button
+                                type="button" class="btn btn-xs btn-outline-default">清远市</button><button type="button" class="btn btn-xs btn-outline-default">东莞市</button><button type="button" class="btn btn-xs btn-outline-default">中山市</button><button type="button" class="btn btn-xs btn-outline-default">潮州市</button>
+                                <button
+                                  type="button" class="btn btn-xs btn-outline-default">揭阳市</button><button type="button" class="btn btn-xs btn-outline-default">云浮市</button></div>
+                        <div class="tab-pane city-item fade" id="tab-area2" role="tabpanel" aria-labelledby="tab-area"><button type="button" class="btn btn-xs btn-primary">香洲区</button><button type="button" class="btn btn-xs btn-outline-default">金湾区</button><button type="button" class="btn btn-xs btn-outline-default">斗门区</button></div>
                       </div>
                     </div>
                   </div>
+                  <!--客户性质-->
                   <div class="col-auto pr-0">
-                    <button class="btn btn-sm btn-default" type="button" data-toggle="modal" data-target="#filter"><i class="fal fa-filter"></i> 筛选</button>
+                    <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" 添加标签="选择标签">客户性质</button>
+                    <div class="dropdown-menu" style="width:320px">
+                      <div class="row m-3">
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline1">
+                          <label class="custom-control-label" for="defaultInline1">设计</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline2">
+                          <label class="custom-control-label" for="defaultInline2">造价管理</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline3">
+                          <label class="custom-control-label" for="defaultInline3">业主</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline4">
+                          <label class="custom-control-label" for="defaultInline4">交通局</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline5">
+                          <label class="custom-control-label" for="defaultInline5">公路局</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline6">
+                          <label class="custom-control-label" for="defaultInline6">审计</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline7">
+                          <label class="custom-control-label" for="defaultInline7">财政</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline8">
+                          <label class="custom-control-label" for="defaultInline8">审核</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline9">
+                          <label class="custom-control-label" for="defaultInline9">施工</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline10">
+                          <label class="custom-control-label" for="defaultInline10">咨询</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline11">
+                          <label class="custom-control-label" for="defaultInline11">招标代理</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline12">
+                          <label class="custom-control-label" for="defaultInline10">监理</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline13">
+                          <label class="custom-control-label" for="defaultInline13">学校</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline14">
+                          <label class="custom-control-label" for="defaultInline14">个人</label>
+                        </div>
+                        <div class="custom-control custom-checkbox custom-control-inline col-4 mr-0 mb-1">
+                          <input type="checkbox" class="custom-control-input" id="defaultInline15">
+                          <label class="custom-control-label" for="defaultInline15">合作伙伴</label>
+                        </div>
+                      </div>
+                    </div>
                   </div>
+                  <!--客户性质(已选择性质)-->
                   <div class="col-auto pr-0">
-                    <span class="btn btn-sm btn-default" ><a href="#filter" class="text-primary" data-toggle="modal" data-target="#filter"><i class="fal fa-filter"></i> 3项</a><a href="#" class="ml-2 text-danger"><i class="fal fa-times"></i></a></span>
+                    <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" 添加标签="选择标签"><span class="float-left text-truncate text-truncate-xs">造价管理,业主,合作伙伴</span></button>
+                  </div>
+                  <!--个人标签-->
+                  <div class="col-auto pr-0">
+                    <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown" 添加标签="选择标签">个人标签</button>
+                    <div class="dropdown-menu dropdown-menu-right" style="width:200px">
+                      <ul class="list-unstyled px-3 pt-2 mb-0">
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-01-s mr-2"></i>标签1</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck1">
+                                  <label class="custom-control-label" for="tabcheck1"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-02-s mr-2"></i>标签2</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck2">
+                                  <label class="custom-control-label" for="tabcheck2"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-03-s mr-2"></i>标签3</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck3">
+                                  <label class="custom-control-label" for="tabcheck3"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-04-s mr-2"></i>标签4</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck4">
+                                  <label class="custom-control-label" for="tabcheck4"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-05-s mr-2"></i>标签5</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck5">
+                                  <label class="custom-control-label" for="tabcheck5"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-06-s mr-2"></i>标签6</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck6">
+                                  <label class="custom-control-label" for="tabcheck6"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                        <li class="mb-1">
+                          <div class="input-group bg-white shadow-inset-2">
+                            <span class="form-control text-truncate text-truncate-lg"><i class="fas fa-circle tagcol-07-s mr-2"></i>标签7</span>
+                            <div class="input-group-append">
+                              <div class="input-group-text  border-left-0 bg-transparent">
+                                <div class="custom-control custom-checkbox">
+                                  <input type="checkbox" class="custom-control-input" id="tabcheck7">
+                                  <label class="custom-control-label" for="tabcheck7"></label>
+                                </div>
+                              </div>
+                            </div>
+                          </div>
+                        </li>
+                      </ul>
+                    </div>
+                  </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="客户名称">
+                      <div class="input-group-append">
+                        <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 ml-auto">
                       <button class="btn btn-sm btn-default dropdown-toggle" data-toggle="dropdown">已显示5列</button>
@@ -280,6 +499,12 @@
                               <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="lie8" checked="">
+                              <label class="custom-control-label" for="lie8">备注</label>
+                            </div>
+                          </li>
                         </ul>
                       </div>
                   </div>
@@ -323,7 +548,7 @@
                     </div>
                   </div>
                   <div class="col-auto pl-0">
-                    <button type="button" class="btn btn-sm btn-primary"><i class="far fa-plus"></i> 公司</button>
+                    <button type="button" class="btn btn-sm btn-primary" data-toggle="modal" data-target="#add-company"><i class="far fa-plus"></i> 客户</button>
                   </div>
                 </div>
                 <div class="panel-container show">
@@ -332,7 +557,7 @@
                     <table class="table table-bordered table-hover table-striped">
                       <thead>
                         <tr>
-                          <th>公司</th>
+                          <th>客户名称</th>
                           <th>地区</th>
                           <th>标签</th>
                           <th>联系人</th>
@@ -1338,6 +1563,13 @@
                         <div class="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
                       </div>
                     </div>
+                    <div class="cldform-line"></div>
+                    <div class="cldform-item">
+                      <div class="cldform-label">备注</div>
+                      <div class="cldform-control">
+                        <div class="cldform-contarl-box cldform-contarl-textareabox text-muted"><span>填写文本内容</span></div>
+                      </div>
+                    </div>
                   </div>
                 </div>
               </div>
@@ -2231,13 +2463,13 @@
       </div>
     </div>
   </div>
-  <!--BEGIN 添加 新公司-->
+  <!--BEGIN 添加 新客户-->
   <div class="modal fade" id="add-company" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-lg">
       <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>
@@ -2246,14 +2478,14 @@
         <div class="modal-body">
           <div class="cldform clearfix">
             <div class="cldform-item">
-              <div class="cldform-label text-danger">公司全称</div>
+              <div class="cldform-label text-danger">客户全称</div>
               <div class="cldform-control">
                 <textarea class="cldform-contarl-textarea" style="height:36px;width:100%" placeholder="必填项"></textarea>
               </div>
             </div>
             <div class="cldform-line"></div>
             <div class="cldform-item cldform-item-wauto">
-              <div class="cldform-label text-danger">公司地区</div>
+              <div class="cldform-label text-danger">客户地区</div>
               <div class="cldform-control">
                 <div class="cldform-contarl-box cldform-contarl-textareabox" data-toggle="dropdown"><span class="cldform-contarl-dropdown">省 / 市 / 区<i class="far fa-map-marker-alt mt-1"></i></span></div>
                 <div class="dropdown-menu" style="width:300px">
@@ -2306,7 +2538,7 @@
             </div>
             <div class="cldform-line"></div>
             <div class="cldform-item">
-              <div class="cldform-label">公司性质</div>
+              <div class="cldform-label">客户性质</div>
               <div class="cldform-control">
                 <div class="cldform-control-checkbox">
                   <div class="custom-control custom-checkbox custom-control-inline">
@@ -2374,14 +2606,14 @@
             </div>
             <div class="cldform-line"></div>
             <div class="cldform-item">
-              <div class="cldform-label">公司地址</div>
+              <div class="cldform-label">客户地址</div>
               <div class="cldform-control">
                 <textarea class="cldform-contarl-textarea" style="height:36px;width:100%"></textarea>
               </div>
             </div>
             <div class="cldform-line"></div>
             <div class="cldform-item cldform-item-half pr-3">
-              <div class="cldform-label">公司传真</div>
+              <div class="cldform-label">客户传真</div>
               <div class="cldform-control">
                 <textarea class="cldform-contarl-textarea" style="height:36px;width:100%"></textarea>
               </div>
@@ -2421,8 +2653,7 @@
         </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>
-          <button type="button" class="btn btn-primary waves-effect waves-themed">添加并关联</button>
+          <button type="button" class="btn btn-primary waves-effect waves-themed">添加</button>
         </div>
       </div>
     </div>
@@ -2521,7 +2752,7 @@
           </div>
       </div>
   </div>
-    <!--BEGIN 筛选-->
+  <!--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">
@@ -2743,7 +2974,7 @@
         </div>
       </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

css/cld-custom.css

@@ -199,7 +199,7 @@
   background-color:#8E44AD;
 }
 .tagcol-04{
-  background-color:#f90000;
+  background-color:#CC3333;
 }
 .tagcol-05{
   background-color:#B8651B;
@@ -210,7 +210,6 @@
 .tagcol-07{
   background-color:#efd200;
 }
-
 .tagcol-01-s{
   color:#16A085;
 }
@@ -232,7 +231,50 @@
 .tagcol-07-s{
   color:#efd200;
 }
-.tagcol-01,.tagcol-02,.tagcol-03,.tagcol-04,.tagcol-05,.tagcol-06,.tagcol-07,.tagcol-08{
+.tagcol-11{
+  background-color:#F8AC59;
+}
+.tagcol-12{
+  background-color:#FF69B4;
+}
+.tagcol-13{
+  background-color:#999999;
+}
+.tagcol-14{
+  background-color:#00D8FF;
+}
+.tagcol-15{
+  background-color:#009000;
+}
+.tagcol-16{
+  background-color:#9933CC;
+}
+.tagcol-17{
+  background-color:#996633;
+}
+.tagcol-11-s{
+  color:#F8AC59;
+}
+.tagcol-12-s{
+  color:#FF69B4;
+}
+.tagcol-13-s{
+  color:#999999;
+}
+.tagcol-14-s{
+  color:#00D8FF;
+}
+.tagcol-15-s{
+  color:#009000;
+}
+.tagcol-16-s{
+  color:#9933CC;
+}
+.tagcol-17-s{
+  color:#996633;
+}
+.tagcol-01,.tagcol-02,.tagcol-03,.tagcol-04,.tagcol-05,.tagcol-06,.tagcol-07,.tagcol-08,.tagcol-11,.tagcol-12,.tagcol-13,.tagcol-14,.tagcol-15,.tagcol-16,.tagcol-17,.tagcol-18{
   color:#fff;
   margin:0 1px;
+  line-height:10px;
 }