调整显示位置

src/views/modules/epidemic/epidemicreportuserinfo-add-or-update.vue

@@ -20,37 +20,12 @@
                   clearable
                   @keyup.native="btKeyUpUserName"></el-input>
       </el-form-item>
-      <el-form-item label="性别"
-                    prop="gender"
-                    label-width="155px">
-        <el-select v-model="dataForm.gender"
-                   clearable
-                   placeholder="性别">
-          <el-option v-for="item in gender"
-                     :key="item.dictValue"
-                     :label="item.dictName"
-                     :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="民族"
-                    prop="nation"
-                    label-width="155px">
-        <el-input v-model="dataForm.nation"
-                  placeholder="民族"></el-input>
-      </el-form-item>
       <el-form-item label="曾用名"
                     prop="formerName"
                     label-width="155px">
         <el-input v-model="dataForm.formerName"
                   placeholder="曾用名"></el-input>
       </el-form-item>
-      <el-form-item label="出生年月"
-                    prop="birthday"
-                    label-width="155px">
-        <el-input v-model="dataForm.birthday" disabled
-                  placeholder="出生年月"></el-input>
-      </el-form-item>
       <el-form-item label="身份证号"
                     prop="idCard"
                     label-width="155px">
@@ -58,8 +33,23 @@
                   placeholder="身份证"
                   clearable
                   maxlength="49"
+                  @blur="getSexAndBirthDay"
                   @keyup.native="btKeyUpIdCard"></el-input>
       </el-form-item>
+      <el-form-item label="性别" prop="gender" label-width="155px">
+        <el-radio-group v-model="dataForm.gender" :disabled="true">
+          <el-radio  label="0">女</el-radio>
+          <el-radio  label="1">男</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday" label-width="155px">
+        <el-date-picker
+            v-model="dataForm.birthday"
+            type="date"
+            placeholder="选择日期"
+            :disabled="true">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="联系方式"
                     prop="mobile"
                     label-width="155px">
@@ -69,6 +59,12 @@
                   maxlength="11"
                   @keyup.native="btKeyUpMobile"></el-input>
       </el-form-item>
+      <el-form-item label="民族"
+                    prop="nation"
+                    label-width="155px">
+        <el-input v-model="dataForm.nation"
+                  placeholder="民族"></el-input>
+      </el-form-item>
 <!--      <el-form-item label="户籍地"-->
 <!--                    prop="householdRegisterName"-->
 <!--                    label-width="155px">-->
@@ -661,6 +657,34 @@ export default {
       this.dataForm.destinationAddressCode = destinationAddressCode
       this.dataForm.destinationAddressName = destinationAddressName
     },
+    getSexAndBirthDay () {
+      // 先判断身份证是否合法
+      this.$http.get(`/custom/populationinformation/isIdentifyNoLegal/${this.dataForm.idCard}`).then(({ data: res }) => {
+        if (res.code !== 0) {
+          this.dataForm.idcard = ''
+          return this.$message.error(res.msg)
+        }
+        let identifyNo = this.dataForm.idCard
+        this.dataForm.gender = this.IdCard(identifyNo, 2)
+        this.dataForm.birthday = this.IdCard(identifyNo, 1)
+      }).catch(() => { })
+    },
+    IdCard (UUserCard, num) {
+      if (num === 1) {
+        // 获取出生日期
+        return UUserCard.substring(6, 10) + '-' + UUserCard.substring(10, 12) + '-' + UUserCard.substring(12, 14)
+      }
+      if (num === 2) {
+        // 获取性别
+        if (parseInt(UUserCard.substr(16, 1)) % 2 === 1) {
+          // 男
+          return '1'
+        } else {
+          // 女
+          return '0'
+        }
+      }
+    },
     getOptions () {
       this.$http
         .get(`/custom/select/getSysArea`)

src/views/modules/epidemic/epidemicreportuserinfoDetail.vue

@@ -21,37 +21,12 @@
                   clearable
                   @keyup.native="btKeyUpUserName"></el-input>
       </el-form-item>
-      <el-form-item label="性别"
-                    prop="gender"
-                    label-width="155px">
-        <el-select v-model="dataForm.gender"
-                   clearable
-                   placeholder="性别">
-          <el-option v-for="item in gender"
-                     :key="item.dictValue"
-                     :label="item.dictName"
-                     :value="item.dictValue">
-          </el-option>
-        </el-select>
-      </el-form-item>
-      <el-form-item label="民族"
-                    prop="nation"
-                    label-width="155px">
-        <el-input v-model="dataForm.nation"
-                  placeholder="民族"></el-input>
-      </el-form-item>
       <el-form-item label="曾用名"
                     prop="formerName"
                     label-width="155px">
         <el-input v-model="dataForm.formerName"
                   placeholder="曾用名"></el-input>
       </el-form-item>
-      <el-form-item label="出生年月"
-                    prop="birthday"
-                    label-width="155px">
-        <el-input v-model="dataForm.birthday"
-                  placeholder="出生年月"></el-input>
-      </el-form-item>
       <el-form-item label="身份证号"
                     prop="idCard"
                     label-width="155px">
@@ -61,6 +36,20 @@
                   maxlength="49"
                   @keyup.native="btKeyUpIdCard"></el-input>
       </el-form-item>
+      <el-form-item label="性别" prop="gender" label-width="155px">
+        <el-radio-group v-model="dataForm.gender">
+          <el-radio  label="0">女</el-radio>
+          <el-radio  label="1">男</el-radio>
+        </el-radio-group>
+      </el-form-item>
+      <el-form-item label="出生日期" prop="birthday" label-width="155px">
+        <el-date-picker
+            v-model="dataForm.birthday"
+            type="date"
+            placeholder="选择日期"
+            :disabled="true">
+        </el-date-picker>
+      </el-form-item>
       <el-form-item label="联系方式"
                     prop="mobile"
                     label-width="155px">
@@ -70,6 +59,12 @@
                   maxlength="11"
                   @keyup.native="btKeyUpMobile"></el-input>
       </el-form-item>
+      <el-form-item label="民族"
+                    prop="nation"
+                    label-width="155px">
+        <el-input v-model="dataForm.nation"
+                  placeholder="民族"></el-input>
+      </el-form-item>
 <!--      <el-form-item label="户籍地"-->
 <!--                    prop="householdRegisterName"-->
 <!--                    label-width="155px">-->

src/views/modules/house/househeadedit.vue

@@ -94,11 +94,14 @@
           </el-radio-group>
         </el-form-item>
         <el-form-item label="特殊人群" prop="specialCrowd">
-          <el-radio-group v-model="dataForm.specialCrowd">
+          <el-select v-model="dataForm.specialCrowd" clearable
-            <el-radio  v-for="item in specialCrowdList"
+                     placeholder="请选择">
+            <el-option v-for="item in specialCrowdList"
                        :key="item.dictValue"
-                       :label="item.dictValue">{{item.dictName}}</el-radio>
+                       :label="item.dictName"
-          </el-radio-group>
+                       :value="item.dictValue">
+            </el-option>
+          </el-select>
         </el-form-item>
           <el-form-item label="服兵役" prop="militaryService">
             <el-radio-group v-model="dataForm.militaryService">

src/views/modules/house/houseresidentInfo-add-or-update.vue

@@ -43,11 +43,14 @@
         </el-radio-group>
       </el-form-item>
       <el-form-item label="特殊人群" prop="specialCrowd">
-        <el-radio-group v-model="dataForm.specialCrowd">
+        <el-select v-model="dataForm.specialCrowd" clearable
-          <el-radio  v-for="item in specialCrowdList"
+                   placeholder="请选择">
+          <el-option v-for="item in specialCrowdList"
                      :key="item.dictValue"
-                     :label="item.dictValue">{{item.dictName}}</el-radio>
+                     :label="item.dictName"
-        </el-radio-group>
+                     :value="item.dictValue">
+          </el-option>
+        </el-select>
       </el-form-item>
       <el-form-item label="工作单位/学校" prop="currentEmployer">
         <el-input v-model.trim="dataForm.currentEmployer" placeholder="工作单位/学校" maxlength="30" show-word-limit></el-input>