Merge branch 'master' of http://113.105.137.151:22280/youjj/cloud-platform-ui

src/views/admin/user/index.vue

@@ -49,6 +49,9 @@
       <el-form-item v-if="dialogStatus == 'create'" label="密码" placeholder="请输入密码" prop="password">
         <el-input type="password" v-model="form.password"></el-input>
       </el-form-item>
+      <el-form-item v-if="dialogStatus == 'update'" label="密码" placeholder="请输入密码">
+        <el-input type="password" v-model="form.passwordEdit"></el-input>
+      </el-form-item>
       <el-form-item label="性别">
         <el-select class="filter-item" v-model="form.sex" placeholder="请选择">
           <el-option v-for="item in  sexOptions" :key="item" :label="item" :value="item"> </el-option>
@@ -128,6 +131,7 @@ export default {
         zoneId: undefined,
         companyId: undefined,
         password: undefined,
+        passwordEdit: undefined,
         description: undefined,
         dataLimit: [],
         members: [],
@@ -365,13 +369,18 @@ export default {
       set[formName].validate(valid => {
         if (valid) {
           this.dialogFormVisible = false;
+          if(this.form.passwordEdit){
+          this.form.password  = this.form.passwordEdit;
+          this.form.passwordEdit = undefined;
+          } else {
           this.form.password = undefined;
+         }
           putObj(this.form.id, this.form).then(() => {
             this.dialogFormVisible = false;
             this.getList();
             this.$notify({
               title: '成功',
-              message: '创建成功',
+              message: '编辑成功',
               type: 'success',
               duration: 2000
             });