补充软件锁升级等功能

lock-client.html

@@ -1992,59 +1992,112 @@
         </div>
         <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>
-                <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>
-            </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"><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>
+            <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 waves-effect waves-themed">选择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-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 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 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 waves-effect waves-themed">选择ta</a></div></div>
             </div>
           </div>
         </div>
       </div>
     </div>
   </div>
+  <!--BEGIN 升级-->
+  <div class="modal fade" id="lokc-update" 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">
+              <option>重庆养护（营改增）</option>
+              <option>广东业主专业（新定额）</option>
+              <!-- <optgroup label="广东业主专业（新定额）">
+                  <option>广东业主专业（新定额）</option>
+              </optgroup> -->
+            </select>
+          </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="lokc-replace" 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-date">新锁号</label>
+            <input class="form-control" id="example-date" type="text" value="">
+          </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-retrieve" 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>HNYH-0654</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-remark" 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-date">备注</label>
+            <textarea class="form-control" id="example-textarea" rows="3" placeholder="填写详细服务内容"> </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-contact" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-lg">