Merge remote-tracking branch 'origin/develop' into develop

@@ -263,6 +263,17 @@
                                 </span>
                                 </span>
                         </div>
                         </div>
                         <div class="form-group col-sm-3 col-md-2">
                         <div class="form-group col-sm-3 col-md-2">
+                            <label>职称类型</label>
+                            <span class="form-control select-box">
+                                    <select class="select" size="1">
+                                        <?php foreach ($this->session->jobTypeEnum as $k => $v): ?>
+                                            <option <?= $clientUnitOutputVO && $clientUnitOutputVO->jobType == $k ? 'selected' : '' ?>
+                                                    value="<?= $k ?>"><?= $v ?></option>
+                                        <?php endforeach; ?>
+                                    </select>
+                                </span>
+                        </div>
+                        <div class="form-group col-sm-3 col-md-2">
                             <label>职位名称</label>
                             <label>职位名称</label>
                             <input type="text" class="form-control input-text"
                             <input type="text" class="form-control input-text"
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->jobPosition : '' ?>">
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->jobPosition : '' ?>">
@@ -272,7 +283,7 @@
                     <div class="row cl">
                     <div class="row cl">
                         <div class="form-group col-sm-3 col-md-2">
                         <div class="form-group col-sm-3 col-md-2">
                             <label>现单位入职时间</label>
                             <label>现单位入职时间</label>
-                            <input type="text" class="form-control input-text Wdate"
+                            <input type="text" class="form-control input-text Wdate" onfocus="WdatePicker()"
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->currentUnitEntryDate : '' ?>">
                                    value="<?= $clientUnitOutputVO ? $clientUnitOutputVO->currentUnitEntryDate : '' ?>">
                         </div>
                         </div>
                         <div class="form-group col-sm-3 col-md-2">
                         <div class="form-group col-sm-3 col-md-2">