权限选择默认

src/components/tools/UserPassword.vue

@@ -15,21 +15,21 @@
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="旧密码">
-          <a-input type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
+          <a-input-password type="password" placeholder="请输入旧密码" v-decorator="[ 'oldpassword', validatorRules.oldpassword]" />
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="新密码">
-          <a-input type="password" placeholder="请输入新密码" v-decorator="[ 'password', validatorRules.password]" />
+          <a-input-password type="password" placeholder="请输入新密码" v-decorator="[ 'password', validatorRules.password]" />
         </a-form-item>
 
         <a-form-item
           :labelCol="labelCol"
           :wrapperCol="wrapperCol"
           label="确认新密码">
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请确认新密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-input-password type="password" @blur="handleConfirmBlur" placeholder="请确认新密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
 
       </a-form>

src/views/system/UserList.vue

@@ -271,7 +271,7 @@
           {
             title: '手机号码',
             align: "center",
-            width: 100,
+            width: 110,
             dataIndex: 'phone'
           }, {
             title: '岗位',
@@ -285,6 +285,12 @@
             width: 180,
             dataIndex: 'orgCodeTxt'
           },
+          {
+            title: '角色',
+            align: "center",
+            width: 180,
+            dataIndex: 'roleName'
+          },
           // {
           //   title: '负责部门',
           //   align: "center",

src/views/system/modules/PasswordModal.vue

@@ -17,11 +17,11 @@
         </a-form-item>
 
         <a-form-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
-          <a-input type="password" placeholder="请输入登录密码" v-decorator="[ 'password', validatorRules.password]" />
+          <a-input-password type="password" placeholder="请输入登录密码" v-decorator="[ 'password', validatorRules.password]" />
         </a-form-item>
 
         <a-form-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" hasFeedback >
-          <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
+          <a-input-password type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-decorator="[ 'confirmpassword', validatorRules.confirmpassword]"/>
         </a-form-item>
 
       </a-form>
@@ -31,6 +31,7 @@
 
 <script>
   import {changePassword} from '@/api/api'
+  import { getAction } from '@api/manage'
 
   export default {
     name: "PasswordModal",
@@ -76,7 +77,23 @@
     },
 
     methods: {
+
+      selectPassword(){
+        getAction(`/sys/getPassWord`).then(res=>{
+          if(res.success){
+            const form = this.form;
+            var pw =res.result.passWord
+            form.setFieldsValue({'confirmpassword': pw})
+            form.setFieldsValue({'password':pw})
+           }else{
+            this.$message.error("查找失败")
+          }
+        }).catch(()=>{
+        })
+      },
+
       show (username) {
+        this.selectPassword()
         this.form.resetFields();
         this.visible = true;
         this.model.username = username;

src/views/system/modules/RoleModal.vue

@@ -16,8 +16,8 @@
           <a-input v-model="model.roleName" placeholder="请输入角色名称"/>
         </a-form-model-item>
 
-        <a-form-model-item label="数据权限"     >
-            <a-select placeholder="请选择数据权限"   v-model="model.power" >
+        <a-form-model-item label="数据权限"    required  >
+            <a-select placeholder="请选择数据权限"   v-model="select"  @change='handleAccountTypeChange'>
               <a-select-option :value="item.id" v-for="(item, index) in power" :key="index">
                 {{item.name}}
               </a-select-option>
@@ -44,6 +44,7 @@
           {"id":'2',"name":"查看本部门及以下"},
           {"id":'3',"name":"只查看本部门"},
         ],
+        select:null,
         title:"操作",
         visible: false,
         roleDisabled: false,
@@ -77,6 +78,7 @@
     created () {
       //备份model原始值
       this.modelDefault = JSON.parse(JSON.stringify(this.model));
+      this.select = '1';
     },
     methods: {
       codeActive(){
@@ -100,13 +102,21 @@
         this.$emit('close');
         this.visible = false;
       },
+      handleAccountTypeChange(e){
+        this.select = e;
+      },
       handleOk () {
         const that = this;
         // 触发表单验证
         this.$refs.form.validate(valid => {
           if (valid) {
+            if (this.select==="" || this.select===null){
+              that.$message.warning("数据权限未选择");
+              return
+            }
             that.confirmLoading = true;
             let obj;
+            this.model.power=this.select
             if(!this.model.id){
               obj=addRole(this.model);
             }else{

src/views/system/modules/UserModal.vue

@@ -28,11 +28,11 @@
 
         <template v-if="!model.id">
           <a-form-model-item label="登录密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="password" >
-            <a-input type="password" placeholder="请输入登录密码" v-model="model.password" />
+            <a-input-password type="password" placeholder="请输入登录密码" v-model="model.password" />
           </a-form-model-item>
 
           <a-form-model-item label="确认密码" :labelCol="labelCol" :wrapperCol="wrapperCol" prop="confirmpassword" >
-            <a-input type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-model="model.confirmpassword"/>
+            <a-input-password type="password" @blur="handleConfirmBlur" placeholder="请重新输入登录密码" v-model="model.confirmpassword"/>
           </a-form-model-item>
         </template>
 

src/views/user/LoginAccount.vue

@@ -7,9 +7,9 @@
           </a-input>
         </a-form-model-item>
         <a-form-model-item required prop="password" v-if='isLogin'>
-          <a-input v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码">
+          <a-input-password v-model="model.password" size="large" type="password" autocomplete="false" placeholder="请输入密码">
             <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-          </a-input>
+          </a-input-password>
         </a-form-model-item>
 
         <a-row :gutter="0" v-if='isLogin'>
@@ -27,15 +27,15 @@
         </a-row>
 
         <a-form-model-item required  v-if='!isLogin' prop='passwordNew'>
-          <a-input v-model="model.passwordNew" size="large"  type="password" placeholder="请输入新密码"  >
+          <a-input-password v-model="model.passwordNew" size="large"  type="password" placeholder="请输入新密码"  >
             <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-          </a-input>
+          </a-input-password>
         </a-form-model-item>
         <a-form-model-item required  v-if='!isLogin' prop='passwordNew' >
-          <a-input v-model="model.passwordNew2"  size="large" type="password"  placeholder="请确认新密码"
+          <a-input-password v-model="model.passwordNew2"  size="large" type="password"  placeholder="请确认新密码"
                     >
             <a-icon slot="prefix" type="lock" :style="{ color: 'rgba(0,0,0,.25)' }"/>
-          </a-input>
+          </a-input-password>
         </a-form-model-item>
         <a-form-item style="margin-top:24px;width: 100px" v-if='!isLogin'>
           <a-button size="large"  type="primary"  htmlType="submit" @click='updatePassword'  class="login-button"  >修改密码