入职添加紧急联系人

client_h5/src/pages/staff/index.vue

@@ -191,8 +191,37 @@
           />
         </van-cell-group>
       </van-form>
+    </card>
 
-
+    <card title="紧急联系人信息" style="height: auto">
+      <van-form required="true" ref="form">
+        <van-cell-group inset>
+          <van-field
+              v-model="formData.jjlxrxm"
+              name="紧急联系人姓名"
+              label="紧急联系人姓名"
+              placeholder="紧急联系人姓名"
+              readonly
+              :rules="[{ required: true, message: '未获取紧急联系人姓名' }]"
+          />
+          <van-field
+              v-model="formData.jjlxrhm"
+              name="紧急联系人电话"
+              label="紧急联系人电话"
+              placeholder="紧急联系人电话"
+              readonly
+              :rules="[{ required: true, message: '请填写紧急联系人电话' }]"
+          />
+          <van-field
+              v-model="formData.jjlxrgxText"
+              name="紧急联系人关系"
+              label="紧急联系人关系"
+              placeholder="紧急联系人关系"
+              readonly
+              :rules="[{ required: true, message: '未获取紧急联系人关系：' }]"
+          />
+        </van-cell-group>
+      </van-form>
     </card>
   </flow-form>
 </template>
@@ -273,6 +302,7 @@ const initFormData = async () => {
   formData.value.zzmmText = getDictLabel(DICT_TYPE.POLITY_TYPE, formData.value.zzmm);
   formData.value.drzwText = getDictLabel(DICT_TYPE.POST_TYPE, formData.value.drzw);
   formData.value.zgxlText = getDictLabel(DICT_TYPE.XL_TYPE, formData.value.zgxl);
+  formData.value.jjlxrgxText = getDictLabel(DICT_TYPE.CONTACT_TYPE, formData.value.jjlxrgx);
 
 
 }

client_h5/src/utils/dict.ts

@@ -191,4 +191,5 @@ export enum DICT_TYPE {
     HK_TYPE = 'hk_type',
     POLITY_TYPE = 'polity_type',
     XL_TYPE = 'xl_type',
+    CONTACT_TYPE = 'contact_type',
 }

zjugis-business/src/main/java/com/zjugis/business/flow/staff/controller/vo/StaffVO.java

@@ -183,7 +183,6 @@ public class StaffVO {
     /**
      * 紧急联系人号码
      */
-    @Mobile(message = "紧急联系人号码格式不正确")
     private String jjlxrhm;
 
     /**

zjugis-business/src/main/resources/templates/Staff/index.ftl

@@ -583,57 +583,112 @@ styles=[ '/flow/css/formCommon.css','/OwCommon/OwCommon.css' ]>
 
                     </table>
                 </div>
+
                 <div class="form-title">
                     <div class="form-icon">
                         <img src="/imgs/titleIcon.png" alt="">
                         <span>紧急联系人信息</span>
                     </div>
-                    <div class="form-btn" name="addButton">
-                        <div id="addData">
-                            <img src="/imgs/addIcon.png" alt="">
-                            <span>新增</span>
-                        </div>
-                    </div>
                 </div>
-                <div class="qjsjxx-box">
-                    <table class="form-table-info">
-                        <thead>
+                <div class="jbxx-box jbxx-box-flex">
+                    <table class="jbxx-table-info">
                         <tr>
-                            <td style="width: 5%;">序号</td>
-                            <td style="width: 10%;">姓名</td>
-                            <td style="width: 10%;">性别</td>
-                            <td style="width: 20%;">住址</td>
-                            <td style="width: 20%;">工作单位</td>
-                            <td style="width: 15%;">联系电话</td>
-                            <td style="width: 10%;">与员工关系</td>
-                            <td style="width: 10%;">操作</td>
+                            <td class="th">
+                                <div class="form-label">紧急联系人姓名：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$jjlxrxm">
+                                            <input type="text" value="${formEntity.jjlxrxm!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td class="th">
+                                <div class="form-label">紧急联系人电话：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-input" name="createReqVO$jjlxrhm">
+                                            <input type="text" value="${formEntity.jjlxrhm!}">
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
+                            <td class="th">
+                                <div class="form-label">紧急联系人关系：</div>
+                            </td>
+                            <td>
+                                <div class="form-group">
+                                    <div class="form-item">
+                                        <div class="z-comp-select" name="createReqVO$jjlxrgx"
+                                             data='${contact_type!}' value="${formEntity.jjlxrgx!}">
+                                            <div class="z-inputselect-bar">
+                                                <span></span><i></i>
+                                            </div>
+                                        </div>
+                                    </div>
+                                </div>
+                            </td>
                         </tr>
-                        </thead>
-                        <tbody class="tbody tbodyQjsq" name="body"></tbody>
                     </table>
                 </div>
             </div>
-            <br>
-            <br>
 
-            <#if WORKFLOW.OPINION! !="">
-                <div class="ow-tab-content" name="yj">
-                    <div class="form-title">
-                        <div class="form-icon">
-                            <img src="/imgs/titleIcon.png" alt="">
-                            <span>审批意见</span>
-                        </div>
-                        <div class="form-btn">
-                        </div>
-                    </div>
-                    <div class="qjsjxx-box">
-                        <div class="z-form-wrap" name="opinionsDiv">
-                            <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
-                        </div>
+
+            <div class="form-title">
+                <div class="form-icon">
+                    <img src="/imgs/titleIcon.png" alt="">
+                    <span>家庭成员信息</span>
+                </div>
+                <div class="form-btn" name="addButton">
+                    <div id="addData">
+                        <img src="/imgs/addIcon.png" alt="">
+                        <span>新增</span>
                     </div>
                 </div>
-            </#if>
+            </div>
+            <div class="qjsjxx-box">
+                <table class="form-table-info">
+                    <thead>
+                    <tr>
+                        <td style="width: 5%;">序号</td>
+                        <td style="width: 10%;">姓名</td>
+                        <td style="width: 10%;">性别</td>
+                        <td style="width: 20%;">住址</td>
+                        <td style="width: 20%;">工作单位</td>
+                        <td style="width: 15%;">联系电话</td>
+                        <td style="width: 10%;">与员工关系</td>
+                        <td style="width: 10%;">操作</td>
+                    </tr>
+                    </thead>
+                    <tbody class="tbody tbodyQjsq" name="body"></tbody>
+                </table>
+            </div>
         </div>
+        <br>
+        <br>
+
+        <#if WORKFLOW.OPINION! !="">
+            <div class="ow-tab-content" name="yj">
+                <div class="form-title">
+                    <div class="form-icon">
+                        <img src="/imgs/titleIcon.png" alt="">
+                        <span>审批意见</span>
+                    </div>
+                    <div class="form-btn">
+                    </div>
+                </div>
+                <div class="qjsjxx-box">
+                    <div class="z-form-wrap" name="opinionsDiv">
+                        <div class="z-form-row"> ${WORKFLOW.OPINION!} </div>
+                    </div>
+                </div>
+            </div>
+        </#if>
+    </div>
 
 
     </div>