完善员工列表详情

lock-client.html

@@ -2497,7 +2497,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">
@@ -2555,26 +2555,6 @@
                   </div>
               </div>
           </div>
-          <!--条件3-->
-<!--           <div class="form-group">
-              <label class="form-label d-flex" for="dropdown-on-left">姓名<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
-              <div class="input-group">
-                  <div class="input-group-prepend">
-                      <button class="btn btn-outline-default dropdown-toggle waves-effect waves-themed" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">包含</button>
-                      <div class="dropdown-menu" x-placement="bottom-start">
-                          <a class="dropdown-item" href="#">包含</a>
-                          <a class="dropdown-item" href="#">不包含</a>
-                          <a class="dropdown-item" href="#">是</a>
-                          <a class="dropdown-item" href="#">不是</a>
-                          <a class="dropdown-item" href="#">开头为</a>
-                          <a class="dropdown-item" href="#">结尾为</a>
-                          <a class="dropdown-item" href="#">空</a>
-                          <a class="dropdown-item" href="#">不为空</a>
-                      </div>
-                  </div>
-                  <input type="text" class="form-control" aria-label="Text input with dropdown button" id="dropdown-on-left">
-              </div>
-          </div> -->
           <!--添加条件-->
           <div class="form-group">
             <a class="btn btn-xs text-primary dropdown-toggle no-arrow" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="far fa-plus"></i> 添加筛选条件</a>

staff-employee.html

@@ -393,6 +393,7 @@
                         </li>
                       </ul>
                     </div>
+                    <a class="btn btn-sm btn-primary waves-effect waves-themed" href="#add-staff" data-toggle="modal" data-target="#add-staff"><i class="far fa-plus"></i> 员工</a>
                   </div>
                 </div>
                 <div class="panel-container show">
@@ -482,6 +483,81 @@
     </div>
   </div>
   <!-- END Page Wrapper -->
+  <!--BEGIN 筛选-->
+  <div class="modal fade" id="filter" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
+    <div class="modal-dialog">
+      <div class="modal-content">
+        <div class="modal-header">
+          <h4 class="modal-title">自定义筛选</h4>
+          <button type="button" class="close" data-dismiss="modal" aria-label="Close"><span aria-hidden="true"><i class="fal fa-times"></i></span></button>
+        </div>
+        <div class="modal-body">
+          <!--条件1-->
+          <div class="form-group">
+              <label class="form-label d-flex" for="dropdown-on-left">在职<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
+              <div class="input-group">
+                  <div class="input-group-prepend">
+                      <button class="btn btn-outline-default dropdown-toggle waves-effect waves-themed" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">包含</button>
+                      <div class="dropdown-menu" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">包含</a>
+                          <a class="dropdown-item" href="#">不包含</a>
+                          <a class="dropdown-item" href="#">是</a>
+                          <a class="dropdown-item" href="#">不是</a>
+                          <a class="dropdown-item" href="#">开头为</a>
+                          <a class="dropdown-item" href="#">结尾为</a>
+                          <a class="dropdown-item" href="#">空</a>
+                          <a class="dropdown-item" href="#">不为空</a>
+                      </div>
+                  </div>
+                  <input type="text" class="form-control" aria-label="Text input with dropdown button" id="dropdown-on-left">
+                  <div class="input-group-append">
+                      <button class="btn btn-outline-default dropdown-toggle waves-effect waves-themed" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">且</button>
+                      <div class="dropdown-menu" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">或</a>
+                      </div>
+                  </div>
+              </div>
+          </div>
+          <!--条件2-->
+          <div class="form-group">
+              <label class="form-label d-flex" for="dropdown-on-left">正式<a href="#" class="ml-auto" title="移除条件"><i class="fal fa-times"></i></a></label>
+              <div class="input-group">
+                  <div class="input-group-prepend">
+                      <button class="btn btn-outline-default dropdown-toggle" type="button" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false">包含</button>
+                      <div class="dropdown-menu" x-placement="bottom-start">
+                          <a class="dropdown-item" href="#">包含</a>
+                          <a class="dropdown-item" href="#">不包含</a>
+                          <a class="dropdown-item" href="#">是</a>
+                          <a class="dropdown-item" href="#">不是</a>
+                          <a class="dropdown-item" href="#">开头为</a>
+                          <a class="dropdown-item" href="#">结尾为</a>
+                          <a class="dropdown-item" href="#">空</a>
+                          <a class="dropdown-item" href="#">不为空</a>
+                      </div>
+                  </div>
+                  <input type="text" class="form-control" aria-label="Text input with dropdown button" id="dropdown-on-left">
+                  <div class="input-group-append">
+                      <button class="btn btn-outline-default disabled" type="button">且</button>
+                  </div>
+              </div>
+          </div>
+          <!--添加条件-->
+          <div class="form-group">
+            <a class="btn btn-xs text-primary dropdown-toggle no-arrow" data-toggle="dropdown" aria-haspopup="true" aria-expanded="false"><i class="far fa-plus"></i> 添加筛选条件</a>
+            <div class="dropdown-menu" x-placement="bottom-start">
+                <a class="dropdown-item" href="#">在职</a>
+                <a class="dropdown-item" href="#">正式</a>
+                <a class="dropdown-item" href="#">岗位</a>
+            </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>
+        </div>
+      </div>
+    </div>
+  </div>
   <!-- BEGIN 员工详情弹窗-->
   <div class="modal fade" id="employee-detail" tabindex="-1" role="dialog" aria-hidden="true" data-backdrop="static">
     <div class="modal-dialog modal-xl">
@@ -881,6 +957,9 @@
                 <div class="tab-content p-3">
                   <div class="tab-pane fade active show sheet-panel-log" id="tab-log" role="tabpanel" aria-labelledby="tab-log">
                     <div class="slimScrol4">
+                      <p><a href="#">@温秀娟</a> 删除湖北省 联系人区域<br><span class="text-muted">5月5日 14:55</span></p>
+                      <p><a href="#">@温秀娟</a> 增加广东办 页面权限<br><span class="text-muted">5月5日 14:55</span></p>
+                      <p><a href="#">@陈特</a> 绑定联系人 张三<br><span class="text-muted">5月5日 14:55</span></p>
                       <p><a href="#">@总部-何银龄</a> 员工 离职审批通过<br><span class="text-muted">2013年8月1日 14:55</span></p>
                       <p><a href="#">@总部-温秀娟</a> 员工 离职<br><span class="text-muted">2013年12月2日 14:55</span></p>
                       <p><a href="#">@总部-何银龄</a> 员工 转正审批通过<br><span class="text-muted">2013年8月2日 14:55</span></p>
@@ -904,6 +983,134 @@
       </div>
     </div>
   </div>
+  <!--BEGIN 添加 新联系人-->
+  <div class="modal fade" id="add-staff" 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-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" aria-expanded="false"><span class="cldform-contarl-dropdown">实习<i class="far fa-angle-down mt-1"></i></span></div>
+                <div class="dropdown-menu" style="width: 220px; position: absolute; will-change: top, left; top: 5px; left: 0px;" x-placement="bottom-start" x-out-of-boundaries="">
+                  <button class="dropdown-item">实习</button>
+                  <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">
+                <div class="cldform-contarl-box cldform-contarl-textareabox"><span>Z0001</span></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">
+                <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">性别</div>
+              <div class="cldform-control">
+                <div class="cldform-contarl-box cldform-contarl-textareabox" data-toggle="dropdown" aria-expanded="false"><span class="cldform-contarl-dropdown">男<i class="far fa-angle-down mt-1"></i></span></div>
+                <div class="dropdown-menu" style="width: 220px; position: absolute; will-change: top, left; top: 5px; left: 0px;" x-placement="bottom-start" x-out-of-boundaries="">
+                  <button class="dropdown-item">男</button>
+                  <button class="dropdown-item">女</button>
+                </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">
+                <textarea class="cldform-contarl-textarea " data-toggle="dropdown" style="height:36px;width:100%" placeholder="输入新部门" aria-expanded="true"></textarea>
+                <div class="dropdown-menu" style="width: 320px; position: absolute; top: 36px; left: 90px; will-change: top, left;" x-placement="bottom-start">
+                  <div class="row m-3">
+                    <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
+                      <input type="radio" class="custom-control-input" id="department1" name="departmentradio">
+                      <label class="custom-control-label" for="department1">部门1</label>
+                    </div>
+                    <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
+                      <input type="radio" class="custom-control-input" id="department2" name="departmentradio">
+                      <label class="custom-control-label" for="department2">部门2</label>
+                    </div>
+                    <div class="custom-control custom-radio custom-control-inline col-4 mr-0 mb-1">
+                      <input type="radio" class="custom-control-input" id="department3" name="departmentradio">
+                      <label class="custom-control-label" for="department3">部门3</label>
+                    </div>
+                  </div>
+                </div>
+              </div>
+            </div>
+            <div class="cldform-item cldform-item-half pl-3">
+              <div class="cldform-label">岗位</div>
+              <div class="cldform-control">
+                <div class="cldform-contarl-box cldform-contarl-textareabox" data-toggle="dropdown" aria-expanded="false"><span class="cldform-contarl-dropdown">开发员<i class="far fa-angle-down mt-1"></i></span></div>
+                <div class="dropdown-menu" style="width: 220px; position: absolute; will-change: top, left; top: 5px; left: 0px;" x-placement="bottom-start" x-out-of-boundaries="">
+                  <button class="dropdown-item">开发员</button>
+                  <button class="dropdown-item">销售助理</button>
+                </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">
+                <input class="form-control" id="example-date" type="date" name="date" value="">
+              </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%" 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%" placeholder="必填项"></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%" 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%" placeholder="必填项"></textarea>
+              </div>
+            </div>
+            <div class="cldform-line"></div>
+            <div class="alert alert-warning mt-3" role="alert">
+              短信通知例子：「张三，欢迎加入纵横大家庭，请电脑打开cld.smartcost.com.cn，使用账号“张三”登录（免密码）CLD进行入职申请。」
+            </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>
+        </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">