postDto,居民信息新增民族与联系电话必填

src/views/components/resiForm.vue

@@ -262,7 +262,6 @@
                                               size="small"
                                               :label="itemk.opction.label"
                                               :value="itemk.opction.value"
-                                              @change="handleCateSlect"
                                               ></el-cascader>
                                 </template>
                                 <template v-else-if="itemk.itemType == 'number'">
@@ -326,6 +325,7 @@ export default {
         label:"联系电话",
         itemType:"input",
         formName:"mobile",
+        rules:[{required:true,message:'联系电话不能为空',trigger:'change' | blur },],
         opction:[],
       },
       {
@@ -356,6 +356,7 @@ export default {
         label:"民族",
         itemType:"select",
         formName:"nation",
+        rules:[{required:true,message:'民族不能为空',trigger:'change' | blur },],
         opction:[],
       },
       {
@@ -392,7 +393,8 @@ export default {
           {label:'失智老人',value:'0', formName:"dementedFlag"},
           {label:'残疾',value:'0', formName:"disabilityFlag"},
           {label:'大病',value:'0', formName:"seriousIllnessFlag"},
-          {label:'慢病',value:'0', formName:"chronicDiseaseFlag"}
+          {label:'慢病',value:'0', formName:"chronicDiseaseFlag"},
+          {label:'公益岗人员',value:'0', formName:"publicWelfareFlag"}
         ]
       }
     ],
@@ -1017,7 +1019,21 @@ export default {
           itemType:"datepicker1",
           formName:"reportDate",
         }]
-      }
+      },{
+        id:'postDto',
+        children:[   {
+          label:'入职时间',
+          itemType:"datepicker1",
+        formName:"hiredate",
+          opction:[]
+        },{
+          label:'岗位类型',
+          itemType:"select1",
+          formName:"jobPost",
+          opction:[]
+        },
+      ]
+      },
     ],
     newForm: {},
     form:{
@@ -1056,6 +1072,7 @@ export default {
           oldPeopleFlag:'0', //老年人
           emptyNesterFlag:'0', //空巢
           liveAloneFlag:'0', //独居老人
+          publicWelfareFlag:'0',
           disabledFlag:'0', //失能老人
           dementedFlag:'0', //失智老人
           disabilityFlag:'0',//是否残疾
@@ -1175,10 +1192,16 @@ export default {
           oldPeopleDto:{
             oldSubsidy:''//高龄补助
           },
+          
           specialDto:{//特殊人群
             id:'',//人群类别【字典表】,可多选，以英文逗号隔开；
             specialCategoryCode:[]
           },
+          postDto:{
+            hiredate:'',//入职时间
+            jobPost:'',//岗位类型
+            userId:''
+          },
           birthRecordDTO:{
             birthplace: '',
             father: '',
@@ -1205,7 +1228,7 @@ export default {
       {groupId:'economyDto',label:'经济情况'},
       {groupId:'resideInfoDto',label:'居住'},
       {groupId:'familyInfoDto',label:'家庭'},
-      {groupId:'birthRecordDTO',label:'出生人员'}
+      {groupId:'birthRecordDTO',label:'出生人员'},
     ]
    }
   },
@@ -1275,6 +1298,7 @@ export default {
       this.getHousing()
       this.getVolunteerNation()
       this.gethobbyNation()
+      this.getWelfareNation()
     },
     getGridList () {
       const { user } = this.$store.state
@@ -1401,6 +1425,21 @@ export default {
         console.log(error,'获取所患慢病字典');
       }
     },
+    async getWelfareNation(){
+      try {
+        const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'welfare_post'})
+        this.footerInputList.forEach(c => {
+          for(let i of c.children){
+              if(i.formName == 'jobPost'){
+                  i.opction = data.data
+              }
+          }
+        })
+
+      } catch (error) {
+        console.log(error,'获取公益岗位字典');
+      }
+    },
     async getHouseholdNation(){
       try {
         const { data } = await this.$http.post('sys/dict/data/dictlist', {'dictType':'household_situation'})
@@ -1548,6 +1587,8 @@ export default {
         this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
       }else if(val.formName == 'specialCrowdFlag') {
         this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
+      }else if(val.formName == 'publicWelfareFlag') {
+        this.tabsList.push({label:'公益岗人员',id:'7',groupId:'postDto'})
       }
       } else {
       let i = val.formName == 'partyFlag'?'0': 
@@ -1557,7 +1598,8 @@ export default {
               val.formName == 'unitedFrontFlag'?'4':
               val.formName == 'volunteerFlag'?'5':
               val.formName == 'oldPeopleFlag'?'6':
-              val.formName == 'specialCrowdFlag'?'7':''
+              val.formName == 'specialCrowdFlag'?'7':
+              val.formName == 'publicWelfareFlag'?'8':''
       if(i != ''){
             this.tabsList.forEach(item =>{
               if(i != item.id){
@@ -1653,12 +1695,10 @@ export default {
       this.getHouseList()
     },
     async handleClick (tab, event) {
-      // console.log(tab);
+      console.log(tab);
-      // console.log(event);
+      console.log(event);
-      // console.log(tab._props.label );
+      console.log(this.form.resiId );
-      
+    
-
-
       if (tab._props.label == '教育') {
         if (!this.form.resiId) {
           this.newForm.eduInfoDto = this.form.eduInfoDto
@@ -1761,6 +1801,13 @@ export default {
         } else {
           await this.getOldPeopleDetailById(this.form.resiId)
         }
+      } else if (tab._props.label == '公益岗人员') {
+        if (!this.form.resiId) {
+          this.newForm.postDto = this.form.postDto
+        } else {
+          //这个位置是调取公益岗人员详情
+          await this.getWelfareDetailById(this.form.resiId)
+        }
       }
     },
     handleForm () {
@@ -1944,7 +1991,7 @@ export default {
           this.form.tenantFlag = data.categoryInfo.tenantFlag.toString()
           this.form.floatingFlag = data.categoryInfo.floatingFlag.toString()
           this.form.liveAloneFlag = data.categoryInfo.liveAloneFlag.toString()
-
+          this.form.publicWelfareFlag = data.categoryInfo.publicWelfareFlag.toString()
           if(this.form.partyFlag == '1') this.tabsList.push({label:'党员',id:'0',groupId:'parymemberInfoDto'})
           if(this.form.ensureHouseFlag == '1') this.tabsList.push({label:'保障房信息',id:'1',groupId:'ensureHouseDto'})
           if(this.form.unemployedFlag == '1') this.tabsList.push({label:'失业',id:'2',groupId:'unemployedDto'})
@@ -1953,12 +2000,13 @@ export default {
           if(this.form.volunteerFlag == '1') this.tabsList.push({label:'志愿者信息',id:'5',groupId:'volunteerDto'})
           if(this.form.oldPeopleFlag == '1') this.tabsList.push({label:'老年人',id:'6',groupId:'oldPeopleDto'})
           if(this.form.specialCrowdFlag == '1') this.tabsList.push({label:'特殊人群',id:'7',groupId:'specialDto'})
+          if(this.form.publicWelfareFlag == '1') this.tabsList.push({label:'公益岗人员',id:'8',groupId:'postDto'})
         }
         let {categoryId, resiId, buildId, gridId, gridName, homeId, homeName,houseMergeId,unitId,
           villageId,birthday,gender,idNum,localResidenceFlag,mobile,name,nation,remark,
           partyFlag,subsistenceAllowanceFlag,ensureHouseFlag,unemployedFlag,fertileWomanFlag,veteranFlag,unitedFrontFlag,
           petitionOfficerFlag,volunteerFlag,oldPeopleFlag,emptyNesterFlag,bereavedPersonFlag,disabledFlag,
-          dementedFlag,disabilityFlag,seriousIllnessFlag,chronicDiseaseFlag,specialCrowdFlag,tenantFlag,floatingFlag,liveAloneFlag} = this.form
+          dementedFlag,disabilityFlag,seriousIllnessFlag,chronicDiseaseFlag,specialCrowdFlag,tenantFlag,floatingFlag,liveAloneFlag,publicWelfareFlag} = this.form
         this.newForm = {
           categoryId,
           resiId,
@@ -1999,7 +2047,9 @@ export default {
           tenantFlag,
           floatingFlag,
           liveAloneFlag,
+          publicWelfareFlag
         }
+        // this.newForm = {...this.form}
     },
     // 教育信息详情
     residentEduInfo(id) {
@@ -2307,6 +2357,23 @@ export default {
             this.newForm.oldPeopleDto = this.form.oldPeopleDto
           }
         })
+    },
+     // 公益岗人员信息详情
+     getWelfareDetailById(id) {
+      if(this.newForm.postDto) return
+      this.$http.post(`/actual/base/publicWelfarePost/detail`,{id:id}).then(({ data: res }) => {
+          if (res.code !== 0) {
+            return this.$message.error(res.msg);
+          } else {
+            this.form.postDto = res.data ? res.data : {
+              hiredate:'',//入职时间
+              jobPost:'',	//岗位类型
+              userId:id
+            }
+
+            this.newForm.postDto = this.form.postDto
+          }
+        })
     },
     // 特殊人群信息
     residentSpecial(id) {
@@ -2368,6 +2435,7 @@ export default {
         disabilityFlag:'0',//是否残疾
         seriousIllnessFlag:'0', //大病
         chronicDiseaseFlag:'0', //慢病
+        publicWelfareFlag:'0',//公益岗
       }
 
       this.newForm.eduInfoDto = this.form.eduInfoDto
@@ -2413,7 +2481,8 @@ export default {
       this.newForm.dementedFlag = this.form.dementedFlag,
       this.newForm.disabilityFlag = this.form.disabilityFlag,
       this.newForm.seriousIllnessFlag = this.form.seriousIllnessFlag,
-      this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag
+      this.newForm.chronicDiseaseFlag = this.form.chronicDiseaseFlag,
+      this.newForm.publicWelfareFlag = this.form.publicWelfareFlag
       if(this.newForm.eduInfoDto) {
         this.newForm.eduInfoDto = this.form.eduInfoDto
       }
@@ -2472,6 +2541,9 @@ export default {
       if(this.newForm.specialDto){
         this.newForm.specialDto = this.form.specialDto
       }
+      if(this.newForm.postDto){
+        this.newForm.postDto = this.form.postDto
+      }
     }
   }
 }

src/views/components/resiInfo.vue

@@ -91,6 +91,7 @@
                    <span  class="f-right30 f-w70  f-font-color f-bto16" v-show="resiDetailObj.categoryInfo.unemployedFlag==1">失业人员</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16"  v-show="resiDetailObj.categoryInfo.veteranFlag==1">退役军人</span> 
                    <span  class="f-right30 f-w70  f-font-color f-bto16"  v-show="resiDetailObj.categoryInfo.volunteerFlag==1">志愿者</span> 
+                   <span  class="f-right30 f-w70  f-font-color f-bto16"  v-show="resiDetailObj.categoryInfo.publicWelfareFlag==1">公益岗人员</span> 
                
                 </section>
                 <section v-else>--</section>
@@ -860,6 +861,22 @@
                               </el-col>
                           </el-row>
                       </el-tab-pane>
+                      <el-tab-pane label="公益岗人员"  v-if="gygShowStatus">
+                        <el-row>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">入职时间:</div>  
+                                <span class="f-left8 f-font-color">{{postDto.hiredate?postDto.hiredate:'--'}}</span> 
+                               </div>
+                              </el-col>
+                              <el-col :span="8">
+                                <div class="f-flex f-bto16 f-top24">
+                                   <div class="f-labels">岗位类型:</div>  
+                                <span class="f-left8 f-font-color">{{postDto.jobPost?postDto.jobPost:'--'}}</span> 
+                               </div>
+                              </el-col>
+                          </el-row>
+                      </el-tab-pane>
                 </el-tabs>
 
   </div>
@@ -908,6 +925,7 @@ export default {
     residentResideInfoObj:{},//居住
     residentFamilyInfoObj:{},//家庭
     residentDeathRecordObj:{},//死亡
+    postDto:{},//公益岗人员
     resiEconomyObj:{},
     residentMoveOutRecordObj:{},//迁出
     // 字典分割线
@@ -992,7 +1010,7 @@ export default {
           for (let key in this.resiDetailObj.categoryInfo) {
           if(this.resiDetailObj.categoryInfo[key] == 0){
               num++
-              if(num >= 21){
+              if(num >= 22){
                 flag = false
               }else {
                flag = true
@@ -1268,6 +1286,19 @@ export default {
           }
           return flag
         },
+        gygShowStatus(){
+          let flag = false
+          if(this.resiDetailObj.categoryInfo){
+              if(this.resiDetailObj.categoryInfo.publicWelfareFlag==1){
+                flag = true
+              }else{
+                flag = false
+              }
+          }else{
+            flag = false
+          }
+          return flag
+        },
   },
   watch: {
     
@@ -1362,6 +1393,8 @@ export default {
             this.getResidentMoveOutRecord()
           }else if (tab._props.label == "更新记录"){
             this.getChangeRecordDetailById()
+          }else if (tab._props.label == "公益岗人员"){
+            this.getChangepostDtoById()
           }
       },
       async getEduInfoDtoObj(){
@@ -1380,7 +1413,7 @@ export default {
         try {
           const {data} = await this.$http.post(`/actual/base/residentChangeRecord/getChangeRecordDetailById/${this.resiId}`)
          if(data.data == null){
-           this.eduInfoDto = []
+           this.eduInfoDto = {}
          }else{
           this.tableData = data.data
          }
@@ -1388,6 +1421,18 @@ export default {
           console.log(error);
          }
       },
+      async getChangepostDtoById(){
+        try {
+          const {data} = await this.$http.post(`/actual/base/publicWelfarePost/detail`,{id:this.resiId})
+         if(data.data == null){
+           this.postDto = {}
+         }else{
+          this.postDto = data.data
+         }
+         } catch (error) {
+          console.log(error);
+         }
+      },
       //获取兴趣爱好
       async getResidentHobbyInfoObj(){
         try {

src/views/modules/base/resi.vue

@@ -1400,9 +1400,12 @@ export default {
 			(_baseForm.fertileWomanFlag = parseInt(_baseForm.fertileWomanFlag)), //育龄妇女
 				(_baseForm.veteranFlag = parseInt(_baseForm.veteranFlag)); //退役军人
 			_baseForm.unitedFrontFlag = parseInt(_baseForm.unitedFrontFlag); //统战人员
-			_baseForm.petitionOfficerFlag = parseInt(
+			//公益岗人员
-				_baseForm.petitionOfficerFlag
+			_baseForm.publicWelfareFlag = parseInt(
-			); //信访人员
+				_baseForm.publicWelfareFlag
+			);
+			 //信访人员
+			_baseForm.unemployedFlag = parseInt(_baseForm.unemployedFlag); //失业
 			_baseForm.volunteerFlag = parseInt(_baseForm.volunteerFlag); //志愿者
 			_baseForm.bereavedPersonFlag = parseInt(
 				_baseForm.bereavedPersonFlag

src/views/modules/communityService/commonDemand/index.vue

@@ -213,7 +213,7 @@
 
             </el-table-column>
 
-            <el-table-column prop="serviceTimeCreate"
+            <el-table-column prop="createdTime"
                              align="center"
                              min-width="150"
                              label="服务发起时间"

src/views/modules/communityService/fuwuzhaoren/addForm.vue

@@ -400,26 +400,6 @@ export default {
   },
 
   data() {
-    // let endDisabledDate = (time) => {
-    //   //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-    //   let nowData = Date.now();
-    //   if (this.formData.serviceTimeStart) {
-    //     let serviceTimeStart = new Date(this.formData.serviceTimeStart);
-    //     return (
-    //       time.getTime() > nowData ||
-    //       time.getTime() < serviceTimeStart ||
-    //       time.getTime() === serviceTimeStart
-    //     );
-    //   } else {
-    //     return time.getTime() > nowData;
-    //   }
-    // };
-
-    // let startDisabledDate = (time) => {
-    //   //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
-    //   let nowData = Date.now();
-    //   return time.getTime() > nowData;
-    // };
     let endDisabledDate = (time) => {
       //这个关键属性我们一定要写在data的里面并且return的外面，这是动态改变区间的关键
       let nowData = Date.now();