Merge branch 'V0.0.2' of http://10.87.10.227:4000/jzyd_yyds/soc_web into V0.0.2

src/views/system/user/extend.vue

@@ -101,6 +101,13 @@
               </el-select>
             </el-form-item>
           </el-col> -->
+            <el-col :xs="24" :sm="12" :md="8" :lg="6">
+            <el-form-item prop="bornTime" label="出生日期">
+              <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
+                :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择出生日期">
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item label="参加工作时间" prop="workTime">
               <el-date-picker style="width: 217px;" v-model="formData.workTime" :picker-options="endDatepickerOptions"
@@ -109,13 +116,7 @@
             </el-form-item>
           </el-col>
 
-          <el-col :xs="24" :sm="12" :md="8" :lg="6">
-            <el-form-item prop="bornTime" label="出生日期">
-              <el-date-picker v-model="formData.bornTime" @change="startDateChanged"
-                :picker-options="startDatepickerOptions" align="right" type="date" placeholder="选择出生日期">
-              </el-date-picker>
-            </el-form-item>
-          </el-col>
+        
           <el-col :xs="24" :sm="12" :md="8" :lg="6">
             <el-form-item prop="entryTime" label="现任职时间">
               <el-date-picker v-model="formData.entryTime" :picker-options="endDatepickerOptions" align="right"

src/views/system/user/index.vue

@@ -121,7 +121,7 @@
               width="120" />
             <el-table-column label="操作" align="center" width="300" fixed="right" class-name="small-padding fixed-width">
               <template slot-scope="scope">
-                <el-button size="mini" type="text" icon="el-icon-plus" @click="handleExtend(scope.row)"
+                <el-button size="mini" type="text" icon="el-icon-plus" v-if="scope.row.isManage=='Y'" @click="handleExtend(scope.row)"
                   v-hasPermi="['system:user:extend']" >补充信息</el-button>
                 <el-button size="mini" type="text" icon="el-icon-edit" @click="handleUpdate(scope.row)"
                   v-hasPermi="['system:user:edit']" >编辑</el-button>