学员登记表页面非社区工作者表单必填项调整

components/cascader/cascader.js

@@ -9,6 +9,10 @@ Component({
         contactPhone: String, //联系电话
         perType: String,
         parentIds: String,
+        required: {
+            type: Boolean,
+            value: true
+        }
     },
     observers: {
         parentIds: async function (parentIds) {

components/cascader/cascader.wxml

@@ -1,4 +1,4 @@
-<van-field required value="{{area}}" label="单位行政区域" readonly is-link center input-align="right" bindtap='showArea' type="textarea" autosize placeholder="请选择单位行政区域" />
+<van-field required="{{required}}" value="{{area}}" label="单位行政区域" readonly is-link center input-align="right" bindtap='showArea' type="textarea" autosize placeholder="请选择单位行政区域" />
 
 <van-action-sheet show="{{ show }}" bind:click-overlay="close">
     <view class="card">

components/picker/picker.js

@@ -21,7 +21,11 @@ Component({
         },
         emitKey: String,
         index: String,
-        placeholder: String
+        placeholder: String,
+        required: {
+            type: Boolean,
+            value: true
+        }
     },
     observers: {
         index: function (index) {

components/picker/picker.wxml

@@ -1,5 +1,5 @@
 <picker bindchange="bindChange" value="{{position}}" range="{{pickData}}" range-key="{{key}}">
-    <van-field required value="{{pickData[position][key]}}" label="{{label}}" readonly is-link center
+    <van-field required="{{ required }}" value="{{pickData[position][key]}}" label="{{label}}" readonly is-link center
                input-align="right" placeholder="{{placeholder||'请选择'+label}}"/>
 </picker>
 

pages/studentInfo/components/advantage-pop/advantage-pop.js

@@ -5,6 +5,10 @@ Component({
         show: Boolean,
         advantageData: Array,
         advantageIds: String,
+        required: {
+            type: Boolean,
+            value: true
+        }
     },
     observers: {
         advantageIds: function (newV) {

pages/studentInfo/components/advantage-pop/advantage-pop.wxml

@@ -1,4 +1,4 @@
-<van-field required value="{{advantage}}" label="特长优势" readonly is-link center
+<van-field required="{{required}}" value="{{advantage}}" label="特长优势" readonly is-link center
            input-align="right" bind:tap="bindAdvantageChange" autosize type="textarea"
            placeholder="请选择特长优势"/>
 

pages/studentInfo/studentInfo.js

@@ -8,6 +8,7 @@ import {logicStatus, studentTypes} from "../../model/enum";
 
 Page({
     data: {
+        isCommunityWorker: false,
         plusImageUrl: '/images/plus2.png',
         iCanUseAvatarButton: wx.canIUse('button.open-type.chooseAvatar'),
         isPC: false,
@@ -169,6 +170,7 @@ Page({
                 teamId,
                 id: eduStuId,
             },
+            isCommunityWorker: perType == studentTypes.COMMUNITY_WORKER,
             sexData,
             eduExpData,
             nationData,
@@ -236,6 +238,7 @@ Page({
                 'formData.jobId': -1,
                 'formData.code': '',
                 parentIds:'',
+                isCommunityWorker: eventParam['formData.perType'] == studentTypes.COMMUNITY_WORKER
             })
         }
         this.setData({
@@ -270,82 +273,152 @@ Page({
             toast('请选择性别')
             return;
         }
-        if (this.checkEmpty('education')) {
-            toast('请选择文化程度')
-            return;
-        }
-        if (this.checkEmpty('graduate')) {
-            toast('请输入毕业院校')
-            return;
-        }
-        if (this.checkUNChoose('isEmphasis')) {
-            toast('请选择是否211、985')
-            return;
-        }
         if (this.checkEmpty('nation')) {
             toast('请选择民族')
             return;
         }
-        if (this.checkUNChoose('specialtyId')) {
-            toast('请选择专业')
-            return;
-        }
-        if (this.checkUNChoose('isFullTime')) {
-            toast('请选择是否全日制')
-            return;
-        }
-        if (this.checkEmpty('advantage')) {
-            toast('请选择特长优势')
-            return;
-        }
-        if (this.checkUNChoose('isParty')) {
-            toast('请选择是否中共党员')
-            return;
-        }
-        if (this.checkUNChoose('isReceiveHonor')) {
-            toast('请选择是否有区级以上荣誉')
-            return;
-        }
         if (this.checkUNChoose('perType')) {
             toast('请选择学员类别')
             return;
         }
-        //社区工作者相关内容 start
-        if (this.checkEmpty('code')) {
-            let unitChooseTipContent = isCommunityWorker? '吉林省社区工作者必须选择到社区一级，非吉林省社区工作者必须选择到市一级!' : '请选择单位所在的行政区域！';
-            wx.showModal({
-                title: "单位所在的行政区域提示",
-                content: unitChooseTipContent,
-                showCancel: false
-            })
-            return;
-        }
-        if (isCommunityWorker && this.checkUNChoose('socialWorkLevel')) {
-            toast('请选择社工证等级')
-            return;
-        }
-        if (isCommunityWorker && this.checkEmpty('socialWorkYear')) {
-            toast('请选择社区工作年限')
-            return;
-        }
-        if (isCommunityWorker && this.checkUNChoose('isPromote')) {
-            toast('请选择是否在本年度提任社区书记')
-            return;
-        }
-        if (isCommunityWorker && this.data.formData.isPromote == logicStatus.YES && this.checkEmpty('formerPost')) {
-            toast('请输入原职务')
-            return;
-        }
-        if (this.checkUNChoose('jobId')) {
-            toast('请选择现任职务')
-            return;
-        }
 
-        if (this.checkEmpty('jobTime')) {
-            toast('请选择任职时间')
-            return;
-        }
+        // if (this.checkEmpty('education')) {
+        //     toast('请选择文化程度')
+        //     return;
+        // }
+        // if (this.checkEmpty('graduate')) {
+        //     toast('请输入毕业院校')
+        //     return;
+        // }
+        // if (this.checkUNChoose('isEmphasis')) {
+        //     toast('请选择是否211、985')
+        //     return;
+        // }
+       
+        // if (this.checkUNChoose('specialtyId')) {
+        //     toast('请选择专业')
+        //     return;
+        // }
+        // if (this.checkUNChoose('isFullTime')) {
+        //     toast('请选择是否全日制')
+        //     return;
+        // }
+        // if (this.checkEmpty('advantage')) {
+        //     toast('请选择特长优势')
+        //     return;
+        // }
+        // if (this.checkUNChoose('isParty')) {
+        //     toast('请选择是否中共党员')
+        //     return;
+        // }
+        // if (this.checkUNChoose('isReceiveHonor')) {
+        //     toast('请选择是否有区级以上荣誉')
+        //     return;
+        // }
+        
+        // //社区工作者相关内容 start
+        // if (this.checkEmpty('code')) {
+        //     let unitChooseTipContent = isCommunityWorker? '吉林省社区工作者必须选择到社区一级，非吉林省社区工作者必须选择到市一级!' : '请选择单位所在的行政区域！';
+        //     wx.showModal({
+        //         title: "单位所在的行政区域提示",
+        //         content: unitChooseTipContent,
+        //         showCancel: false
+        //     })
+        //     return;
+        // }
+        // if (isCommunityWorker && this.checkUNChoose('socialWorkLevel')) {
+        //     toast('请选择社工证等级')
+        //     return;
+        // }
+        // if (isCommunityWorker && this.checkEmpty('socialWorkYear')) {
+        //     toast('请选择社区工作年限')
+        //     return;
+        // }
+        // if (isCommunityWorker && this.checkUNChoose('isPromote')) {
+        //     toast('请选择是否在本年度提任社区书记')
+        //     return;
+        // }
+        // if (isCommunityWorker && this.data.formData.isPromote == logicStatus.YES && this.checkEmpty('formerPost')) {
+        //     toast('请输入原职务')
+        //     return;
+        // }
+        // if (this.checkUNChoose('jobId')) {
+        //     toast('请选择现任职务')
+        //     return;
+        // }
+
+        // if (this.checkEmpty('jobTime')) {
+        //     toast('请选择任职时间')
+        //     return;
+        // }
         if (isCommunityWorker) {
+            if (this.checkEmpty('education')) {
+                toast('请选择文化程度')
+                return;
+            }
+            if (this.checkEmpty('graduate')) {
+                toast('请输入毕业院校')
+                return;
+            }
+            if (this.checkUNChoose('isEmphasis')) {
+                toast('请选择是否211、985')
+                return;
+            }
+            if (this.checkUNChoose('specialtyId')) {
+                toast('请选择专业')
+                return;
+            }
+            if (this.checkUNChoose('isFullTime')) {
+                toast('请选择是否全日制')
+                return;
+            }
+            if (this.checkEmpty('advantage')) {
+                toast('请选择特长优势')
+                return;
+            }
+            if (this.checkUNChoose('isParty')) {
+                toast('请选择是否中共党员')
+                return;
+            }
+            if (this.checkUNChoose('isReceiveHonor')) {
+                toast('请选择是否有区级以上荣誉')
+                return;
+            } 
+            //社区工作者相关内容 start
+            if (this.checkEmpty('code')) {
+                let unitChooseTipContent = isCommunityWorker? '吉林省社区工作者必须选择到社区一级，非吉林省社区工作者必须选择到市一级!' : '请选择单位所在的行政区域！';
+                wx.showModal({
+                    title: "单位所在的行政区域提示",
+                    content: unitChooseTipContent,
+                    showCancel: false
+                })
+                return;
+            }
+            if (isCommunityWorker && this.checkUNChoose('socialWorkLevel')) {
+                toast('请选择社工证等级')
+                return;
+            }
+            if (isCommunityWorker && this.checkEmpty('socialWorkYear')) {
+                toast('请选择社区工作年限')
+                return;
+            }
+            if (isCommunityWorker && this.checkUNChoose('isPromote')) {
+                toast('请选择是否在本年度提任社区书记')
+                return;
+            }
+            if (isCommunityWorker && this.data.formData.isPromote == logicStatus.YES && this.checkEmpty('formerPost')) {
+                toast('请输入原职务')
+                return;
+            }
+            if (this.checkUNChoose('jobId')) {
+                toast('请选择现任职务')
+                return;
+            }
+            if (this.checkEmpty('jobTime')) {
+                toast('请选择任职时间')
+                return;
+            }
+
             if (this.checkUNChoose('isGridLeader')) {
                 toast('请选择是否网格长')
                 return;

pages/studentInfo/studentInfo.wxml

@@ -18,37 +18,36 @@
         <van-field required bind:change='onChange' value="{{formData.name}}" label="姓名" placeholder="请输入姓名" input-align="right" data-field="formData.name" />
 
         <edu-picker bind:change="changeInfo" label="性别" pickData="{{sexData}}" emitKey="formData.sex" index="{{formData.sex}}" />
-        <edu-picker bind:change="changeInfo" label="文化程度" pickData="{{eduExpData}}" emitKey="formData.education" index="{{formData.education}}" />
-
-        <van-field required bind:change='onChange' value="{{formData.graduate}}" label="毕业学校" placeholder="请输入毕业学校" input-align="right" data-field="formData.graduate" />
-
-        <edu-picker bind:change="changeInfo" label="是否211,985" emitKey="formData.isEmphasis" index="{{formData.isEmphasis}}" />
         <edu-picker bind:change="changeInfo" label="民族" pickData="{{nationData}}" emitKey="formData.nation" index="{{formData.nation}}" />
-        <edu-picker bind:change="changeInfo" label="所学专业" pickData="{{specialtyData}}" emitKey="formData.specialtyId" index="{{formData.specialtyId}}" />
-        <edu-picker bind:change="changeInfo" label="是否全日制" emitKey="formData.isFullTime" index="{{formData.isFullTime}}" />
+        <edu-picker bind:change="changeInfo" label="学员类别" pickData="{{studentTypeData}}" emitKey="formData.perType" index="{{formData.perType}}" />
+        <edu-picker bind:change="changeInfo" required="{{isCommunityWorker}}" label="文化程度" pickData="{{eduExpData}}" emitKey="formData.education" index="{{formData.education}}" />
 
-        <advantage-pop advantageIds="{{formData.advantage}}" bind:change="changeInfo" advantageData="{{advantageData}}" />
+        <van-field required="{{isCommunityWorker}}" bind:change='onChange' value="{{formData.graduate}}" label="毕业学校" placeholder="请输入毕业学校" input-align="right" data-field="formData.graduate" />
 
-        <edu-picker bind:change="changeInfo" label="是否中共党员" emitKey="formData.isParty" index="{{formData.isParty}}" />
-        <edu-picker bind:change="changeInfo" label="区级以上荣誉" emitKey="formData.isReceiveHonor" index="{{formData.isReceiveHonor}}" />
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="是否211,985" emitKey="formData.isEmphasis" index="{{formData.isEmphasis}}" />
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="所学专业" pickData="{{specialtyData}}" emitKey="formData.specialtyId" index="{{formData.specialtyId}}" />
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="是否全日制" emitKey="formData.isFullTime" index="{{formData.isFullTime}}" />
 
-        <edu-picker bind:change="changeInfo" label="学员类别" pickData="{{studentTypeData}}" emitKey="formData.perType" index="{{formData.perType}}" />
+        <advantage-pop required="{{isCommunityWorker}}" advantageIds="{{formData.advantage}}" bind:change="changeInfo" advantageData="{{advantageData}}" />
+
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="是否中共党员" emitKey="formData.isParty" index="{{formData.isParty}}" />
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="区级以上荣誉" emitKey="formData.isReceiveHonor" index="{{formData.isReceiveHonor}}" />
 
-        <edu-cascader wx:if="{{formData.perType!=-1}}" bind:change="changeInfo" parentIds="{{parentIds}}" perType="{{formData.perType}}" contactPhone="{{contactPhone}}" />
+        <edu-cascader required="{{isCommunityWorker}}" wx:if="{{formData.perType!=-1}}" bind:change="changeInfo" parentIds="{{parentIds}}" perType="{{formData.perType}}" contactPhone="{{contactPhone}}" />
 
         <block wx:if="{{formData.perType == studentTypesEnum.COMMUNITY_WORKER}}">
-            <edu-picker bind:change="changeInfo" label="社工证等级" pickData="{{socialWorkLevelData}}" emitKey="formData.socialWorkLevel" index="{{formData.socialWorkLevel}}" />
-            <edu-picker bind:change="changeInfo" label="社区工作年限" pickData="{{socialWorkYearData}}" emitKey="formData.socialWorkYear" index="{{formData.socialWorkYear}}" />
-            <edu-picker bind:change="changeInfo" label="是否在本年度提任社区书记" emitKey="formData.isPromote" index="{{formData.isPromote}}" placeholder="请选择" />
+            <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="社工证等级" pickData="{{socialWorkLevelData}}" emitKey="formData.socialWorkLevel" index="{{formData.socialWorkLevel}}" />
+            <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="社区工作年限" pickData="{{socialWorkYearData}}" emitKey="formData.socialWorkYear" index="{{formData.socialWorkYear}}" />
+            <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="是否在本年度提任社区书记" emitKey="formData.isPromote" index="{{formData.isPromote}}" placeholder="请选择" />
 
-            <van-field required bind:change='onChange' value="{{formData.formerPost}}" label="原职务" placeholder="请输入原职务" wx:if="{{formData.isPromote == logicStateEnum.YES}}" input-align="right" data-field="formData.formerPost" />
+            <van-field required="{{isCommunityWorker}}" bind:change='onChange' value="{{formData.formerPost}}" label="原职务" placeholder="请输入原职务" wx:if="{{formData.isPromote == logicStateEnum.YES}}" input-align="right" data-field="formData.formerPost" />
         </block>
 
-        <edu-picker bind:change="changeInfo" label="现任职务" pickData="{{formData.perType == studentTypesEnum.COMMUNITY_WORKER?communityJobData:otherJobData}}" emitKey="formData.jobId" index="{{formData.jobId}}" />
+        <edu-picker required="{{isCommunityWorker}}" bind:change="changeInfo" label="现任职务" pickData="{{formData.perType == studentTypesEnum.COMMUNITY_WORKER?communityJobData:otherJobData}}" emitKey="formData.jobId" index="{{formData.jobId}}" />
 
 
         <picker mode='date' bindchange="onChange" data-field="formData.jobTime" data-value="value">
-            <van-field required value="{{formData.jobTime}}" label="任职时间" readonly is-link input-align="right" placeholder="请选择开始任职时间" />
+            <van-field required="{{isCommunityWorker}}" value="{{formData.jobTime}}" label="任职时间" readonly is-link input-align="right" placeholder="请选择开始任职时间" />
         </picker>
 
         <block wx:if="{{formData.perType == studentTypesEnum.COMMUNITY_WORKER}}">