Merge branch 'develop' into 'test'

src/containers/management/user/user.vue

@@ -67,7 +67,7 @@
           </el-date-picker>
         </el-form-item>
         <el-form-item class="editItem" label="工号" label-width="100px">
-          <el-input v-model.trim="selected.jobNumber" placeholder="请输入工号" :maxlength="20" clearable></el-input>
+          <el-input v-model.trim="selected.jobNumber" placeholder="请输入工号" :maxlength="8" clearable></el-input>
         </el-form-item>
         <el-form-item class="editItem" label="手机号" label-width="100px">
           <el-input v-model="selected.cellphone" ref="telInput" :maxlength="11" placeholder="请输入手机号" clearable></el-input>

src/containers/system/account/account.vue

@@ -77,6 +77,11 @@
         <el-form-item label="性别" label-width="200px">
           <el-radio v-for="(sex, index) in sexOptions" :key="index" v-model="selected.sex" :label="sex.value">{{sex.label}}</el-radio>
         </el-form-item>
+        <el-form-item v-if="editType === 0" label-width="200px">
+          <p style="color:red">
+            用户初始密码为：123456
+          </p>
+        </el-form-item>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <el-button @click="resetEditDialog">取 消</el-button>