Merge remote-tracking branch 'origin/master'

anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongAdd.vue

@@ -22,7 +22,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="jobNumber">
-                  <el-input v-model="temp.jobNumber" maxlength="20" placeholder="系统自动生成" clearable readonly/>
+                  <el-input v-model="temp.jobNumber" maxlength="20" placeholder="系统自动生成" clearable readonly />
                 </el-form-item>
               </el-col>
               <el-col :span="4">
@@ -45,11 +45,11 @@
                 </el-form-item>
               </el-col>
               <el-col :span="4">
-                <span><span class="icon">*</span>出生年月日</span>
+                <span>出生日期</span>
               </el-col>
               <el-col :span="8">
-                <el-form-item prop="birthday">
+                <el-form-item>
-                  <el-date-picker v-model="temp.birthday" style="width: 100%" type="date" placeholder="选择日期" value-format="yyyy-MM-dd"/>
+                  <el-date-picker v-model="temp.birthday" style="width: 100%" type="date" placeholder="自动从身份证号中获取" value-format="yyyy-MM-dd" readonly />
                 </el-form-item>
               </el-col>
             </el-row>
@@ -59,7 +59,7 @@
               </el-col>
               <el-col :span="8">
                 <el-form-item prop="idNo">
-                  <el-input v-model="temp.idNo" maxlength="20" placeholder="请输入身份证号" clearable/>
+                  <el-input v-model="temp.idNo" maxlength="20" placeholder="请输入身份证号" clearable @input="changeIdNo(temp.idNo)"/>
                 </el-form-item>
               </el-col>
               <el-col :span="4">
@@ -835,6 +835,14 @@ export default {
       })
     },
 
+    changeIdNo(value) {
+      if (value.length === 18) {
+        const year = value.substr(6, 4)
+        const month = value.substr(10, 2)
+        const day = value.substr(12, 2)
+        this.temp.birthday = year + '-' + (month >= 10 ? month : '0' + month) + '-' + (day >= 10 ? day : '0' + day)
+      }
+    },
     getNational(value) {
       console.log('触发下拉框按钮')
       let bb = null

anrui-management/anrui-management-ui/src/views/sysstaffinfo/yuangongInfo.vue

@@ -49,7 +49,7 @@
               </el-col>
               <el-col :span="4">
                 <el-form-item>
-                  <span>出生年月日</span>
+                  <span>出生日期</span>
                 </el-form-item>
               </el-col>
               <el-col :span="8">