commit

src/main/resources/views/platform/zhgh/staffmanage/member/apply/submit/index.html

@@ -203,6 +203,12 @@ layout("/layouts/platform.html"){
                     </el-form-item>
                 </el-descriptions-item>
 
+                <el-descriptions-item label="签字" :span="3">
+                    <el-form-item prop="sign">
+                        <pc-signature v-model="formData.sign"></pc-signature>
+                    </el-form-item>
+                </el-descriptions-item>
+
                 <el-descriptions-item label="入会意愿" :span="3">
                     <el-form-item prop="isVoluntary">
                         <el-checkbox
@@ -224,12 +230,6 @@ layout("/layouts/platform.html"){
                         </el-checkbox>
                     </el-form-item>
                 </el-descriptions-item>
-
-                <el-descriptions-item label="签字" :span="3">
-                    <el-form-item prop="sign">
-                        <pc-signature v-model="formData.sign"></pc-signature>
-                    </el-form-item>
-                </el-descriptions-item>
             </el-descriptions>
         </el-form>
         <el-row type="flex" justify="end" class="mt20">

src/main/resources/views/platform/zhghh5/staffmanage/member/apply/submit/index.html

@@ -106,6 +106,16 @@ layout("/layouts/platform_h5.html"){
                             @confirm="(v)=>{formData.academicDegree = v;showAcademicDegreePicker = false}"
                 ></van-picker>
             </van-popup>
+            <van-field
+                v-model="formData.nativePlace"
+                name="nativePlace"
+                label="籍贯"
+                placeholder="请输入籍贯"
+                clearable
+                maxlength="30"
+                :rules="[{ required: true }]"
+                required
+            ></van-field>
             <van-field
                 v-model="formData.position"
                 name="position"
@@ -118,6 +128,17 @@ layout("/layouts/platform_h5.html"){
             <van-field v-model="formData.unitName" label="工作单位" readonly></van-field>
             <van-field v-model="formData.unionName" label="所属工会" readonly></van-field>
 
+            <van-field
+                v-model="formData.jobCategory"
+                name="jobCategory"
+                label="岗位名称"
+                placeholder="请输入岗位名称"
+                clearable
+                maxlength="30"
+                :rules="[{ required: true }]"
+                required
+            ></van-field>
+
             <!--<van-field
                     v-model="formData.campusName"
                     name="campusName"
@@ -139,22 +160,22 @@ layout("/layouts/platform_h5.html"){
                     placeholder="请填写在职状态"
                     clickable
             ></van-field>-->
-            <van-field
+<!--            <van-field-->
-                v-model="formData.personType"
+<!--                v-model="formData.personType"-->
-                name="personType"
+<!--                name="personType"-->
-                label="教职工类别"
+<!--                label="教职工类别"-->
-                readonly
+<!--                readonly-->
-                placeholder="请填写人员类型"
+<!--                placeholder="请填写人员类型"-->
-                clickable
+<!--                clickable-->
-            ></van-field>
+<!--            ></van-field>-->
-            <van-field
+<!--            <van-field-->
-                v-model="formData.preparedBy"
+<!--                v-model="formData.preparedBy"-->
-                name="preparedBy"
+<!--                name="preparedBy"-->
-                label="编制类别"
+<!--                label="编制类别"-->
-                readonly
+<!--                readonly-->
-                placeholder="请填写编制类别"
+<!--                placeholder="请填写编制类别"-->
-                clickable
+<!--                clickable-->
-            ></van-field>
+<!--            ></van-field>-->
             <van-field
                 v-model="formData.marriage"
                 name="marriage"
@@ -273,6 +294,16 @@ layout("/layouts/platform_h5.html"){
             <text-editor v-model="formData.specialty"></text-editor>
         </van-cell-group>
 
+        <van-cell-group title="签字" class="form-section">
+            <van-field class="more-text" name="sign" label="" required>
+                <template #input>
+                    <h5-signature v-model="formData.sign" slot="input"></h5-signature>
+                </template>
+            </van-field>
+        </van-cell-group>
+
+
+
         <van-cell-group title="入会意愿" class="form-section">
             <van-checkbox style="font-size: 17px;padding: 12px" icon-size="24px"
                           v-model="formData.isVoluntary" shape="square">
@@ -364,6 +395,10 @@ layout("/layouts/platform_h5.html"){
                         this.$toast.fail("请填写特长及获奖情况")
                         return
                     }
+                    if (!this.formData.sign){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
@@ -401,6 +436,10 @@ layout("/layouts/platform_h5.html"){
                         this.$toast.fail("请填写特长及获奖情况")
                         return
                     }
+                    if (!this.formData.sign){
+                        this.$toast.fail("请填写签字")
+                        return
+                    }
                     this.$dialog.confirm({
                         title: "提示",
                         message: "您确定要提交吗？"
@@ -473,6 +512,8 @@ layout("/layouts/platform_h5.html"){
                         union,
                         campus,
                         userState,
+                        nativePlace,
+                        jobCategory,
                         personType,
                         preparedBy,
                         idCard,
@@ -492,6 +533,8 @@ layout("/layouts/platform_h5.html"){
                     this.$set(this.formData, "nation", nation)
                     this.$set(this.formData, "political", political)
                     this.$set(this.formData, "position", position)
+                    this.$set(this.formData, "nativePlace", nativePlace)
+                    this.$set(this.formData, "jobCategory", jobCategory)
                     this.$set(this.formData, "education", education)
                     this.$set(this.formData, "academicDegree", academicDegree)
                     this.$set(this.formData, "campus", campus)