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

# Conflicts:
#	lock-client.html

contact.html

@@ -1797,11 +1797,12 @@
         </div>
         <div class="modal-search-height border-top border-bottom">
           <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该公司" data-original-title="点击关联该公司">
-              <div class="row">
-                <div class="col-7 pr-0">珠海纵横创新软件有限公司</div>
-                <div class="col-5 pr-0">广东省,珠海市,香洲区</div>
-              </div>
+            <div class="card p-3 mb-3" title="点击关联该公司">
+                <div class="row">
+                    <div class="col-6 pr-0">珠海纵横创新软件有限公司</div>
+                    <div class="col-4 pr-0">广东省,珠海市,香洲区</div>
+                    <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                </div>
             </div>
           </div>
         </div>
@@ -2024,7 +2025,7 @@
       </div>
     </div>
   </div>
-  <!--BEGIN 关联软件锁-->
+  <!--BEGIN 绑定软件锁-->
   <div class="modal fade" id="add-lock" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-lg">
       <div class="modal-content clearfix">
@@ -2066,32 +2067,36 @@
         </div>
         <div class="modal-search-height border-top">
           <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
+            <div class="card p-3 mb-3" title="点击「借出」该锁">
               <div class="row">
                 <div class="col-2 pr-0">ZH-03876</div>
                 <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+                <div class="col-1 pr-0">接收</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
               </div>
             </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
+            <div class="card p-3 mb-3" title="点击「借出」该锁" >
               <div class="row">
                 <div class="col-2 pr-0">ZH-03877</div>
                 <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+                <div class="col-1 pr-0">接收</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
               </div>
             </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
+            <div class="card p-3 mb-3" title="点击「借出」该锁">
               <div class="row">
                 <div class="col-2 pr-0">ZH-03878</div>
                 <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+                <div class="col-1 pr-0">接收</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
               </div>
             </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
+            <div class="card p-3 mb-3" title="点击「借出」该锁">
               <div class="row">
                 <div class="col-2 pr-0">ZH-03879</div>
                 <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+                <div class="col-1 pr-0">接收</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
               </div>
             </div>
           </div>

lock-ccount.html

@@ -1418,747 +1418,7 @@
       </div>
     </div>
   </div>
-  <!--BEGIN 关联CLD联系人-->
-  <div class="modal fade" id="linkcld" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-lg">
-      <div class="modal-content clearfix">
-        <div class="dialog-sheet">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
-          <div class="m-4">
-            <div class="input-group bg-white shadow-inset-2">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        												<i class="fal fa-search"></i>
-                        											</span>
-              </div>
-              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索联系人（姓名、手机、QQ、公司名称）">
-            </div>
-          </div>
-        </div>
-        <div class="modal-search-height border-top border-bottom">
-          <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该联系人" data-original-title="点击关联该联系人">
-              <div class="row">
-                <div class="col-1 pr-0">张三</div>
-                <div class="col-2 pr-0">处长</div>
-                <div class="col-2 pr-0">15800000001</div>
-                <div class="col-2 pr-0">1231233</div>
-                <div class="col-4 pr-0">珠海纵横创新软件有限公司</div>
-              </div>
-            </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该联系人" data-original-title="点击关联该联系人">
-              <div class="row">
-                <div class="col-1 pr-0">张三</div>
-                <div class="col-2 pr-0"></div>
-                <div class="col-2 pr-0">15800000001</div>
-                <div class="col-2 pr-0">1231233</div>
-                <div class="col-4 pr-0">珠海纵横创新软件有限公司</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="m-4">
-          <a href="#add-contact" data-toggle="modal" data-target="#add-contact" class="btn btn-sm btn-outline-primary"><i class="far fa-plus"></i> 添加新联系人</a>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--BEGIN 关联公司-->
-  <div class="modal fade" id="link-com" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-lg">
-      <div class="modal-content clearfix">
-        <div class="dialog-sheet">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
-          <div class="m-4">
-            <div class="input-group bg-white shadow-inset-2">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        												<i class="fal fa-search"></i>
-                        											</span>
-              </div>
-              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索公司">
-            </div>
-          </div>
-        </div>
-        <div class="modal-search-height border-top border-bottom">
-          <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该公司" data-original-title="点击关联该公司">
-              <div class="row">
-                <div class="col-7 pr-0">珠海纵横创新软件有限公司</div>
-                <div class="col-5 pr-0">广东省,珠海市,香洲区</div>
-              </div>
-            </div>
-          </div>
-        </div>
-        <div class="m-4">
-          <a href="#add-company" data-toggle="modal" data-target="#add-company" class="btn btn-sm btn-outline-primary"><i class="far fa-plus"></i> 添加新公司</a>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--BEGIN 检索云版账号-->
-  <div class="modal fade" id="search-new" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-lg">
-      <div class="modal-content clearfix">
-        <div class="dialog-sheet">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
-          <div class="m-4">
-            <div class="input-group bg-white shadow-inset-2">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        												<i class="fal fa-search"></i>
-                        											</span>
-              </div>
-              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="输入通行账号（手机）检索" value="15811111111">
-            </div>
-          </div>
-        </div>
-        <div class="modal-search-height border-top border-bottom">
-          <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card p-3 mb-3">
-              <table class="table">
-                <thead>
-                  <tr>
-                    <th class="border-0" colspan="4">通行账号</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td width="100">手机</td>
-                    <td>15811111111</td>
-                    <td width="100">邮箱</td>
-                    <td></td>
-                  </tr>
-                  <tr>
-                    <td width="100">称呼</td>
-                    <td colspan="3">张三</td>
-                  </tr>
-                  <tr>
-                    <td width="100">注册SSO</td>
-                    <td>2019-10-21 10:31</td>
-                    <td width="100">注册云版</td>
-                    <td>2019-10-22 10:31</td>
-                  </tr>
-                  <tr>
-                    <td width="100">企业名称</td>
-                    <td>珠海纵横创新软件有限公司</td>
-                    <td width="100">企业地区</td>
-                    <td>广东</td>
-                  </tr>
-                </tbody>
-              </table>
-              <table class="table">
-                <thead>
-                  <tr>
-                    <th class="border-0"></th>
-                    <th class="border-0">产品</th>
-                    <th class="border-0">专业版</th>
-                  </tr>
-                </thead>
-                <tbody>
-                  <tr>
-                    <td>1</td>
-                    <td>重庆养护(2018)</td>
-                    <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
-                  </tr>
-                  <tr>
-                    <td>2</td>
-                    <td>广东养护(2018)</td>
-                    <td><a href="#update-confirm" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#update-confirm">升级</a></td>
-                  </tr>
-                </tbody>
-              </table>
-            </div>
-            <!--没结果-->
-            <p class="text-center">养护云版不存在&nbsp;"<b>15811111111</b>"&nbsp;用户，请检查是否输入有误。</p>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--BEGIN 升级确认-->
-  <div class="modal fade" id="update-confirm" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-dialog-centered">
-      <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">
-          为用户 <b>15811111111,张三</b> 升级 <b>广东养护(2018)专业版</b>
-        </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>
-  <!--BEGIN 移除公司确认-->
-  <div class="modal fade" id="remover-com" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-dialog-centered">
-      <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">
-          为联系人 <b>张三</b> 移除 <b>珠海纵横创新软件有限公司</b>
-        </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>
-  <!--BEGIN 移除联系人确认-->
-  <div class="modal fade" id="unlinkcld" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-dialog-centered">
-      <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">
-          为通行账号 <b>15800000001</b> 移除联系人 <b>张三</b>
-        </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>
-  <!--BEGIN 添加服务记录-->
-  <div class="modal fade" id="add-server" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-dialog-centered">
-      <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 class="form-group">
-            <label class="form-label" for="example-datec">联系人</label>
-            <select class="form-control" id="example-datec">
-                            <optgroup label="部门1">
-                                <option>张三</option>
-                            </optgroup>
-                            <optgroup label="部门2">
-                                <option>李四</option>
-                            </optgroup>
-                        </select>
-          </div>
-          <div class="form-group">
-            <div class="custom-control custom-radio custom-control-inline">
-              <input type="radio" class="custom-control-input" id="defaultInline1Radio" name="inlineDefaultRadiosExample">
-              <label class="custom-control-label" for="defaultInline1Radio">上门服务</label>
-            </div>
-            <div class="custom-control custom-radio custom-control-inline">
-              <input type="radio" class="custom-control-input" id="defaultInline2Radio" name="inlineDefaultRadiosExample" checked="">
-              <label class="custom-control-label" for="defaultInline2Radio">电话拜访</label>
-            </div>
-            <div class="custom-control custom-radio custom-control-inline">
-              <input type="radio" class="custom-control-input" id="defaultInline2Radio" name="inlineDefaultRadiosExample" checked="">
-              <label class="custom-control-label" for="defaultInline2Radio">在线服务</label>
-            </div>
-            <div class="custom-control custom-radio custom-control-inline">
-              <input type="radio" class="custom-control-input" id="defaultInline3Radio" name="inlineDefaultRadiosExample" checked="">
-              <label class="custom-control-label" for="defaultInline3Radio">其他事项</label>
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="form-label" for="example-date">时间</label>
-            <input class="form-control" id="example-date" type="date" name="date" value="">
-          </div>
-          <div class="form-group">
-            <label class="form-label" for="example-date">内容</label>
-            <textarea class="form-control" id="example-textarea" rows="3" placeholder="填写详细服务内容"> </textarea>
-          </div>
-          <div class="form-group">
-            <div class="custom-control custom-switch">
-              <input type="checkbox" class="custom-control-input" id="customSwitch2" checked="">
-              <label class="custom-control-label" for="customSwitch2">添加提醒</label>
-            </div>
-          </div>
-          <div class="form-group">
-            <label class="form-label" for="example-date">提醒限期</label>
-            <input class="form-control" id="example-date" type="date" name="date" value="">
-          </div>
-          <div class="form-group">
-            <label class="form-label" for="example-date">备注</label>
-            <textarea class="form-control" id="example-textarea" rows="1"> </textarea>
-          </div>
-        </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>
-  <!--BEGIN 关联软件锁-->
-  <div class="modal fade" id="add-lock" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
-    <div class="modal-dialog modal-lg">
-      <div class="modal-content clearfix">
-        <div class="dialog-sheet">
-          <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                        <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                    </button>
-          <div class="m-4 row">
-            <div class="input-group bg-white shadow-inset-2 col-6 p-0">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        													<i class="fal fa-boxes"></i>
-                        												</span>
-              </div>
-              <select class="form-control" id="example-select">
-                                <option>不限产品</option>
-                                <option>全国专业</option>
-                                <option>全国标准</option>
-                                <option>全国招投标</option>
-                                <option>全国三算</option>
-                            </select>
-            </div>
-            <div class="input-group bg-white shadow-inset-2 col-6 pr-0">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        													<i class="fal fa-search"></i>
-                        												</span>
-              </div>
-              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索锁号">
-            </div>
-          </div>
-        </div>
-        <div class="p-4 border-top d-flex justify-content-center">
-          <ul class="nav nav-pills" role="tablist">
-            <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#">借出</a></li>
-            <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#2">销售</a></li>
-            <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#">赠送</a></li>
-          </ul>
-        </div>
-        <div class="modal-search-height border-top">
-          <div class="slimScrol2 p-4 modal-search-result">
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-              <div class="row">
-                <div class="col-2 pr-0">ZH-03876</div>
-                <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
-              </div>
-            </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-              <div class="row">
-                <div class="col-2 pr-0">ZH-03877</div>
-                <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
-              </div>
-            </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-              <div class="row">
-                <div class="col-2 pr-0">ZH-03878</div>
-                <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
-              </div>
-            </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-              <div class="row">
-                <div class="col-2 pr-0">ZH-03879</div>
-                <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
-                <div class="col-3 pr-0">2019-10-29 张三 接收</div>
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-  <!--BEGIN 添加 新联系人-->
-  <div class="modal fade" id="add-contact" 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>
-                    </button>
-        </div>
-        <div class="modal-body">
-          <div class="cldform clearfix">
-            <div class="cldform-item">
-              <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-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">
-                  <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-province" role="tab" aria-selected="true">省份</a></li>
-                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-city" role="tab" aria-selected="false">市区</a></li>
-                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-area" 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-province" 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-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>
-                      <!--西南地区-->
-                      <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-city" 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-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><button type="button" class="btn btn-xs btn-outline-default">云浮市</button></div>
-                    <div class="tab-pane city-item fade" id="tab-area" role="tabpanel" aria-labelledby="tab-area"><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>
-                </div>
-              </div>
-            </div>
-            <div class="cldform-line"></div>
-            <div class="cldform-item cldform-item-half pr-3">
-              <div class="cldform-label">性别</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-angle-down mt-1"></i></span></div>
-                <div class="dropdown-menu" style="width:220px">
-                  <button class="dropdown-item">男</button>
-                  <button class="dropdown-item">女</button>
-                </div>
-              </div>
-            </div>
-            <div class="cldform-item cldform-item-half pl-3">
-              <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 text-danger">手机</div>
-              <div class="cldform-control">
-                <textarea class="cldform-contarl-textarea" style="height:36px;width:100%" placeholder="必填项"></textarea>
-              </div>
-            </div>
-            <div class="cldform-item cldform-item-half pl-3">
-              <div class="cldform-label text-danger">QQ</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-half pr-3">
-              <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-item cldform-item-half pl-3">
-              <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-control">
-                <textarea class="cldform-contarl-textarea" style="height:36px;width:100%"></textarea>
-              </div>
-            </div>
-            <div class="cldform-line"></div>
-            <div class="cldform-item">
-              <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">
-              <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">
-              <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">
-              <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">
-              <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="alert alert-danger mt-1" role="alert">
-              <strong>添加失败!</strong> 有必填项未填写信息。
-            </div>
-          </div>
-        </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>
-  </div>
-  <!--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>
-                    </button>
-        </div>
-        <div class="modal-body">
-          <div class="cldform clearfix">
-            <div class="cldform-item">
-              <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-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">
-                  <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-province" role="tab" aria-selected="true">省份</a></li>
-                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-city" role="tab" aria-selected="false">市区</a></li>
-                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#tab-area" 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-province" 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-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>
-                      <!--西南地区-->
-                      <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-city" 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-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><button type="button" class="btn btn-xs btn-outline-default">云浮市</button></div>
-                    <div class="tab-pane city-item fade" id="tab-area" role="tabpanel" aria-labelledby="tab-area"><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>
-                </div>
-              </div>
-            </div>
-            <div class="cldform-line"></div>
-            <div class="cldform-item">
-              <div class="cldform-label">公司性质</div>
-              <div class="cldform-control">
-                <div class="cldform-control-checkbox">
-                  <div class="custom-control custom-checkbox custom-control-inline">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <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">
-                    <input type="checkbox" class="custom-control-input" id="defaultInline15">
-                    <label class="custom-control-label" for="defaultInline15">合作伙伴</label>
-                  </div>
-                </div>
-              </div>
-            </div>
-            <div class="cldform-line"></div>
-            <div class="cldform-item">
-              <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-control">
-                <textarea class="cldform-contarl-textarea" style="height:36px;width:100%"></textarea>
-              </div>
-            </div>
-            <div class="cldform-item cldform-item-half pl-3">
-              <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">
-              <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">
-              <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">
-              <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="alert alert-danger mt-1" role="alert">
-              <strong>添加失败!</strong> 有必填项未填写信息。
-            </div>
-          </div>
-        </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>
-        </div>
-      </div>
-    </div>
-  </div>
+
   <!-- BEGIN应用切换 -->
   <div class="modal fade modal-backdrop-transparent" id="modal-shortcut" tabindex="-1" role="dialog" aria-labelledby="modal-shortcut" aria-hidden="true">
       <div class="modal-dialog modal-dialog-top modal-transparent" role="document">

lock-client.html

@@ -1591,43 +1591,43 @@
                           <td><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">2</td>
                           <td width="140">借出 <a href="#">张三</a>
                             <br><span class="text-muted"><a href="#">@陈特</a> 5月5日 14:55</span></td>
                           <td><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">3</td>
                           <td width="140">赠送 <a href="#">张三</a>
                             <br><span class="text-muted"><a href="#">@陈特</a> 5月5日 14:55</span></td>
                           <td><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">4</td>
                           <td width="140">升级 <a href="#">张三</a>
                             <br><span class="text-muted">系统 5月5日 14:55</span></td>
                           <td><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">5</td>
                           <td width="140">延期 <a href="#">张三</a>
                             <br><span class="text-muted">系统 5月5日 14:55</span></td>
                           <td>由2018-09-10延期至2019-09-10</td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">6</td>
                           <td width="140">收回 <a href="#">张三</a>
                             <br><span class="text-muted"><a href="#">@陈特</a> 5月5日 14:55</span></td>
                           <td></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">7</td>
                           <td width="140">更换 <a href="#">张三</a>
                             <br><span class="text-muted"><a href="#">@陈特</a> 5月5日 14:55</span></td>
                           <td><a href="#">ZH-03905</a></td>
                         </tr>
                         <tr>
-                          <td width="20">1</td>
+                          <td width="20">8</td>
                           <td width="140">备注 <a href="#">张三</a>
                             <br><span class="text-muted"><a href="#">@陈特</a> 5月5日 14:55</span></td>
                           <td>备注内容</td>
@@ -1636,7 +1636,13 @@
                     </div>
                   </div>
                 </div>
-                <div class="sheet-btns mt-3"><a href="#add-lserver" class="btn btn-xs btn-outline-primary waves-effect waves-themed" data-toggle="modal" data-target="#add-lserver"><i class="far fa-plus"></i> 添加锁记录</a></div>
+                <div class="sheet-btns mt-3">
+                  <a href="#lock-binding" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#lock-binding">借出/销售/赠送</a>
+                  <a href="#lokc-update" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#lokc-update">升级</a>
+                  <a href="#lokc-replace" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#lokc-replace">更换</a>
+                  <a href="#add-retrieve" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#add-retrieve">收回</a>
+                  <a href="#add-remark" class="btn btn-xs btn-outline-primary" data-toggle="modal" data-target="#add-remark">备注</a>
+                </div>
               </div>
               <div class="sheet-panel-record">
                 <ul class="nav nav-tabs nav-tabs-clean sheet-nav-tabs" role="tablist">
@@ -1958,36 +1964,22 @@
       </div>
     </div>
   </div>
-  <!--BEGIN 关联软件锁-->
-  <div class="modal fade" id="add-lock" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+  <!--BEGIN 借出/销售/赠送-->
+  <div class="modal fade" id="lock-binding" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-lg">
       <div class="modal-content clearfix">
         <div class="dialog-sheet">
           <button type="button" class="close" data-dismiss="modal" aria-label="Close">
                         <span aria-hidden="true"><i class="fal fa-times"></i></span>
                     </button>
-          <div class="m-4 row">
-            <div class="input-group bg-white shadow-inset-2 col-6 p-0">
-              <div class="input-group-prepend">
-                <span class="input-group-text bg-transparent border-right-0">
-                        													<i class="fal fa-boxes"></i>
-                        												</span>
-              </div>
-              <select class="form-control" id="example-select">
-                                <option>不限产品</option>
-                                <option>全国专业</option>
-                                <option>全国标准</option>
-                                <option>全国招投标</option>
-                                <option>全国三算</option>
-                            </select>
-            </div>
-            <div class="input-group bg-white shadow-inset-2 col-6 pr-0">
+          <div class="m-4">
+            <div class="input-group bg-white shadow-inset-2">
               <div class="input-group-prepend">
                 <span class="input-group-text bg-transparent border-right-0">
-                        													<i class="fal fa-search"></i>
-                        												</span>
+                                                <i class="fal fa-search"></i>
+                                              </span>
               </div>
-              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索锁号">
+              <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索联系人（姓名、手机、QQ、公司名称）">
             </div>
           </div>
         </div>
@@ -1998,8 +1990,9 @@
             <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#">赠送</a></li>
           </ul>
         </div>
-        <div class="modal-search-height border-top">
+        <div class="modal-search-height border-top border-bottom">
           <div class="slimScrol2 p-4 modal-search-result">
+<<<<<<< HEAD
             <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
               <div class="row">
                 <div class="col-2 pr-0">ZH-03876</div>
@@ -2019,13 +2012,32 @@
                 <div class="col-2 pr-0">ZH-03878</div>
                 <div class="col-7 pr-0"><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></div>
                 <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+=======
+            <div class="card p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="选择该联系人" data-original-title="选择该联系人">
+              <div class="row">
+                <div class="col-1 pr-0">张三</div>
+                <div class="col-1 pr-0">处长</div>
+                <div class="col-2 pr-0">15800000001</div>
+                <div class="col-2 pr-0">1231233</div>
+                <div class="col-4 pr-0">珠海纵横创新软件有限公司</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary ">选择ta</a></div>
+>>>>>>> 5128fb9bae2cdd88f97bcdcb859a68dbce53717f
               </div>
             </div>
-            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
+            <div class="card p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="选择该联系人" data-original-title="选择该联系人">
               <div class="row">
+<<<<<<< HEAD
                 <div class="col-2 pr-0">ZH-03879</div>
                 <div class="col-7 pr-0"><span class="badge badge-primary mr-1">固化清单全功能</span><span class="badge badge-primary mr-1">全国专业</span><span class="badge badge-primary">全国专业（新定额）</span></div>
                 <div class="col-3 pr-0">2019-10-29 张三 接收</div>
+=======
+                <div class="col-1 pr-0">张三</div>
+                <div class="col-1 pr-0"></div>
+                <div class="col-2 pr-0">15800000001</div>
+                <div class="col-2 pr-0">1231233</div>
+                <div class="col-4 pr-0">珠海纵横创新软件有限公司</div>
+                <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary ">选择ta</a></div>
+>>>>>>> 5128fb9bae2cdd88f97bcdcb859a68dbce53717f
               </div>
             </div>
           </div>

product-yun-yh.html

@@ -352,7 +352,8 @@
                                     <div class="panel-container show">
                                         <div class="panel-content">
                                             <table class="table table-bordered table-hover table-striped">
-                                                <thead><tr><th>通行账号</th><th>QQ</th><th>企业名称</th><th>CLD联系人</th><th>公司</th><th>最近登录</th><th>最近使用</th><th>登录时长</th><th>注册时间</th><th>已升级专业版</th></tr></thead>
+                                                <thead><tr><th>通行账号</th><th>QQ</th><th>企业名称</th><th>CLD联系人</th><th>公司</th><th>最近登录</th><th>最近使用</th><th>登录时长</th><th>注册时间</th>
+                                                <th width="150">已升级专业版</th></tr></thead>
                                                 <tbody>
                                                     <tr class="pointer-hover" data-toggle="modal" data-target="#detail"  >
                                                         <td>15812345671</td>
@@ -364,7 +365,7 @@
                                                         <td>重庆定额（2018）</td>
                                                         <td>3小时40分钟（2018-03-04）</td>
                                                         <td>2017-03-03</td>
-                                                        <td><span class="badge badge-primary mr-1">重庆养护(2018)</span><span class="badge badge-primary">广东养护(2018)</span></td>
+                                                        <td><span class="badge badge-primary mb-1">重庆养护(2018)</span><span class="badge badge-primary mb-1">广东养护(2018)</span></td>
                                                     </tr>
                                                     <tr>
                                                         <td>15812345678</td>
@@ -376,7 +377,7 @@
                                                         <td>重庆定额（2018）</td>
                                                         <td>3小时40分钟（2018-03-04）</td>
                                                         <td>2017-03-03</td>
-                                                        <td><span class="badge badge-primary mr-1">重庆养护(2018)</span></td>
+                                                        <td><span class="badge badge-primary mb-1">重庆养护(2018)</span></td>
                                                     </tr>
                                                     <tr>
                                                         <td>15812345678</td>
@@ -388,7 +389,7 @@
                                                         <td>重庆定额（2018）</td>
                                                         <td>3小时40分钟（2018-03-04）</td>
                                                         <td>2017-03-03</td>
-                                                        <td><span class="badge badge-primary mr-1">重庆养护(2018)</span></td>
+                                                        <td><span class="badge badge-primary mb-1">重庆养护(2018)</span></td>
                                                     </tr>
                                                     <tr>
                                                         <td>15812345678</td>
@@ -1280,11 +1281,11 @@
                     </div>
                     <div class="modal-search-height border-top border-bottom">
                         <div class="slimScrol2 p-4 modal-search-result">
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该联系人" data-original-title="点击关联该联系人">
-                                <div class="row"><div class="col-1 pr-0">张三</div><div class="col-2 pr-0">处长</div><div class="col-2 pr-0">15800000001</div><div class="col-2 pr-0">1231233</div><div class="col-4 pr-0">珠海纵横创新软件有限公司</div><div class="col-1 pr-0">SSO 1</div></div>
+                            <div class="card p-3 mb-3" title="点击关联该联系人">
+                                <div class="row"><div class="col-1 pr-0">张三</div><div class="col-1 pr-0">处长</div><div class="col-2 pr-0">15800000001</div><div class="col-2 pr-0">1231233</div><div class="col-4 pr-0">珠海纵横创新软件有限公司</div><div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div></div>
                             </div>
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该联系人" data-original-title="点击关联该联系人">
-                                <div class="row"><div class="col-1 pr-0">张三</div><div class="col-2 pr-0"></div><div class="col-2 pr-0">15800000001</div><div class="col-2 pr-0">1231233</div><div class="col-4 pr-0">珠海纵横创新软件有限公司</div></div>
+                            <div class="card pointer-hover p-3 mb-3" title="点击关联该联系人">
+                                <div class="row"><div class="col-1 pr-0">张三</div><div class="col-1 pr-0"></div><div class="col-2 pr-0">15800000001</div><div class="col-2 pr-0">1231233</div><div class="col-4 pr-0">珠海纵横创新软件有限公司</div><div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div></div>
                             </div>
                         </div>
                     </div>
@@ -1315,8 +1316,12 @@
                     </div>
                     <div class="modal-search-height border-top border-bottom">
                         <div class="slimScrol2 p-4 modal-search-result">
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击关联该公司" data-original-title="点击关联该公司">
-                                <div class="row"><div class="col-7 pr-0">珠海纵横创新软件有限公司</div><div class="col-5 pr-0">广东省,珠海市,香洲区</div></div>
+                            <div class="card p-3 mb-3" title="点击关联该公司">
+                                <div class="row">
+                                    <div class="col-6 pr-0">珠海纵横创新软件有限公司</div>
+                                    <div class="col-4 pr-0">广东省,珠海市,香洲区</div>
+                                    <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                                </div>
                             </div>
                         </div>
                     </div>
@@ -1487,65 +1492,85 @@
                 </div>
             </div>
         </div>
-        <!--BEGIN 关联软件锁-->
-        <div class="modal fade" id="add-lock" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+          <!--BEGIN 绑定加密锁-->
+          <div class="modal fade" id="add-lock" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
             <div class="modal-dialog modal-lg">
-                <div class="modal-content clearfix">
-                    <div class="dialog-sheet">
-                        <button type="button" class="close" data-dismiss="modal" aria-label="Close">
-                            <span aria-hidden="true"><i class="fal fa-times"></i></span>
-                        </button>
-                        <div class="m-4 row">
-                            <div class="input-group bg-white shadow-inset-2 col-6 p-0">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                                        <i class="fal fa-boxes"></i>
-                                    </span>
-                                </div>
-                                <select class="form-control" id="example-select">
-                                                        <option>不限产品</option>
-                                                        <option>全国专业</option>
-                                                        <option>全国标准</option>
-                                                        <option>全国招投标</option>
-                                                        <option>全国三算</option>
-                                                    </select>
-                            </div>
-                            <div class="input-group bg-white shadow-inset-2 col-6 pr-0">
-                                <div class="input-group-prepend">
-                                    <span class="input-group-text bg-transparent border-right-0">
-                                        <i class="fal fa-search"></i>
-                                    </span>
-                                </div>
-                                <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索锁号">
-                            </div>
-                        </div>
+              <div class="modal-content clearfix">
+                <div class="dialog-sheet">
+                  <button type="button" class="close" data-dismiss="modal" aria-label="Close">
+                                <span aria-hidden="true"><i class="fal fa-times"></i></span>
+                            </button>
+                  <div class="m-4 row">
+                    <div class="input-group bg-white shadow-inset-2 col-6 p-0">
+                      <div class="input-group-prepend">
+                        <span class="input-group-text bg-transparent border-right-0">
+                                                                                    <i class="fal fa-boxes"></i>
+                                                                                </span>
+                      </div>
+                      <select class="form-control" id="example-select">
+                                        <option>不限产品</option>
+                                        <option>全国专业</option>
+                                        <option>全国标准</option>
+                                        <option>全国招投标</option>
+                                        <option>全国三算</option>
+                                    </select>
                     </div>
-                    <div class="p-4 border-top d-flex justify-content-center">
-                        <ul class="nav nav-pills" role="tablist">
-                            <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#">借出</a></li>
-                            <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#2">销售</a></li>
-                            <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#">赠送</a></li>
-                        </ul>
+                    <div class="input-group bg-white shadow-inset-2 col-6 pr-0">
+                      <div class="input-group-prepend">
+                        <span class="input-group-text bg-transparent border-right-0">
+                                                                                    <i class="fal fa-search"></i>
+                                                                                </span>
+                      </div>
+                      <input type="text" class="form-control border-left-0 bg-transparent pl-0" placeholder="搜索锁号">
                     </div>
-                    <div class="modal-search-height border-top">
-                        <div class="slimScrol2 p-4 modal-search-result">
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-                                <div class="row"><div class="col-2 pr-0">ZH-03876</div><div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div><div class="col-3 pr-0">2019-10-29 张三 接收</div></div>
-                            </div>
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-                                <div class="row"><div class="col-2 pr-0">ZH-03877</div><div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div><div class="col-3 pr-0">2019-10-29 张三 接收</div></div>
-                            </div>
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-                                <div class="row"><div class="col-2 pr-0">ZH-03878</div><div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div><div class="col-3 pr-0">2019-10-29 张三 接收</div></div>
-                            </div>
-                            <div class="card pointer-hover p-3 mb-3" data-toggle="tooltip" data-placement="bottom" title="点击「借出」该锁" data-original-title="点击「借出」该锁">
-                                <div class="row"><div class="col-2 pr-0">ZH-03879</div><div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div><div class="col-3 pr-0">2019-10-29 张三 接收</div></div>
-                            </div>
-                        </div>
+                  </div>
+                </div>
+                <div class="p-4 border-top d-flex justify-content-center">
+                  <ul class="nav nav-pills" role="tablist">
+                    <li class="nav-item"><a class="nav-link active" data-toggle="tab" href="#">借出</a></li>
+                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#2">销售</a></li>
+                    <li class="nav-item"><a class="nav-link" data-toggle="tab" href="#">赠送</a></li>
+                  </ul>
+                </div>
+                <div class="modal-search-height border-top">
+                  <div class="slimScrol2 p-4 modal-search-result">
+                    <div class="card p-3 mb-3" title="点击「借出」该锁">
+                      <div class="row">
+                        <div class="col-2 pr-0">ZH-03876</div>
+                        <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
+                        <div class="col-1 pr-0">接收</div>
+                        <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                      </div>
                     </div>
+                    <div class="card p-3 mb-3" title="点击「借出」该锁" >
+                      <div class="row">
+                        <div class="col-2 pr-0">ZH-03877</div>
+                        <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
+                        <div class="col-1 pr-0">接收</div>
+                        <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                      </div>
+                    </div>
+                    <div class="card p-3 mb-3" title="点击「借出」该锁">
+                      <div class="row">
+                        <div class="col-2 pr-0">ZH-03878</div>
+                        <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
+                        <div class="col-1 pr-0">接收</div>
+                        <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                      </div>
+                    </div>
+                    <div class="card p-3 mb-3" title="点击「借出」该锁">
+                      <div class="row">
+                        <div class="col-2 pr-0">ZH-03879</div>
+                        <div class="col-7 pr-0">固化清单全功能+全国专业+全国专业（新定额）</div>
+                        <div class="col-1 pr-0">接收</div>
+                        <div class="col-auto ml-auto pl-0"><a href="#" class="btn btn-xs btn-outline-primary">选择ta</a></div>
+                      </div>
+                    </div>
+                  </div>
                 </div>
+              </div>
             </div>
-        </div>
+          </div>
         <!--BEGIN 添加 新联系人-->
         <div class="modal fade" id="add-contact" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
             <div class="modal-dialog modal-lg">