多报表快照生成，第三级部门选择，首页、记录盒调整

src/business/platform/bpmn/form/action.js

@@ -675,25 +675,30 @@ export default {
                     this.updateState(id, code, '已完成', null)
                     return
                 }
-                const path = data[0].bao_biao_lu_jing_
-                const url = this.$getReportFile(path, `id_=${id}&org_=${first}`)
-                const fileName = name + this.$common.getDateNow(16, 'string')
-                console.log(url, fileName)
+                const paths = data[0].bao_biao_lu_jing_ ? data[0].bao_biao_lu_jing_.split(',') : []
+                if (!paths.length) {
+                    this.$message.error('未配置快照路径！')
+                    return
+                }
                 // 延迟生成快照，避免数据获取失败
                 setTimeout(() => {
-                    this.$common.snapshoot({
-                        url,
-                        name: fileName,
-                        type: 'pdf'
-                    }).then(res => {
-                        if (!res.data || !res.data.id) {
+                    Promise.all(paths.map(path => {
+                        const url = this.$getReportFile(path, `id_=${id}&org_=${first}`)
+                        const fileName = name + this.$common.getDateNow(16, 'string')
+                        console.log(url, fileName)
+                        return this.$common.snapshoot({
+                            url,
+                            name: fileName,
+                            type: 'pdf'
+                        })
+                    })).then(results => {
+                        const ids = results.map(result => result.data.id)
+                        if (!ids.length) {
                             this.$message.error('生成快照失败！')
                         }
-                        const fileId = res.data && res.data.id ? res.data.id : ''
-                        const fileParams = fileId ? { kuai_zhao_: fileId } : {}
+                        const fileParams = ids.length ? { kuai_zhao_: ids.join(',') } : {}
                         this.updateState(id, code, '已完成', fileParams)
                     }).catch(() => {
-                        // 生成快照接口调用失败时，也需要更新状态为已完成
                         this.$message.error('提交快照生成失败！')
                         this.updateState(id, code, '已完成')
                     })

src/business/platform/org/position/panel.vue

@@ -334,8 +334,7 @@ export default {
                 })
             }
 
-            if (dotCount <= 3) {
-                console.log(5)
+            if (dotCount <= 2) {
                 arrList.forEach(item => {
                     item.disabled = true
                 })

src/store/modules/ibps/modules/user.js

@@ -169,7 +169,7 @@ export default {
          */
         getUserList ({ state, dispatch }, { first, second }) {
             const params = second ? `'%${second}%' or entity.id_ = '${first}'` : first ? `'%${first}%'` : '%%'
-            const sql = `select users.id_ as userId, users.name_ as userName, users.mobile_ as phone, users.positions_ as positionId,  (select ifnull(GROUP_CONCAT(DISTINCT roles.id_ SEPARATOR ','), '') from ibps_party_user_role as roles where roles.user_id_ = users.id_ ) as roleId, (select ifnull(GROUP_CONCAT(DISTINCT roles.name_ SEPARATOR ','), '') from ibps_party_entity as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_ )) as roles, (select ifnull(GROUP_CONCAT(DISTINCT positions.name_ SEPARATOR ','), '') from ibps_party_entity as positions where find_in_set(positions.id_, users.positions_)) as positions from ibps_party_employee as users where exists (select 1 from ibps_party_entity as entity where find_in_set(entity.id_, users.positions_) and (entity.path_ like ${params}))`
+            const sql = `select users.id_ as userId, users.name_ as userName, users.mobile_ as phone, users.positions_ as positionId,  (select ifnull(GROUP_CONCAT(DISTINCT roles.role_id_ SEPARATOR ','), '') from ibps_party_user_role as roles where roles.user_id_ = users.id_ ) as roleId, (select ifnull(GROUP_CONCAT(DISTINCT roles.name_ SEPARATOR ','), '') from ibps_party_entity as roles where roles.id_ in (select role_id_ from ibps_party_user_role where user_id_ = users.id_ )) as roles, (select ifnull(GROUP_CONCAT(DISTINCT positions.name_ SEPARATOR ','), '') from ibps_party_entity as positions where find_in_set(positions.id_, users.positions_)) as positions from ibps_party_employee as users where exists (select 1 from ibps_party_entity as entity where find_in_set(entity.id_, users.positions_) and (entity.path_ like ${params}))`
             common.request('sql', sql).then(res => {
                 const { data = [] } = res.variables || {}
                 dispatch('ibps/param/setUserList', data, {

src/views/infosManage/fileIE.vue

@@ -6,6 +6,7 @@
         <ibps-type-tree :width="width"
                         :height="height"
                         :category-key="categoryKey"
+                        :has-permission="true"
                         @node-click="handleNodeClick"
                         @expand-collapse="handleExpandCollapse" />
       </div>

src/views/platform/bpmn/bpmInstHis/list.vue

@@ -5,7 +5,6 @@
                 :width="width"
                 :height="height"
                 :location="location"
-                title="记录分类"
                 category-key="FLOW_TYPE"
                 :has-permission="hasPermission"
                 @node-click="handleNodeClick"
@@ -115,7 +114,7 @@
                             </el-popover>
                         </template>
                         <div v-if="record.file.length && snapshotId" class="content_item">
-                            <div class="sub_operation">快照文件</div>
+                            <!-- <div class="sub_operation">快照</div> -->
                             <ibps-attachment
                                 v-model="snapshotId"
                                 download
@@ -127,7 +126,7 @@
                             />
                         </div>
                         <div v-if="record.file.length && fileId" class="content_item">
-                            <div class="sub_operation">其他附件</div>
+                            <div class="sub_operation">附件</div>
                             <ibps-attachment
                                 v-model="fileId"
                                 download

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

@@ -482,7 +482,7 @@ export default {
             }
             let pageParams
             if (this.activeTab === 'guide') {
-                pageParams = { page: 1, limit: 100 }
+                pageParams = { ...page, limit: 100 }
             } else {
                 pageParams = page
             }