用户列表调整

src/business/platform/org/employee/constants/index.js

@@ -2,64 +2,64 @@
  * 参与者属性
  */
 export const partyTypeOptions = [
-  {
-    value: 'org',
-    label: '机构'
-  },
-  {
-    value: 'position',
-    label: '部门'
-  },
-  {
-    value: 'role',
-    label: '角色'
-  },
-  {
-    value: 'group',
-    label: '用户组'
-  }
+    {
+        value: 'org',
+        label: '机构'
+    },
+    {
+        value: 'position',
+        label: '部门'
+    },
+    {
+        value: 'role',
+        label: '角色'
+    },
+    {
+        value: 'group',
+        label: '用户组'
+    }
 ]
 /**
  * 人员状态
  */
 export const statusOptions = [
-  {
-    value: 'actived',
-    label: '已激活',
-    type: 'success'
-  },
-  {
-    value: 'inactive',
-    label: '未激活',
-    type: 'info'
-  },
-  {
-    value: 'expired',
-    label: '过期',
-    type: 'danger'
-  },
-  {
-    value: 'locked',
-    label: '锁定',
-    type: 'warning'
-  },
-  {
-    value: 'disabled',
-    label: '禁用',
-    type: 'danger'
-  }
+    {
+        value: 'actived',
+        label: '已激活',
+        type: 'success'
+    },
+    {
+        value: 'inactive',
+        label: '未激活',
+        type: 'info'
+    },
+    {
+        value: 'expired',
+        label: '过期',
+        type: 'danger'
+    },
+    {
+        value: 'locked',
+        label: '锁定',
+        type: 'warning'
+    },
+    {
+        value: 'disabled',
+        label: '禁用',
+        type: 'danger'
+    }
 ]
 
 /**
  * 性别
  */
 export const genderOptions = [
-  {
-    value: 'female',
-    label: '女'
-  },
-  {
-    value: 'male',
-    label: '男'
-  }
+    {
+        value: 'female',
+        label: '女'
+    },
+    {
+        value: 'male',
+        label: '男'
+    }
 ]

src/views/platform/org/employee/edit/index.vue

@@ -145,7 +145,7 @@ export default {
             defaultEmployee: {
                 id: '',
                 account: '',
-                password: '',
+                password: 'jyk123456',
                 isSuper: 'N',
                 name: '',
                 status: 'actived',

src/views/platform/org/employee/list.vue

@@ -114,7 +114,7 @@ export default {
                             'platform.org.employee.button.changePassword'
                         ),
                         icon: 'el-icon-refresh'
-                    }
+                    },
                     // { key: 'more', icon: 'ibps-icon-ellipsis-h' }
                 ],
                 searchForm: {
@@ -143,14 +143,14 @@ export default {
                             labelWidth: 50,
                             itemWidth: 150
                         },
-                        {
-                            prop: 'Q^POSITIONS_^SL',
-                            label: '归属组织',
-                            fieldType: 'select',
-                            options: this.positionsList,
-                            labelWidth: 70,
-                            itemWidth: 150
-                        },
+                        // {
+                        //     prop: 'Q^POSITIONS_^SL',
+                        //     label: '归属组织',
+                        //     fieldType: 'select',
+                        //     options: this.positionsList,
+                        //     labelWidth: 70,
+                        //     itemWidth: 150
+                        // },
                         {
                             prop: ['Q^CREATE_TIME_^DL', 'Q^CREATE_TIME_^DG'],
                             label: this.$t('common.field.createTime'),
@@ -172,6 +172,12 @@ export default {
                         label: this.$t('platform.org.employee.prop.account'),
                         width: 150
                     },
+                    {
+                        prop: 'gender',
+                        label: this.$t('platform.org.employee.prop.gender'),
+                        tags: genderOptions,
+                        width: 90
+                    },
                     // { prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
                     {
                         prop: 'positionsPath',
@@ -179,7 +185,6 @@ export default {
                         sortable: false,
                         minWidth: 200
                     },
-                    // { prop: 'qq', label: '客户单位名称', width: 250 },
                     {
                         prop: 'status',
                         label: this.$t('platform.org.employee.prop.status'),
@@ -281,21 +286,13 @@ export default {
                         },
                         {
                             key: 'switchUser',
-                            label: this.$t(
-                                'platform.org.employee.button.switchUser'
-                            ),
+                            label: this.$t('platform.org.employee.button.switchUser'),
                             icon: 'el-icon-sort',
                             hidden: function (rowData, index) {
                                 const userId = this.$store.getters.userId
                                 const isSuper = this.$store.getters.isSuper
-                                const isTenantAdmin =
-                                    this.$store.getters.isTenantAdmin
-                                return (
-                                    isTenantAdmin === true ||
-                                    rowData.status !== 'actived' ||
-                                    userId === rowData.id ||
-                                    !isSuper
-                                )
+                                const isTenantAdmin = this.$store.getters.isTenantAdmin
+                                return (isTenantAdmin === true || rowData.status !== 'actived' || userId === rowData.id || !isSuper)
                             }
                         }
                     ]

src/views/platform/org/org/constants/index.js

@@ -1,77 +1,77 @@
 
 export const orgStatusOption = [
-  {
-    value: 'actived',
-    label: '激活',
-    type: 'success'
-  },
-  // {
-  //   value: 'inactive',
-  //   label: '未激活',
-  //   type: 'info'
-  // },
-  // {
-  //   value: 'expired',
-  //   label: '过期',
-  //   type: 'danger'
-  // },
-  {
-    value: 'locked',
-    label: '锁定',
-    type: 'warning'
-  },
-  {
-    value: 'disabled',
-    label: '禁用',
-    type: 'danger'
-  },
-  {
-    value: 'deleted',
-    label: '已删除',
-    type: 'danger'
-  }
+    {
+        value: 'actived',
+        label: '激活',
+        type: 'success'
+    },
+    // {
+    //     value: 'inactive',
+    //     label: '未激活',
+    //     type: 'info'
+    // },
+    // {
+    //     value: 'expired',
+    //     label: '过期',
+    //     type: 'danger'
+    // },
+    {
+        value: 'locked',
+        label: '锁定',
+        type: 'warning'
+    },
+    {
+        value: 'disabled',
+        label: '禁用',
+        type: 'danger'
+    },
+    {
+        value: 'deleted',
+        label: '已删除',
+        type: 'danger'
+    }
 ]
 
 export const employeeStatusOption = [
-  {
-    value: 'actived',
-    label: '已激活',
-    type: 'success'
-  },
-  {
-    value: 'inactive',
-    label: '未激活',
-    type: 'info'
-  },
-  {
-    value: 'expired',
-    label: '过期',
-    type: 'danger'
-  },
-  {
-    value: 'locked',
-    label: '锁定',
-    type: 'warning'
-  },
-  {
-    value: 'disabled',
-    label: '禁用',
-    type: 'danger'
-  },
-  {
-    value: 'deleted',
-    label: '已删除',
-    type: 'danger'
-  }
+    {
+        value: 'actived',
+        label: '已激活',
+        type: 'success'
+    },
+    {
+        value: 'inactive',
+        label: '未激活',
+        type: 'info'
+    },
+    {
+        value: 'expired',
+        label: '过期',
+        type: 'danger'
+    },
+    {
+        value: 'locked',
+        label: '锁定',
+        type: 'warning'
+    },
+    {
+        value: 'disabled',
+        label: '禁用',
+        type: 'danger'
+    },
+    {
+        value: 'deleted',
+        label: '已删除',
+        type: 'danger'
+    }
 ]
 
 export const genderOption = [
-  {
-    value: 'male',
-    label: '男'
-  },
-  {
-    value: 'female',
-    label: '女'
-  }
+    {
+        value: 'male',
+        label: '男'
+    },
+    {
+        value: 'female',
+        label: '女'
+    }
 ]