系统指引页面通用查询方法改为后端接口

src/api/business/general.js

@@ -121,3 +121,15 @@ export function removePaperOpRecod (params) {
         params: params
     })
 }
+
+/**
+ * 获取系统指引
+ * @param {*} params
+ */
+export function querySystemGuide (data) {
+    return request({
+        url: BUSINESS_BASE_URL() + '/sql/systemGuide/query',
+        method: 'post',
+        data
+    })
+}

src/views/system/dashboard/components/workbench.js

@@ -136,12 +136,12 @@ export const listSearchForm = {
     guide: {
         forms: [
             { prop: 'range', label: '显示范围', labelWidth: 70, fieldType: 'select', options: rangeOption, value: 'aboutMe' },
-            { prop: 'suo_shu_xi_tong_', label: '所属子系统', labelWidth: 85, fieldType: 'select', options: [] },
-            { prop: 'gong_neng_mo_kuai', label: '所属功能模块', labelWidth: 100, fieldType: 'input' },
-            { prop: 'role', label: '编制角色', labelWidth: 70, fieldType: 'select', options: [] },
-            { prop: 'biao_dan_ming_che', label: '表单名称', labelWidth: 70, fieldType: 'input' },
-            { prop: 'biao_dan_bian_hao', label: '表单编号', labelWidth: 70, fieldType: 'input' },
-            { prop: 'shi_wu_lei_xing_', label: '事务类型', labelWidth: 70, fieldType: 'select', options: taskTypeOption }
+            { prop: 'Q^suo_shu_xi_tong_^S', label: '所属子系统', labelWidth: 85, fieldType: 'select', options: [], multiple: 'Y' },
+            { prop: 'Q^gong_neng_mo_kuai^SL', label: '所属功能模块', labelWidth: 100, fieldType: 'input' },
+            { prop: 'role', label: '编制角色', labelWidth: 70, fieldType: 'select', options: [], multiple: 'Y' },
+            { prop: 'Q^biao_dan_ming_che^SL', label: '表单名称', labelWidth: 70, fieldType: 'input' },
+            { prop: 'Q^biao_dan_bian_hao^SL', label: '表单编号', labelWidth: 70, fieldType: 'input' },
+            { prop: 'Q^shi_wu_lei_xing_^S', label: '事务类型', labelWidth: 70, fieldType: 'select', options: taskTypeOption, multiple: 'Y' }
         ]
     }
 }

src/views/system/dashboard/templates/systemGuide.vue

@@ -4,7 +4,7 @@
             <div class="table-container">
                 <ibps-crud
                     ref="guide"
-                    :data="dataList"
+                    :data="listData"
                     :toolbars="listConfig.toolbars"
                     :search-form="listConfig.searchForm"
                     :pk-key="pkKey"
@@ -18,7 +18,20 @@
                     @action-event="handleAction"
                     @sort-change="handleSortChange"
                     @pagination-change="handlePaginationChange"
-                />
+                >
+                    <template slot="role" slot-scope="{row, column}">
+                        <ibps-user-selector
+                            v-model="row[column.prop]"
+                            type="role"
+                            readonly-text="text"
+                            :multiple="true"
+                            size="mini"
+                            disabled
+                            :filter="filterOption"
+                            filterable
+                        />
+                    </template>
+                </ibps-crud>
             </div>
         </div>
     </div>
@@ -27,11 +40,15 @@
 <script>
 import ActionUtils from '@/utils/action'
 import { taskTypeOption, listSearchForm } from '../components/workbench'
+import { querySystemGuide } from '@/api/business/general'
 
 const searchForm = listSearchForm.guide
 
 export default {
     name: 'system-guide1',
+    components: {
+        IbpsUserSelector: () => import('@/business/platform/org/selector')
+    },
     filters: {
         getUserName (v, list) {
             const user = list.find(i => i.userId === v)
@@ -59,6 +76,13 @@ export default {
         searchForm.forms[1].options = sysOption
         searchForm.forms[3].options = roleOption
         const fieldWidth = window.innerWidth > 1600 ? 150 : 120
+        const filterOption = [{
+            // descVal: '2',
+            includeSub: true,
+            partyName: '',
+            scriptContent: '',
+            type: 'role'
+        }]
         return {
             title: '系统指引',
             level,
@@ -66,13 +90,17 @@ export default {
             deptList,
             role,
             menus,
+            filterOption,
             pkKey: 'id',
             loading: false,
             selection: [],
             defaultPagination: { page: 1, limit: 15 },
-            sorts: { },
-            dataList: [],
-            pagination: {},
+            sorts: {},
+            listData: [],
+            pagination: {
+                limit: 100,
+                page: 1
+            },
             listConfig: {
                 searchForm,
                 toolbars: [
@@ -83,16 +111,16 @@ export default {
                 // 表格字段配置
                 columns: [
                     { prop: 'sn', label: '序号', width: 60 },
-                    { prop: 'sysName', label: '所属子系统', width: 100 },
-                    { prop: 'module', label: '所属功能模块', width: fieldWidth },
-                    { prop: 'tableName', label: '记录表单', width: 200 },
-                    { prop: 'tableNo', label: '表单编号', width: 150, sortable: 'custom' },
-                    { prop: 'timing', label: '填写时机/记录频次', minWidth: fieldWidth },
-                    { prop: 'taskType', label: '事务类型', tags: taskTypeOption, width: 100 },
-                    { prop: 'fileName', label: '程序文件', width: 160 },
-                    { prop: 'creator', label: '编制人', width: fieldWidth },
-                    { prop: 'reviewer', label: '审核人', width: fieldWidth },
-                    { prop: 'approver', label: '审批人', width: fieldWidth }
+                    { prop: 'suoShuXiTong', label: '所属子系统', width: 100 },
+                    { prop: 'gongNengMokuai', label: '所属功能模块', width: fieldWidth },
+                    { prop: 'biaoDanMingChe', label: '记录表单', width: 200 },
+                    { prop: 'biaoDanBianHao', label: '表单编号', width: 240, sortable: 'custom' },
+                    { prop: 'tianXieShiJi', label: '填写时机/记录频次', minWidth: 240 },
+                    { prop: 'shiWuLeiXing', label: '事务类型', tags: taskTypeOption, width: 100 },
+                    { prop: 'chengXuWenJian', label: '程序文件', width: 160 },
+                    { prop: 'bianZhiJiaoSe', label: '编制人', width: fieldWidth, fieldType: 'slot', slotName: 'role' },
+                    { prop: 'shenHeJiaoSe', label: '审核人', width: fieldWidth, fieldType: 'slot', slotName: 'role' },
+                    { prop: 'shenPiJiaoSe', label: '审批人', width: fieldWidth, fieldType: 'slot', slotName: 'role' }
                 ]
             }
         }
@@ -101,117 +129,190 @@ export default {
     mounted () {
         const timer = setInterval(() => {
             if (this.$refs.guide) {
-                this.getData()
+                this.loadData()
                 clearInterval(timer)
             }
         }, 200)
     },
     methods: {
-        getGuide ({ parameters, requestPage, sorts }) {
-            // 获取查询角色信息
-            let roleParams = ''
-            let aboutMeParams = ''
-            const range = {
-                aboutMe: [],
-                sponsor: [],
-                review: [],
-                approve: []
-            }
-            const sortField = {
-                TABLE_NO_: 'biao_dan_bian_hao'
-            }
-            let sortParams = 'sn_ + 0 asc'
-            if (sorts && sorts.length) {
-                sortParams = sorts.map(i => `${sortField[i.field]} ${i.order}`).join(',')
-            }
-            this.role.forEach(i => {
-                range.aboutMe.push(`bian_zhi_jiao_se_ like '%${i.id}%' or shen_he_jiao_se_ like '%${i.id}%' or shen_pi_jiao_se_ like '%${i.id}%'`)
-                range.sponsor.push(`bian_zhi_jiao_se_ like '%${i.id}%'`)
-                range.review.push(`shen_he_jiao_se_ like '%${i.id}%'`)
-                range.approve.push(`shen_pi_jiao_se_ like '%${i.id}%'`)
-            })
-            parameters.forEach(item => {
-                if (item.key === 'range' && item.value !== 'all') {
-                    aboutMeParams = ` and (${range[item.value].join(' or ')})`
-                }
-                if (item.key === 'role') {
-                    roleParams = ` and (bian_zhi_jiao_se_ like '%${item.value}%')`
-                }
-            })
-            // 获取查询字段
-            let params = parameters.filter(i => i.key !== 'role' && i.key !== 'range').reduce((acc, curr) => {
-                return `${acc} and ${curr.key} like '%${curr.value}%'`
-            }, '')
-            params = params + aboutMeParams + roleParams
-            // and di_dian_ = '${level}'
-            const sql = `select sn_ as sn, suo_shu_xi_tong_ as sysName, gong_neng_mo_kuai as module, biao_dan_ming_che as tableName, biao_dan_bian_hao as tableNo, tian_xie_shi_ji_ as timing, shi_wu_lei_xing_ as taskType, cheng_xu_wen_jian as fileName, bian_zhi_ren_ as creator, shen_he_ren_ as reviewer, shen_pi_ren_ as approver, ye_mian_lu_jing_ as path, zi_yuan_lu_jing_ as res from t_bdbhpzb where sn_ + 0 > 0 ${params} order by ${sortParams}`
-            const { pageNo = 1, limit = 15 } = requestPage || {}
-            return new Promise((resolve, reject) => {
-                this.$common.request('sql', sql).then(res => {
-                    const { data = [] } = res.variables || {}
-                    const page = {
-                        limit,
-                        page: pageNo,
-                        totalCount: data.length,
-                        totalPages: Math.ceil(data.length / limit)
-                    }
-                    const result = {
-                        data: {
-                            dataResult: data.slice((pageNo - 1) * limit, pageNo * limit),
-                            pageResult: page
-                        }
-                    }
-                    resolve(result)
-                }).catch(error => {
-                    reject(error)
-                })
-            })
-        },
+        // getGuide ({ parameters, requestPage, sorts }) {
+        //     // 获取查询角色信息
+        //     let roleParams = ''
+        //     let aboutMeParams = ''
+        //     const range = {
+        //         aboutMe: [],
+        //         sponsor: [],
+        //         review: [],
+        //         approve: []
+        //     }
+        //     const sortField = {
+        //         TABLE_NO_: 'biao_dan_bian_hao'
+        //     }
+        //     let sortParams = 'sn_ + 0 asc'
+        //     if (sorts && sorts.length) {
+        //         sortParams = sorts.map(i => `${sortField[i.field]} ${i.order}`).join(',')
+        //     }
+        //     this.role.forEach(i => {
+        //         range.aboutMe.push(`bian_zhi_jiao_se_ like '%${i.id}%' or shen_he_jiao_se_ like '%${i.id}%' or shen_pi_jiao_se_ like '%${i.id}%'`)
+        //         range.sponsor.push(`bian_zhi_jiao_se_ like '%${i.id}%'`)
+        //         range.review.push(`shen_he_jiao_se_ like '%${i.id}%'`)
+        //         range.approve.push(`shen_pi_jiao_se_ like '%${i.id}%'`)
+        //     })
+        //     parameters.forEach(item => {
+        //         if (item.key === 'range' && item.value !== 'all') {
+        //             aboutMeParams = ` and (${range[item.value].join(' or ')})`
+        //         }
+        //         if (item.key === 'role') {
+        //             roleParams = ` and (bian_zhi_jiao_se_ like '%${item.value}%')`
+        //         }
+        //     })
+        //     // 获取查询字段
+        //     let params = parameters.filter(i => i.key !== 'role' && i.key !== 'range').reduce((acc, curr) => {
+        //         return `${acc} and ${curr.key} like '%${curr.value}%'`
+        //     }, '')
+        //     params = params + aboutMeParams + roleParams
+        //     // and di_dian_ = '${level}'
+        //     const sql = `select sn_ as sn, suo_shu_xi_tong_ as sysName, gong_neng_mo_kuai as module, biao_dan_ming_che as tableName, biao_dan_bian_hao as tableNo, tian_xie_shi_ji_ as timing, shi_wu_lei_xing_ as taskType, cheng_xu_wen_jian as fileName, bian_zhi_ren_ as creator, shen_he_ren_ as reviewer, shen_pi_ren_ as approver, ye_mian_lu_jing_ as path, zi_yuan_lu_jing_ as res from t_bdbhpzb where sn_ + 0 > 0 ${params} order by ${sortParams}`
+        //     const { pageNo = 1, limit = 15 } = requestPage || {}
+        //     return new Promise((resolve, reject) => {
+        //         this.$common.request('sql', sql).then(res => {
+        //             const { data = [] } = res.variables || {}
+        //             const page = {
+        //                 limit,
+        //                 page: pageNo,
+        //                 totalCount: data.length,
+        //                 totalPages: Math.ceil(data.length / limit)
+        //             }
+        //             const result = {
+        //                 data: {
+        //                     dataResult: data.slice((pageNo - 1) * limit, pageNo * limit),
+        //                     pageResult: page
+        //                 }
+        //             }
+        //             resolve(result)
+        //         }).catch(error => {
+        //             reject(error)
+        //         })
+        //     })
+        // },
         tableRowClassName ({ row, rowIndex }) {
             if (rowIndex % 2 === 1) return 'warning-row'
             return 'success-row'
         },
-        // 获取表格数据
-        getData () {
+        loadData () {
             this.loading = true
-            const pageParams = this.pagination && this.pagination.page ? this.pagination : this.defaultPagination
-            this.getGuide(this.getFormatParams(null, pageParams)).then(response => {
-                const { dataResult, pageResult } = response.data
-                this.dataList = dataResult
-                this.pagination = pageResult || {}
-                this.loading = false
-            }).catch(() => {
+            querySystemGuide(this.getSearchFormData()).then(res => {
+                const { dataResult } = res.data
+                const { page, limit } = this.pagination
+                const { isEmpty } = this.$utils
+                // 无排序字段时，默认按序号排序
+                if (isEmpty(this.sorts)) {
+                    dataResult.sort((a, b) => {
+                        return +a.sn - +b.sn
+                    })
+                }
+                // 处理分页
+                const pageResult = {
+                    limit,
+                    page,
+                    totalCount: dataResult.length,
+                    totalPages: Math.ceil(dataResult.length / limit)
+                }
+                const result = {
+                    dataResult: dataResult.slice((page - 1) * limit, page * limit),
+                    pageResult
+                }
+                // console.log(result)
+                ActionUtils.handleListData(this, result)
+            }).finally(() => {
                 this.loading = false
             })
         },
+        // // 获取表格数据
+        // getData () {
+        //     this.loading = true
+        //     const pageParams = this.pagination && this.pagination.page ? this.pagination : this.defaultPagination
+        //     this.getGuide(this.getFormatParams(null, pageParams)).then(response => {
+        //         const { dataResult, pageResult } = response.data
+        //         this.listData = dataResult
+        //         this.pagination = pageResult || {}
+        //         this.loading = false
+        //     }).catch(() => {
+        //         this.loading = false
+        //     })
+        // },
+        /**
+         * 获取格式化参数
+         */
+        getSearchFormData () {
+            const params = this.$refs['guide'] ? this.$refs['guide'].getSearcFormData() : {}
+            const allRoleId = this.role.map(i => i.id)
+            // 默认过滤 SN 字段值不为空的数据
+            params[`Q^sn_^SNE`] = '1'
+            if (params.range === 'aboutMe') {
+                params[`Q^bian_zhi_jiao_se_^SL`] = params[`Q^shen_he_jiao_se_^SL`] = params[`Q^shen_pi_jiao_se_^SL`] = allRoleId
+            }
+            if (params.range === 'sponsor') {
+                params[`Q^bian_zhi_jiao_se_^SL`] = allRoleId
+            }
+            if (params.range === 'review') {
+                params[`Q^shen_he_jiao_se_^SL`] = allRoleId
+            }
+            if (params.range === 'approve') {
+                params[`Q^shen_pi_jiao_se_^SL`] = allRoleId
+            }
+            if (params.role) {
+                params[`Q^bian_zhi_jiao_se_^SL^1`] = params['role']
+            }
+            delete params.range
+            delete params.role
+            // console.log(params)
+            // 当前后端接口未实现字符串字段【SN】的正确排序，获取全部数据前端自行分页
+            const result = {
+                parameters: this.formatParameters(params),
+                ...ActionUtils.formatParams(null, { ...this.pagination, limit: 9999 }, this.sorts)
+            }
+            // console.log(result)
+            return result
+        },
+        formatParameters (data) {
+            if (this.$utils.isEmpty(data)) {
+                return []
+            }
+            const parameters = Object.entries(data).map(([key, value]) =>
+                Array.isArray(value)
+                    ? { relation: 'OR', parameters: value.map(v => ({ key, value: v, param: this.$utils.guid() })) }
+                    : { key, value }
+            )
+            return parameters.length === 1 ? [parameters[0]] : [{ relation: 'AND', parameters }]
+        },
         // 查询
         search () {
-            this.dataList = []
-            this.pagination = {}
-            this.getData()
+            this.loadData()
         },
         handleSortChange (sort) {
-            console.log(sort)
+            // 处理字段长度，可能出现排序字段与数据库字段不一致情况
+            sort.sortBy = sort.sortBy.slice(0, 17)
             ActionUtils.setSorts(this.sorts, sort)
-            this.getData()
+            this.loadData()
         },
         handlePaginationChange (page) {
             ActionUtils.setPagination(this.pagination, page)
-            this.getData()
-        },
-        getFormatParams (v, page) {
-            const params = this.$refs.guide ? this.$refs.guide.getSearcFormData() : {}
-            const pageParams = { ...page, limit: 100 }
-            return ActionUtils.formatParams(params, pageParams, this.sorts)
+            this.loadData()
         },
+        // getFormatParams (v, page) {
+        //     const params = this.$refs.guide ? this.$refs.guide.getSearcFormData() : {}
+        //     const pageParams = { ...page, limit: 100 }
+        //     return ActionUtils.formatParams(params, pageParams, this.sorts)
+        // },
         // 处理表格点击事件
         handleRowClick (data) {
-            const { res = '' } = data
-            if (!res) {
+            const { ziYuanLuJing = '' } = data
+            if (!ziYuanLuJing) {
                 this.$message.warning('未配置资源菜单！')
                 return
             }
-            const path = '/' + this.findPagePath(res)
+            const path = '/' + this.findPagePath(ziYuanLuJing)
             this.$router.push(path)
         },
         handleAction (command, position, selection, data) {