lilei 3 лет назад
Родитель
Сommit
2906d65f18

+ 1 - 1
src/views/inventoryManagement/inventoryWarning/list.vue

@@ -92,7 +92,7 @@
         class="sTable"
         ref="table"
         size="default"
-        :row-selection="{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }"
+        :row-selection="$hasPermissions('B_inventoryWarning_refresh')?{ selectedRowKeys: selectedRowKeys, onChange: onChange, onSelect: onSelectChange, onSelectAll: onSelectAllChange }:null"
         :rowKey="(record) => record.id"
         :columns="columns"
         :dataSource="loadData"

+ 3 - 2
src/views/power/user/userModal.vue

@@ -81,7 +81,7 @@
             <a-col :span="24">
               <a-form-model-item label="角色" prop="roleNames" :label-col="{span: 3}" :wrapper-col="{span: 20}">
                 <a-select placeholder="请选择角色" id="userSyncEdit-roleNames" allowClear v-model="form.roleNames" mode="multiple">
-                  <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="item.isEnable == '0' ? true : false">{{ item.name }}</a-select-option>
+                  <a-select-option v-for="item in roleList" :key="item.id" :value="item.id" :disabled="!item.isEnable">{{ item.name }}</a-select-option>
                 </a-select>
               </a-form-model-item>
             </a-col>
@@ -150,7 +150,7 @@ export default {
         password: [ { required: true, message: '请输入用户密码', trigger: 'blur' }, { pattern: /^[0-9A-Za-z]{6,16}$/, message: '用户密码为6到16位数字或大小写字母组成!' } ],
         sex: [ { required: true, message: '请选择性别', trigger: 'change' } ],
         loginFlag: [ { required: true, message: '请选择状态', trigger: 'change' } ],
-        roleNames: [ { required: true, message: '请选择角色', trigger: 'change' } ]
+        roleNames: [ { required: true, type: 'array', message: '请选择角色', trigger: 'change' } ]
       }
     }
   },
@@ -226,6 +226,7 @@ export default {
         if (this.isshow && newValue) {
           if (this.nowData.id) { //  编辑
             this.titleText = '编辑用户'
+            console.log(this.nowData)
             this.form = Object.assign({}, this.nowData)
             if (this.nowData.roleIds) {
               this.form.roleNames = this.nowData.roleIds.split(',')