Merge remote-tracking branch 'origin/dev' into dev

packages/jianping/AppHelpedResident/hrAdd.vue

@@ -19,7 +19,7 @@
                     <el-input v-model="form.phone" placeholder="请输入联系方式" :maxlength="11" show-word-limit/>
                   </el-form-item>
                   <el-form-item label="证件号码" prop="idNumber">
-                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="18" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
+                    <el-input v-model="form.idNumber" placeholder="请输入证件号码" :maxlength="20" :disabled="isEdit || isSelectUser" @change="handleIdNumberAutocomplete"/>
                   </el-form-item>
                 </div>
                 <el-form-item label="个人照片" prop="photo">
@@ -54,10 +54,10 @@
               </el-form-item>
               <div flex class="half wrap">
                 <el-form-item label="残疾类别">
-                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" placeholder="请选择" />
+                  <ai-select v-model="form.disabilityType" :selectList="dict.getDict('fpDisabilityType')" />
                 </el-form-item>
                 <el-form-item label="残疾办证年度">
-                  <el-date-picker v-model="form.disabilityCertificateYear" type="year" placeholder="请选择"/>
+                  <ai-select v-model="form.disabilityCertificateYear" :selectList="dict.getDict('fpYear')" />
                 </el-form-item>
               </div>
               <el-form-item label="基础保险">
@@ -437,8 +437,12 @@ export default {
       })
     },
     handleIdNumberAutocomplete(v) {
-      let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(v)
+      var idNumber = v
-      this.form = {...this.form, birthDate, sex, age: this.$calcAge(v)}
+      if(v.length == 20) {
+        idNumber = v.substring(0, 17)
+      }
+      let {birthday: birthDate, sex} = this.idCardNoUtil.getIdCardInfo(idNumber)
+      this.form = {...this.form, birthDate, sex, age: this.$calcAge(idNumber)}
     },
     submit() {
       this.$refs.ruleForm.validate(v => {

packages/jianping/AppHelpedResident/hrDetail.vue

@@ -47,7 +47,7 @@
                   </el-form-item>
                   <div flex class="half wrap">
                     <el-form-item label="残疾类别">{{dict.getLabel("fpDisabilityType", detail.disabilityType)}}</el-form-item>
-                    <el-form-item label="残疾办证年度">{{detail.disabilityCertificateYear}}</el-form-item>
+                    <el-form-item label="残疾办证年度">{{dict.getLabel("fpYear", detail.disabilityCertificateYear)}}</el-form-item>
                   </div>
                   <div flex class="half wrap">
                     <el-form-item label="城乡居民基本医疗保险">{{dict.getLabel("fpYesOrNo", detail.jcbxCxyiliao)}}</el-form-item>
@@ -181,6 +181,7 @@
                   </ai-table>
                 </template>
               </ai-card>
+              <div style="height:20px;"></div>
             </el-tab-pane>
             <el-tab-pane label="走访日志" lazy name="HrLog" v-if="$permissions('app_apppreventionreturntopovertylog_detail')">
               <hr-log v-if="currentTab == 'HrLog'" :instance="instance" :dict="dict" :permissions="permissions" />