代码优化，用户列表加“角色”显示

magic-boot-ui/src/components/MagicBoot/mb-search.vue

@@ -70,9 +70,9 @@ export default {
     reset() {
       for(var key in this.where){
         if(this.where[key] instanceof Object){
-          this.where[key].value = ''
+          this.where[key].value = null
         }else{
-          this.where[key] = ''
+          this.where[key] = null
         }
       }
       this.$nextTick(() => this.$emit('search'))

magic-boot-ui/src/components/MagicBoot/mb-select.vue

@@ -1,6 +1,6 @@
 <template>
   <div>
-    <el-select v-if="mbType === 'select'" v-model="selectValue" v-bind="el" :style="{ width }" placeholder="请选择" filterable clearable>
+    <el-select v-if="mbType === 'select'" v-model="selectValue" v-bind="el" :style="{ width }" :placeholder="placeholder || '请选择'" filterable clearable>
       <el-option
         v-for="item in selectList"
         :key="item.value"
@@ -68,6 +68,10 @@ export default {
     el: {
       type: Object,
       default: () => {}
+    },
+    placeholder: {
+      type: String,
+      default: ''
     }
   },
   data() {
@@ -89,7 +93,7 @@ export default {
       this.loadData()
     },
     selectValue(value) {
-      if (this.el && this.el.multiple && !(this.value instanceof Array)) {
+      if (this.el && this.el.multiple && value.length > 0) {
         value = value.join(',')
       }
       this.$emit('update:value', value)

magic-boot-ui/src/components/MagicBoot/mb-table.vue

@@ -15,7 +15,7 @@
 
       <el-table-column v-if="selection" align="center" type="selection" width="50" />
 
-      <el-table-column v-if="showNo" label="序号" prop="num" align="center" width="100">
+      <el-table-column v-if="showNo" label="序号" prop="num" align="center" width="65">
         <template slot-scope="row">
           <span>{{ row.$index+1 }}</span>
         </template>

magic-boot-ui/src/views/system/role/role-list.vue

@@ -74,16 +74,16 @@ export default {
     return {
       permissionData: [{
         label: '全部',
-        value: 0
+        value: '0'
       }, {
         label: '自定义',
-        value: 1
+        value: '1'
       }, {
         label: '本级及子级',
-        value: 2
+        value: '2'
       }, {
         label: '本级',
-        value: 3
+        value: '3'
       }],
       tableOptions: {
         url: 'role/list',
@@ -182,7 +182,7 @@ export default {
         name: '',
         menus: '',
         offices: '',
-        permission: 0,
+        permission: '0',
         code: '',
         descRibe: ''
       }
@@ -201,7 +201,7 @@ export default {
     save() {
       this.$refs['dataForm'].validate((valid) => {
         if (valid) {
-          this.$post('role/save', this.temp).then((response) => {
+          this.$post('role/save', this.temp).then(() => {
             this.reloadTable()
             this.$refs.roleFormDialog.hide()
             this.$notify({

magic-boot-ui/src/views/system/user/user-form.vue

@@ -32,7 +32,7 @@
       </el-col>
       <el-col :span="12">
         <el-form-item label="选择角色" prop="roles">
-          <mb-select v-model="temp.roles" url="role/list?size=999999" labelField="name" valueField="id" :el="{ multiple: true }" />
+          <mb-select v-model="temp.roles" url="role/list?size=999999" placeholder="请选择角色" labelField="name" valueField="id" :el="{ multiple: true }" />
         </el-form-item>
       </el-col>
     </el-row>
@@ -84,7 +84,7 @@ export default {
         password: '',
         phone: '',
         isLogin: 0,
-        roles: '',
+        roles: null,
         officeId: null
       }
     },

magic-boot-ui/src/views/system/user/user-list.vue

@@ -68,6 +68,17 @@ export default {
             type: 'input',
             label: '姓名/昵称',
             value: ''
+          },
+          roleId: {
+            type: 'select',
+            label: '角色',
+            value: null,
+            properties: {
+              url: 'role/list?size=999999',
+              labelField: 'name',
+              valueField: 'id',
+              el: { multiple: true }
+            }
           }
         },
         cols: [
@@ -85,6 +96,10 @@ export default {
             field: 'officeName',
             title: '所属机构'
           },
+          {
+            field: 'roles',
+            title: '角色'
+          },
           {
             field: 'phone',
             title: '手机号',