bug

packages/jianping/AppHelpedResident/AppHelpedResident.vue

@@ -30,7 +30,7 @@ export default {
       "yesOrNo", "fpLaborSkills", "fpEducation", "fpType", "fpPoliticalOutlook","fpType", "fpRiskType", "fpAssistanceMeasures",
       "fpPublicWelfarePostAssistance","fpHealthAssistance","fpFnancialAssistance","fpEmploymentAssistance","fpEducationalAssistance",
       "fpIndustrialAssistance","fpSocialAssistance", "fpRiskEliminationMethod", "fpNaturalDisaster", "fpHouseType", "fpHouseRoadType",
-      "fpFuelType", "fpDisabilityType",)
+      "fpFuelType", "fpDisabilityType", "fpEmploymentChannels")
   }
 }
 </script>

packages/jianping/AppHelpedResident/hrAdd.vue

@@ -75,13 +75,13 @@
                   <ai-select v-model="form.labourStatus" :selectList="dict.getDict('fpLaborSkills')"/>
                 </el-form-item>
                 <el-form-item label="是否会讲普通话">
-                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                  <ai-select v-model="form.mandarin" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="务工时间(月)">
                   <el-input v-model="form.workeMonths" placeholder="请输入" clearable/>
                 </el-form-item>
                 <el-form-item label="就业渠道">
-                  <el-input v-model="form.employmentChannels" placeholder="请输入" clearable/>
+                  <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
                 </el-form-item>
                 <el-form-item label="务工企业名称">
                   <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable/>
@@ -90,7 +90,7 @@
                   <el-input v-model="form.publicWelfarePosts" placeholder="请输入" clearable/>
                 </el-form-item>
                 <el-form-item label="是否国外务工">
-                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" placeholder="请选择" />
+                  <ai-select v-model="form.foreignWorkers" :selectList="dict.getDict('fpYesOrNo')" />
                 </el-form-item>
                 <el-form-item label="公益性岗位(月数)">
                   <el-input v-model="form.publicWelfarePostsMonths" placeholder="请输入" clearable/>
@@ -213,10 +213,10 @@
                 </el-form-item>
               </div>
               <el-form-item label="义务阶段未上学原因">
-                <el-input v-model="form.dropOutOfSchoolReason" placeholder="请输入" maxlength="30" show-word-limit clearable/>
+                <el-input v-model="form.dropOutOfSchoolReason" type="textarea" placeholder="请输入" maxlength="500" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="备注说明">
-                <el-input v-model="form.detail" placeholder="请输入" maxlength="30" show-word-limit clearable/>
+                <el-input v-model="form.detail" placeholder="请输入" type="textarea" maxlength="500" show-word-limit clearable/>
               </el-form-item>
               <el-form-item label="图片（最多9张）" >
                 <ai-uploader
@@ -377,6 +377,9 @@ export default {
         this.form.birthDate = '' 
         this.form.sex = '' 
         this.form.age = ''
+        this.form.nation = ''
+        this.form.education = ''
+        this.form.politicsStatus = ''
         return
       }
       this.form.name = e.name
@@ -384,6 +387,9 @@ export default {
       this.form.phone = e.phone
       this.form.currentAreaId = e.currentAreaId
       this.form.currentAddress = e.currentAddress
+      this.form.nation = e.nation
+      this.form.education = e.education
+      this.form.politicsStatus = e.politicsStatus
       this.handleIdNumberAutocomplete(e.idNumber)
       this.isSelectUser = true
     },

packages/jianping/AppHelpedResident/hrDetail.vue

@@ -5,20 +5,21 @@
         <template #rightBtn>
           <el-button type="primary" icon="iconfont iconEdit" @click="gotoEdit" v-if="$permissions('app_apppreventionreturntopoverty_edit')">编辑</el-button>
           <template v-if="isGridAdmin">
-            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 0 && girdAdminApplyStatus != 1">纳入监测</el-button>
+            <template v-if="detail.status == 0 || detail.status == 4">
-            <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 0 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
+              <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="girdAdminApplyStatus != 1">纳入监测</el-button>
-            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 4 && girdAdminApplyStatus != 1">纳入监测</el-button>
+              <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="girdAdminApplyStatus == 1">纳入监测审批</el-button>
-            <el-button type="primary" @click="examine('纳入监测审批', 2)" v-if="detail.status == 4 && girdAdminApplyStatus == 1">纳入监测审批</el-button>
+            </template>
+            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('解除风险', 4)" v-if="detail.status == 1">解除风险</el-button>
             <el-button type="primary" @click="examine('解除风险审批', 5)" v-if="detail.status == 2">解除风险审批</el-button>
-            <el-button type="primary" @click="applyMonitor('纳入监测', 1)" v-if="detail.status == 3">纳入监测</el-button>
           </template>
           <template v-if="user.info.girdCheckType == 1">
-            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 3">申请纳入监测</el-button>
+            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4 || detail.status == 3">申请纳入监测</el-button>
-            <el-button type="primary" @click="applyMonitor('申请纳入监测', 0)" v-if="detail.status == 4">申请纳入监测</el-button>
             <el-button type="primary" @click="applyMonitor('申请解除风险', 3)" v-if="detail.status == 1">申请解除风险</el-button>
           </template>
-          <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && /4/g.test(detail.status) && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          <template v-if="detail.status == 3 || detail.status == 4">
+            <el-button v-if="$permissions('app_apppreventionreturntopoverty_del') && user.info.girdCheckType != 0" icon="iconfont iconDelete" @click="handleDelete(detail.id)">删除</el-button>
+          </template>
         </template>
       </ai-title>
       <template #content>
@@ -64,7 +65,7 @@
                     <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", detail.labourStatus)}}</el-form-item>
                     <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", detail.mandarin)}}</el-form-item>
                     <el-form-item label="务工时间(月)">{{detail.workeMonths}}</el-form-item>
-                    <el-form-item label="就业渠道">{{detail.employmentChannels}}</el-form-item>
+                    <el-form-item label="就业渠道">{{dict.getLabel("fpEmploymentChannels", detail.employmentChannels)}}</el-form-item>
                     <el-form-item label="务工企业名称">{{detail.migrantEnterprises}}</el-form-item>
                     <el-form-item label="公益性岗位">{{detail.publicWelfarePosts}}</el-form-item>
                     <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", detail.foreignWorkers)}}</el-form-item>
@@ -259,7 +260,7 @@
                 <el-input v-model="form.workeMonths" placeholder="请输入" clearable />
               </el-form-item>
               <el-form-item label="就业渠道">
-                <el-input v-model="form.employmentChannels" placeholder="请输入" clearable />
+                <ai-select v-model="form.employmentChannels" :selectList="dict.getDict('fpEmploymentChannels')" />
               </el-form-item>
               <el-form-item label="务工企业名称">
                 <el-input v-model="form.migrantEnterprises" placeholder="请输入" clearable />
@@ -336,7 +337,7 @@
               <el-form-item label="劳动技能">{{dict.getLabel("fpLaborSkills", familyInfo.labourStatus)}}</el-form-item>
               <el-form-item label="是否会讲普通话">{{dict.getLabel("fpYesOrNo", familyInfo.mandarin)}}</el-form-item>
               <el-form-item label="务工时间(月)">{{familyInfo.workeMonths}}</el-form-item>
-              <el-form-item label="就业渠道">{{familyInfo.employmentChannels}}</el-form-item>
+              <el-form-item label="就业渠道">{{dict.getLabel("fpEmploymentChannels", familyInfo.employmentChannels)}}</el-form-item>
               <el-form-item label="务工企业名称">{{familyInfo.migrantEnterprises}}</el-form-item>
               <el-form-item label="公益性岗位">{{familyInfo.publicWelfarePosts}}</el-form-item>
               <el-form-item label="是否国外务工">{{dict.getLabel("fpYesOrNo", familyInfo.foreignWorkers)}}</el-form-item>
@@ -557,6 +558,9 @@ export default {
         this.form.age = ''
         this.form.currentAreaId = ''
         this.form.currentAddress = ''
+        this.form.nation = ''
+        this.form.education = ''
+        this.form.politicsStatus = ''
         return
       }
       this.form.name = e.name
@@ -564,6 +568,9 @@ export default {
       this.form.phone = e.phone
       this.form.currentAreaId = e.currentAreaId
       this.form.currentAddress = e.currentAddress
+      this.form.nation = e.nation
+      this.form.education = e.education
+      this.form.politicsStatus = e.politicsStatus
       this.handleIdNumberAutocomplete(e.idNumber)
       this.isSelectUser = true
     },

packages/jianping/AppHelpedResident/hrList.vue

@@ -18,9 +18,9 @@
             <el-date-picker value-format="yyyy-MM-dd HH:mm:ss" v-model="search.birthEnd" type="date" size="small" placeholder="选择出生结束日期"
               unlink-panels @change="page.current=1,getTableData()" />
             <ai-select placeholder="性别" v-model="search.sex" :selectList="dict.getDict('sex')" @change="page.current=1,getTableData()"/>
-            <ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
+            <!-- <ai-select placeholder="文化程度" v-model="search.education" :selectList="dict.getDict('fpEducation')" @change="page.current=1,getTableData()"/>
             <ai-select placeholder="民族" v-model="search.nation" :selectList="dict.getDict('fpNation')" @change="page.current=1,getTableData()"/>
-            <!-- <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/> -->
+            <ai-select placeholder="政治面貌" v-model="search.politicsStatus" :selectList="dict.getDict('fpPoliticalOutlook')" @change="page.current=1,getTableData()"/> -->
           </template>
           <template #right>
             <el-input size="small" placeholder="姓名/身份证/联系方式" v-model="search.con" clearable