Преглед изворни кода

update 登录页面和用户管理

linweizeng пре 3 година
родитељ
комит
46169ff2b9

+ 67 - 56
src/views/platform/org/employee/constants/index.js

@@ -1,68 +1,79 @@
 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: '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 genderOptions = [
-  {
-    value: 'male',
-    label: '男'
-  },
-  {
-    value: 'female',
-    label: '女',
-    type: 'danger'
-  }]
+    {
+        value: 'male',
+        label: '男'
+    },
+    {
+        value: 'female',
+        label: '女',
+        type: 'danger'
+    }]
+export const typeOptions = [
+    {
+        value: '1',
+        label: '内部员工',
+        type: 'success'
+    },
+    {
+        value: '2',
+        label: '客户',
+
+    }]
 export const isSuperOptions = [
-  {
-    value: 'Y',
-    label: '是'
-  },
-  {
-    value: 'N',
-    label: '否',
-    type: 'danger'
-  }
+    {
+        value: 'Y',
+        label: '是'
+    },
+    {
+        value: 'N',
+        label: '否',
+        type: 'danger'
+    }
 ]
 
 export const userSecurityTextObj = {
-  '1': '必须包含小写字母',
-  '2': '必须包含大写字母',
-  '3': '必须包含数字',
-  '4': '必须包含特殊字符'
+    '1': '必须包含小写字母',
+    '2': '必须包含大写字母',
+    '3': '必须包含数字',
+    '4': '必须包含特殊字符'
 }
 
 export const regx = {
-  '1': /[a-z]/g,
-  '2': /[A-Z]/g,
-  '3': /\d+/g,
-  '4': /((?=[\x21-\x7e]+)[^A-Za-z0-9])/g
+    '1': /[a-z]/g,
+    '2': /[A-Z]/g,
+    '3': /\d+/g,
+    '4': /((?=[\x21-\x7e]+)[^A-Za-z0-9])/g
 }

+ 0 - 6
src/views/platform/org/employee/edit/basic-info.vue

@@ -49,12 +49,6 @@
           <el-input v-if="!readonly" v-model="formData.qq" />
           <span v-else>{{ formData.qq }}</span>
         </el-form-item>
-
-        <el-form-item label="1">
-          <el-input v-if="!readonly" v-model="formData.wcAccount" />
-          <span v-else>{{ formData.wcAccount }}</span>
-        </el-form-item>
-
         <el-form-item label="员工姓名" prop="name">
           <el-input v-if="!readonly" v-model="formData.name" />
           <span v-else>{{ formData.name }}</span>

+ 401 - 378
src/views/platform/org/employee/list.vue

@@ -1,400 +1,423 @@
 <template>
-  <ibps-container type="full" class="page">
-    <ibps-crud
-      ref="crud"
-      style="width: 100%;"
-      :height="height"
-      :data="listData"
-      :toolbars="listConfig.toolbars"
-      :search-form="listConfig.searchForm"
-      :pk-key="pkKey"
-      :columns="listConfig.columns"
-      :row-handle="listConfig.rowHandle"
-      :pagination="pagination"
-      :loading="loading"
-      display-field="用户管理"
-      :display-field-data="listConfig.displayFieldData"
-      @display-field-change="handleDisplayField"
-      @header-dragend="handleHeaderDragend"
-      @action-event="handleAction"
-      @sort-change="handleSortChange"
-      @pagination-change="handlePaginationChange"
-    />
-    <!-- 新增、编辑、明细 -->
-    <edit
-      :id="editId"
-      :title="title"
-      :visible="dialogFormVisible"
-      :readonly="readonly"
-      :span="span"
-      @dialog-callback="search"
-      @close="visible => dialogFormVisible = visible"
-    />
-    <!-- 重置密码 -->
-    <change-password
-      :ids="changePasswordIds"
-      :visible="changePasswordVisible"
-      :title="$t('platform.org.employee.change-password.resetPassword')"
-      is-reset
-      :reg-open="true"
-      @dialog-callback="search"
-      @close="visible => changePasswordVisible = visible"
-    />
-    <more-search
-      ref="moreSearch"
-      :title="moreSearchTitle"
-      :visible="dialogMoreSearchVisible"
-      party-type="employee"
-      @callback="search"
-      @close="visible => dialogMoreSearchVisible = visible"
-      @action-event="handleMoreSearchAction"
-    />
-  </ibps-container>
+    <ibps-container type="full" class="page">
+        <ibps-crud ref="crud" style="width: 100%" :height="height" :data="listData" :toolbars="listConfig.toolbars" :search-form="listConfig.searchForm" :pk-key="pkKey" :columns="listConfig.columns" :row-handle="listConfig.rowHandle" :pagination="pagination" :loading="loading" display-field="用户管理" :display-field-data="listConfig.displayFieldData" @display-field-change="handleDisplayField" @header-dragend="handleHeaderDragend" @action-event="handleAction" @sort-change="handleSortChange" @pagination-change="handlePaginationChange" />
+        <!-- 新增、编辑、明细 -->
+        <edit :id="editId" :title="title" :visible="dialogFormVisible" :readonly="readonly" :span="span" @dialog-callback="search" @close="(visible) => (dialogFormVisible = visible)" />
+        <!-- 重置密码 -->
+        <change-password :ids="changePasswordIds" :visible="changePasswordVisible" :title="$t('platform.org.employee.change-password.resetPassword')" is-reset :reg-open="true" @dialog-callback="search" @close="(visible) => (changePasswordVisible = visible)" />
+        <more-search ref="moreSearch" :title="moreSearchTitle" :visible="dialogMoreSearchVisible" party-type="employee" @callback="search" @close="(visible) => (dialogMoreSearchVisible = visible)" @action-event="handleMoreSearchAction" />
+    </ibps-container>
 </template>
 
 <script>
 import { queryPageList, remove, active, disable } from '@/api/platform/org/employee'
 import ActionUtils from '@/utils/action'
-import { statusOptions, genderOptions } from './constants'
+import { statusOptions, genderOptions, typeOptions } from './constants'
 import { mapActions, mapMutations } from 'vuex'
 import Edit from './edit/index'
 import ChangePassword from './change-password'
 import CustomDataDisplayMixin from '@/business/platform/system/mixins/customDataDisplay'
 import MoreSearch from './more-search'
+import curdPost from '@/business/platform/form/utils/custom/joinCURD.js'
 export default {
-  components: {
-    Edit,
-    ChangePassword,
-    MoreSearch
-  },
-  mixins: [CustomDataDisplayMixin],
-  data() {
-    return {
-      height: document.clientHeight,
-      title: '',
-      moreSearchTitle: '更多查询',
-      loading: true,
-      // 编辑dialog需要使用
-      editId: '',
-      span: '',
-      dialogFormVisible: false,
-      readonly: false, // 是否只读
+    components: {
+        Edit,
+        ChangePassword,
+        MoreSearch
+    },
+    mixins: [CustomDataDisplayMixin],
+    data() {
+        return {
+            height: document.clientHeight,
+            title: '',
+            moreSearchTitle: '更多查询',
+            loading: true,
+            // 编辑dialog需要使用
+            editId: '',
+            span: '',
+            dialogFormVisible: false,
+            readonly: false, // 是否只读
 
-      changePasswordIds: '',
-      changePasswordVisible: false,
-      pkKey: 'id', // 主键  如果主键不是pk需要传主键
-      listIdentity: 'ibps-org-employee', // 列表标识
-      listData: [],
-      listConfig: {
-        displayField: '’',
-        displayFieldData: [],
-        toolbars: [
-          { key: 'search' },
-          { key: 'add' },
-          { key: 'edit' },
-          { key: 'remove' },
-          { key: 'changePassword', label: this.$t('platform.org.employee.button.changePassword'), icon: 'el-icon-refresh' }
-          // { key: 'more', icon: 'ibps-icon-ellipsis-h' }
-        ],
-        searchForm: {
-          forms: [
-            { prop: 'Q^NAME_^SL', label: this.$t('platform.org.employee.prop.name'), labelWidth: 60, itemWidth: 200 },
-            { prop: 'Q^ACCOUNT_^SL', label: this.$t('platform.org.employee.prop.account'), labelWidth: 80, itemWidth: 200 },
-            {
-              prop: 'Q^STATUS_^SL',
-              label: this.$t('platform.org.employee.prop.status'),
-              fieldType: 'select',
-              options: statusOptions.filter((status) => {
-                return status.value !== 'deleted'
-              }),
-              labelWidth: 65,
-              itemWidth: 200
-            },
-            {
-              prop: ['Q^CREATE_TIME_^DL', 'Q^CREATE_TIME_^DG'],
-              label: this.$t('common.field.createTime'),
-              fieldType: 'daterange',
-              labelWidth: 80,
-              itemWidth: 220
-            }
-          ]
-        },
-        // 表格字段配置
-        columns: [
-          { prop: 'name', label: this.$t('platform.org.employee.prop.name'),width:120 },
-          { prop: 'account', label: this.$t('platform.org.employee.prop.account'),width:150},
-          //{ prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
-          { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false ,width:250},
-          { prop: 'qq', label: '客户单位名称',width:250},
-          { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions,width:100},
-          { prop: 'createTime', label: this.$t('common.field.createTime')},
-        ],
-        rowHandle: {
-          actions: [
-            {
-              key: 'changePassword',
-              label: this.$t('platform.org.employee.button.changePassword'),
-              icon: 'el-icon-refresh',
-              hidden: (rowData, index) => {
-                if (rowData.status === 'deleted') { return true }
-                if (this.$store.getters.userId === rowData.id) { return true }
-                if (this.$store.getters.isSuper) { return false }
-              }
-            },
-            {
-              key: 'edit',
-              hidden: (rowData, index) => {
-                if (rowData.status === 'deleted') { return true }
-                if (this.$store.getters.userId === rowData.id) { return true }
-                if (this.$store.getters.isSuper) { return false }
-              }
-            },
-            {
-              key: 'remove',
-              hidden: (rowData, index) => {
-                if (rowData.status === 'deleted') { return true }
-                if (this.$store.getters.userId === rowData.id) { return true }
-                if (this.$store.getters.isSuper) { return false }
-              }
+            changePasswordIds: '',
+            changePasswordVisible: false,
+            pkKey: 'id', // 主键  如果主键不是pk需要传主键
+            listIdentity: 'ibps-org-employee', // 列表标识
+            listData: [],
+            listConfig: {
+                displayField: '’',
+                displayFieldData: [],
+                toolbars: [
+                    { key: 'search' },
+                    { key: 'add' },
+                    { key: 'edit' },
+                    { key: 'remove' },
+                    { key: 'changePassword', label: this.$t('platform.org.employee.button.changePassword'), icon: 'el-icon-refresh' }
+                    // { key: 'more', icon: 'ibps-icon-ellipsis-h' }
+                ],
+                searchForm: {
+                    forms: [
+                        { prop: 'Q^NAME_^SL', label: this.$t('platform.org.employee.prop.name'), labelWidth: 40, itemWidth: 150 },
+                        { prop: 'Q^ACCOUNT_^SL', label: this.$t('platform.org.employee.prop.account'), labelWidth: 40, itemWidth: 150 },
+                        {
+                            prop: 'Q^STATUS_^SL',
+                            label: this.$t('platform.org.employee.prop.status'),
+                            fieldType: 'select',
+                            options: statusOptions.filter((status) => {
+                                return status.value !== 'deleted'
+                            }),
+                            labelWidth: 50,
+                            itemWidth: 150
+                        },
+                        {
+                            prop: 'Q^group_id_^SL',
+                            label: '归属组织',
+                            fieldType: 'select',
+                            options: [],
+                            labelWidth: 60,
+                            itemWidth: 150
+                        },
+                        {
+                            prop: ['Q^CREATE_TIME_^DL', 'Q^CREATE_TIME_^DG'],
+                            label: this.$t('common.field.createTime'),
+                            fieldType: 'daterange',
+                            labelWidth: 60,
+                            itemWidth: 220
+                        }
+                    ]
+                },
+                // 表格字段配置
+                columns: [
+                    { prop: 'name', label: this.$t('platform.org.employee.prop.name'), width: 120 },
+                    { prop: 'account', label: this.$t('platform.org.employee.prop.account'), width: 150 },
+                    //{ prop: 'wcAccount', label: this.$t('platform.org.employee.prop.wcAccount'),width:120},
+                    { prop: 'orgName', label: this.$t('platform.org.employee.prop.orgPath'), sortable: false, width: 250 },
+                    { prop: 'qq', label: '客户单位名称', width: 250 },
+                    { prop: 'status', label: this.$t('platform.org.employee.prop.status'), tags: statusOptions, width: 100 },
+                    { prop: 'createTime', label: this.$t('common.field.createTime') }
+                ],
+                rowHandle: {
+                    actions: [
+                        {
+                            key: 'changePassword',
+                            label: this.$t('platform.org.employee.button.changePassword'),
+                            icon: 'el-icon-refresh',
+                            hidden: (rowData, index) => {
+                                if (rowData.status === 'deleted') {
+                                    return true
+                                }
+                                if (this.$store.getters.userId === rowData.id) {
+                                    return true
+                                }
+                                if (this.$store.getters.isSuper) {
+                                    return false
+                                }
+                            }
+                        },
+                        {
+                            key: 'edit',
+                            hidden: (rowData, index) => {
+                                if (rowData.status === 'deleted') {
+                                    return true
+                                }
+                                if (this.$store.getters.userId === rowData.id) {
+                                    return true
+                                }
+                                if (this.$store.getters.isSuper) {
+                                    return false
+                                }
+                            }
+                        },
+                        {
+                            key: 'remove',
+                            hidden: (rowData, index) => {
+                                if (rowData.status === 'deleted') {
+                                    return true
+                                }
+                                if (this.$store.getters.userId === rowData.id) {
+                                    return true
+                                }
+                                if (this.$store.getters.isSuper) {
+                                    return false
+                                }
+                            }
+                        },
+                        {
+                            key: 'detail'
+                        },
+                        {
+                            key: 'actived',
+                            label: this.$t('platform.org.employee.button.actived'),
+                            icon: 'ibps-icon-unlock',
+                            hidden: (rowData, index) => {
+                                if (rowData.status === 'actived') {
+                                    return true
+                                }
+                                if (this.$store.getters.userId === rowData.id) {
+                                    return true
+                                }
+                                if (!this.$store.getters.isSuper) {
+                                    return true
+                                }
+                            }
+                        },
+                        {
+                            key: 'disable',
+                            label: this.$t('platform.org.employee.button.disable'),
+                            icon: 'ibps-icon-ban',
+                            hidden: function (rowData, index) {
+                                if (rowData.status !== 'actived') {
+                                    return true
+                                }
+                                if (this.$store.getters.userId === rowData.id) {
+                                    return true
+                                }
+                                if (!this.$store.getters.isSuper) {
+                                    return true
+                                }
+                            }
+                        },
+                        {
+                            key: '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
+                            }
+                        }
+                    ]
+                }
             },
-            {
-              key: 'detail'
-            },
-            {
-              key: 'actived',
-              label: this.$t('platform.org.employee.button.actived'),
-              icon: 'ibps-icon-unlock',
-              hidden: (rowData, index) => {
-                if (rowData.status === 'actived') { return true }
-                if (this.$store.getters.userId === rowData.id) { return true }
-                if (!this.$store.getters.isSuper) { return true }
-              }
-            },
-            {
-              key: 'disable',
-              label: this.$t('platform.org.employee.button.disable'),
-              icon: 'ibps-icon-ban',
-              hidden: function(rowData, index) {
-                if (rowData.status !== 'actived') { return true }
-                if (this.$store.getters.userId === rowData.id) { return true }
-                if (!this.$store.getters.isSuper) { return true }
-              }
-            },
-            {
-              key: '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
-              }
-            }
-          ]
+            pagination: {},
+            sorts: {},
+            moreSearchParams: {},
+            dialogMoreSearchVisible: false
         }
-      },
-      pagination: {},
-      sorts: {},
-      moreSearchParams: {},
-      dialogMoreSearchVisible: false
-    }
-  },
-  created() {
-    this.loadData()
-    this.loadDisplayField()
-  },
-  methods: {
-    ...mapMutations({
-      pageKeepAliveClean: 'ibps/page/keepAliveClean'
-    }),
-    ...mapActions({
-      switchUser: 'ibps/user/switchUser'
-    }),
-    // 加载数据
-    loadData() {
-      this.loading = true
-      queryPageList(this.getSearcFormData()).then(response => {
-        ActionUtils.handleListData(this, response.data)
-        this.loading = false
-      }).catch(() => {
-        this.loading = false
-      })
-    },
-    /**
-     * 获取格式化参数
-     */
-    getSearcFormData() {
-      const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
-      if (this.moreSearchParams) {
-        Object.assign(params, this.moreSearchParams)
-      }
-      return ActionUtils.formatParams(
-        params,
-        this.pagination,
-        this.sorts)
     },
-    /**
-     * 处理分页事件
-     */
-    handlePaginationChange(page) {
-      ActionUtils.setPagination(this.pagination, page)
-      this.loadData()
-    },
-    /**
-     * 处理排序
-     */
-    handleSortChange(sort) {
-      ActionUtils.setSorts(this.sorts, sort)
-      this.loadData()
+    created() {
+        this.getOrg()
+        this.loadData()
+        this.loadDisplayField()
     },
+    methods: {
+        ...mapMutations({
+            pageKeepAliveClean: 'ibps/page/keepAliveClean'
+        }),
+        ...mapActions({
+            switchUser: 'ibps/user/switchUser'
+        }),
+        // 加载数据
+        loadData() {
+            this.loading = true
+            queryPageList(this.getSearcFormData())
+                .then((response) => {
+                    ActionUtils.handleListData(this, response.data)
+                    this.loading = false
+                })
+                .catch(() => {
+                    this.loading = false
+                })
+        },
+        /**
+         * 获取格式化参数
+         */
+        getSearcFormData() {
+            const params = this.$refs['crud'] ? this.$refs['crud'].getSearcFormData() : {}
+            if (this.moreSearchParams) {
+                Object.assign(params, this.moreSearchParams)
+            }
+            return ActionUtils.formatParams(params, this.pagination, this.sorts)
+        },
+        /**
+         * 处理分页事件
+         */
+        handlePaginationChange(page) {
+            ActionUtils.setPagination(this.pagination, page)
+            this.loadData()
+        },
+        /**
+         * 处理排序
+         */
+        handleSortChange(sort) {
+            ActionUtils.setSorts(this.sorts, sort)
+            this.loadData()
+        },
 
-    /**
-     * 获取显示字段
-     */
-    loadDisplayField() {
-      this.getCustomDataDisplay(this.listIdentity).then((data) => {
-        this.listConfig.displayFieldData = data
-      })
-    },
-    handleHeaderDragend(newWidth, oldWidth, column, event) {
-      const displayFieldData = this.listConfig.displayFieldData
-      for (let i = 0; i < displayFieldData.length; i++) {
-        const displayField = displayFieldData[i]
-        if (displayField.prop === column.property) {
-          displayField.width = parseInt(newWidth)
+        /**
+         * 获取显示字段
+         */
+        loadDisplayField() {
+            this.getCustomDataDisplay(this.listIdentity).then((data) => {
+                this.listConfig.displayFieldData = data
+            })
+        },
+        handleHeaderDragend(newWidth, oldWidth, column, event) {
+            const displayFieldData = this.listConfig.displayFieldData
+            for (let i = 0; i < displayFieldData.length; i++) {
+                const displayField = displayFieldData[i]
+                if (displayField.prop === column.property) {
+                    displayField.width = parseInt(newWidth)
+                }
+            }
+            this.handleDisplayField(
+                displayFieldData,
+                () => {
+                    this.listConfig.displayFieldData = displayFieldData
+                },
+                false
+            )
+        },
+        /**
+         * 保存显示字段
+         */
+        handleDisplayField(data, callback, hasMessage) {
+            this.saveCustomDataDisplay(data, this.listIdentity)
+                .then((response) => {
+                    if (hasMessage) ActionUtils.success(response.message)
+                    callback(true)
+                })
+                .catch(() => {
+                    callback(false)
+                })
+        },
+        /**
+         * 查询
+         */
+        search() {
+            this.loadData()
+        },
+        /**
+         * 处理按钮事件
+         */
+        handleAction(buttonKey, position, selection, data) {
+            switch (buttonKey) {
+                case 'search': // 查询
+                    ActionUtils.setFirstPagination(this.pagination)
+                    this.search()
+                    break
+                case 'add': // 添加
+                    this.handleEdit()
+                    this.title = this.$t('common.title.add', { title: this.$t('platform.org.employee.title') })
+                    this.span = 13
+                    break
+                case 'edit': // 编辑
+                    ActionUtils.selectedRecord(selection)
+                        .then((id) => {
+                            this.handleEdit(id)
+                            this.title = this.$t('common.title.edit', { title: this.$t('platform.org.employee.title') })
+                            this.span = 13
+                        })
+                        .catch(() => {})
+                    break
+                case 'changePassword': // 重置密码
+                    ActionUtils.selectedMultiRecord(selection)
+                        .then((ids) => {
+                            this.handlereChangePassword(ids)
+                        })
+                        .catch(() => {})
+                    break
+                case 'detail': // 明细
+                    ActionUtils.selectedRecord(selection)
+                        .then((id) => {
+                            this.handleEdit(id, true)
+                            this.span = 24
+                            this.title = this.$t('common.title.detail', { title: this.$t('platform.org.employee.title') })
+                        })
+                        .catch(() => {})
+                    break
+                case 'remove': // 删除
+                    ActionUtils.removeRecord(selection)
+                        .then((ids) => {
+                            this.handleRemove(ids)
+                        })
+                        .catch(() => {})
+                    break
+                case 'actived': // 激活
+                    this.handleActived(selection)
+                    break
+                case 'more': // 更多
+                    this.handleMoreSearchParams()
+                    break
+                case 'disable': // 禁用
+                    this.handleDisable(selection)
+                    break
+                case 'switchUser': // 切换用户
+                    this.handleSwitchUser(data.account)
+                    break
+                default:
+                    break
+            }
+        },
+        /**
+         * 处理更多
+         */
+        handleMoreSearchParams() {
+            this.dialogMoreSearchVisible = true
+        },
+        handleMoreSearchAction(data) {
+            ActionUtils.setFirstPagination(this.pagination)
+            this.moreSearchParams = data
+            this.loadData()
+        },
+        /**
+         * 处理编辑
+         */
+        handleEdit(editId, readonly = false) {
+            this.editId = editId || ''
+            this.dialogFormVisible = true
+            this.readonly = readonly
+        },
+        /**
+         * 处理重置密码
+         */
+        handlereChangePassword(ids) {
+            this.changePasswordIds = ids
+            this.changePasswordVisible = true
+        },
+        handleRemove(ids) {
+            // 删除数据
+            remove({ employeeIds: ids }).then((response) => {
+                ActionUtils.removeSuccessMessage()
+                this.search()
+            })
+        },
+        handleActived(id) {
+            active({ employeeId: id }).then((response) => {
+                ActionUtils.successMessage('激活成功!')
+                this.search()
+            })
+        },
+        handleDisable(id) {
+            disable({ employeeId: id }).then((response) => {
+                ActionUtils.successMessage('禁用成功!')
+                this.search()
+            })
+        },
+        handleSwitchUser(username) {
+            this.switchUser(username).then(() => {
+                ActionUtils.successMessage('切换用户成功!')
+                // 由于已经加载过设置 需要清空缓存设置
+                this.pageKeepAliveClean()
+                // 由于已经加载过设置 需要刷新此页面
+                this.$router.replace('/')
+            })
+        },
+        //获取组织的数据
+        getOrg(){
+            let sql = `select * FROM ibps_party_org ORDER BY field(ORG_ALIAS_,'szslhyyjtxbzljcsys','glc','zhgls','jcs','kh')`
+            curdPost('sql', sql).then(res => {
+                if(res.state == '200'){
+                    const datas = res.variables.data
+                    datas.forEach((item,index) => {
+                        this.$set(item,'value',item.ID_)
+                        this.$set(item,'label',item.NAME_)
+                    })
+                    this.listConfig.searchForm.forms[3].options = datas
+                }
+            })
         }
-      }
-      this.handleDisplayField(displayFieldData, () => {
-        this.listConfig.displayFieldData = displayFieldData
-      }, false)
-    },
-    /**
-     * 保存显示字段
-     */
-    handleDisplayField(data, callback, hasMessage) {
-      this.saveCustomDataDisplay(data, this.listIdentity).then((response) => {
-        if (hasMessage) ActionUtils.success(response.message)
-        callback(true)
-      }).catch(() => {
-        callback(false)
-      })
-    },
-    /**
-     * 查询
-     */
-    search() {
-      this.loadData()
-    },
-    /**
-     * 处理按钮事件
-     */
-    handleAction(buttonKey, position, selection, data) {
-      switch (buttonKey) {
-        case 'search':// 查询
-          ActionUtils.setFirstPagination(this.pagination)
-          this.search()
-          break
-        case 'add':// 添加
-          this.handleEdit()
-          this.title = this.$t('common.title.add', { title: this.$t('platform.org.employee.title') })
-          this.span = 13
-          break
-        case 'edit':// 编辑
-          ActionUtils.selectedRecord(selection).then((id) => {
-            this.handleEdit(id)
-            this.title = this.$t('common.title.edit', { title: this.$t('platform.org.employee.title') })
-            this.span = 13
-          }).catch(() => { })
-          break
-        case 'changePassword':// 重置密码
-          ActionUtils.selectedMultiRecord(selection).then((ids) => {
-            this.handlereChangePassword(ids)
-          }).catch(() => { })
-          break
-        case 'detail':// 明细
-          ActionUtils.selectedRecord(selection).then((id) => {
-            this.handleEdit(id, true)
-            this.span = 24
-            this.title = this.$t('common.title.detail', { title: this.$t('platform.org.employee.title') })
-          }).catch(() => { })
-          break
-        case 'remove':// 删除
-          ActionUtils.removeRecord(selection).then((ids) => {
-            this.handleRemove(ids)
-          }).catch(() => { })
-          break
-        case 'actived':// 激活
-          this.handleActived(selection)
-          break
-        case 'more':// 更多
-          this.handleMoreSearchParams()
-          break
-        case 'disable':// 禁用
-          this.handleDisable(selection)
-          break
-        case 'switchUser':// 切换用户
-          this.handleSwitchUser(data.account)
-          break
-        default:
-          break
-      }
-    },
-    /**
-     * 处理更多
-     */
-    handleMoreSearchParams() {
-      this.dialogMoreSearchVisible = true
-    },
-    handleMoreSearchAction(data) {
-      ActionUtils.setFirstPagination(this.pagination)
-      this.moreSearchParams = data
-      this.loadData()
-    },
-    /**
-     * 处理编辑
-     */
-    handleEdit(editId, readonly = false) {
-      this.editId = editId || ''
-      this.dialogFormVisible = true
-      this.readonly = readonly
-    },
-    /**
-     * 处理重置密码
-     */
-    handlereChangePassword(ids) {
-      this.changePasswordIds = ids
-      this.changePasswordVisible = true
-    },
-    handleRemove(ids) {
-      // 删除数据
-      remove({ employeeIds: ids }).then(response => {
-        ActionUtils.removeSuccessMessage()
-        this.search()
-      })
-    },
-    handleActived(id) {
-      active({ employeeId: id }).then(response => {
-        ActionUtils.successMessage('激活成功!')
-        this.search()
-      })
-    },
-    handleDisable(id) {
-      disable({ employeeId: id }).then(response => {
-        ActionUtils.successMessage('禁用成功!')
-        this.search()
-      })
-    },
-    handleSwitchUser(username) {
-      this.switchUser(username).then(() => {
-        ActionUtils.successMessage('切换用户成功!')
-        // 由于已经加载过设置 需要清空缓存设置
-        this.pageKeepAliveClean()
-        // 由于已经加载过设置 需要刷新此页面
-        this.$router.replace('/')
-      })
     }
-
-  }
 }
 </script>

+ 1 - 1
src/views/system/login/page.vue

@@ -79,7 +79,7 @@ export default {
     margin-bottom: 20px;
     box-shadow: 0 2px 12px 0 rgba(0, 0, 0, 0.1);
     padding: 30px;
-    height: 350px;
+    height: 340px;
     width: 300px;
     background-repeat: no-repeat;
     border-radius: 5%;

+ 1 - 1
src/views/system/login/user-login.vue

@@ -428,6 +428,6 @@
 
 <style scoped>
     .el-form-item {
-        margin-bottom: 20px !important;
+        margin-bottom: 18px !important;
     }
 </style>