t

src/views/user/components/popup/IndexEdit.vue

@@ -59,26 +59,36 @@ export default {
       }
       if (this.curObj.id) {
         this.formData = [
+          { label: '超级管理员', key: 'is_admin', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
           { label: '手机号', key: 'phone', rules: 1 },
           { label: '昵称', key: 'nickname', rules: 1 },
-          { label: '角色', key: 'rolesIds', type: 'selectRemote', multiple: true,
+          { label: '系统角色', key: 'rolesIds', type: 'selectRemote', multiple: true,
             remoteParams: { skey: 'name', api: `base.admroleslist`, opKey: 'name', opVal: 'id' },
             remoteOptions: remoteOptionsRoles
           },
           { label: '后台登录', key: 'is_backend', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
-          { label: '管理员', key: 'is_admin', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
+          { label: '楼盘角色', key: 'manage_type', type: 'select', class: 'c-2', options: this.$dictData.manage_type, },
+          { label: '关联楼盘', key: 'estate_id', type: 'selectRemote',
+            remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
+            remoteOptions: [{ keyRO: params.estate_name, valRO: params.estate_id }]
+          },
         ]
       } else {
         this.formData = [
+          { label: '超级管理员', key: 'is_admin', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
           { label: '手机号', key: 'phone', rules: 1 },
           { label: '昵称', key: 'nickname', rules: 1 },
           { label: '密码', key: 'password', rules: 1 },
-          { label: '角色', key: 'rolesIds', type: 'selectRemote', multiple: true,
+          { label: '系统角色', key: 'rolesIds', type: 'selectRemote', multiple: true,
             remoteParams: { skey: 'name', api: `base.admroleslist`, opKey: 'name', opVal: 'id' },
             remoteOptions: remoteOptionsRoles
           },
           { label: '后台登录', key: 'is_backend', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
-          { label: '管理员', key: 'is_admin', type: 'select', class: 'c-2', options: this.$dictData.sys_yesno, },
+          { label: '楼盘角色', key: 'manage_type', type: 'select', class: 'c-2', options: this.$dictData.manage_type, },
+          { label: '关联楼盘', key: 'estate_id', type: 'selectRemote',
+            remoteParams: { skey: 'estate_name', api: `house.admestatelist`, opKey: 'estate_name', opVal: 'id' },
+            remoteOptions: [{ keyRO: params.estate_name, valRO: params.estate_id }]
+          },
         ]
       }
       this.setDefaultValue(params)

src/views/user/index.vue

@@ -62,13 +62,14 @@ export default {
   mounted() {
     this.listConfig = {
       rows: [
+        { label: '系统', prop: 'is_admin', type: 'tag', tags: arrToObj(this.$dictData.sys_yesno), tagTypeObj: {'1': 'success', '2': 'danger'} },
         { label: '昵称', prop: 'nickname' },
         { label: '手机号', prop: 'phone' },
         { label: '角色', prop: 'role_name' },
         { label: '后台登录', prop: 'is_backend', type: 'tag', tags: arrToObj(this.$dictData.sys_yesno), tagTypeObj: {'1': 'success', '2': 'danger'} },
         { label: '类型', prop: 'user_type', type: 'tag', tags: arrToObj(this.$dictData.user_type), tagTypeObj: {'wx': 'success', 'sys': 'primary'} },
-        { label: '管理员', prop: 'is_admin', type: 'tag', tags: arrToObj(this.$dictData.sys_yesno), tagTypeObj: {'1': 'success', '2': 'danger'} },
-        { label: '更新人', prop: 'update_by' },
+        { label: '楼盘角色', prop: 'manage_type', type: 'flag', flags: arrToObj(this.$dictData.manage_type) }, 
+        { label: '关联楼盘', prop: 'estate_name' }, 
         { label: '更新时间', prop: 'update_at' },
         { label: '操作', width: 200, type: 'handle2', operations:
           [