diff --git a/back/src/mixins/process-module.js b/back/src/mixins/process-module.js index 0d303cd2..95fc3287 100644 --- a/back/src/mixins/process-module.js +++ b/back/src/mixins/process-module.js @@ -47,20 +47,31 @@ export default { } }, // 获取流程定义的表单路由配置信息 - getProcDefRouteSet (data, callback) { - this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => { - if (res.code !== 0) { - return this.$message.error(res.msg) + getProcDefRouteSet (data, callback, str) { + if (data.resourceName && !data.processDefinitionId) { + switch (str) { + case '待办': + this.$router.push({ name: 'activiti-RoomExamineAdmin' }) + break + case '已办': + this.$router.push({ name: 'activiti-RoomExamineAdminDone' }) + break } - if (!res.data || !res.data.bizRoute) { - return this.$message.error(this.$t('process.routeError')) - } - var param = { - ...data, - ...res.data - } - callback(param) - }).catch(() => { }) + } else { + this.$http.get(`/act/process/getProcDefBizRoute/${data.processDefinitionId}`).then(({ data: res }) => { + if (res.code !== 0) { + return this.$message.error(res.msg) + } + if (!res.data || !res.data.bizRoute) { + return this.$message.error(this.$t('process.routeError')) + } + var param = { + ...data, + ...res.data + } + callback(param) + }).catch(() => { }) + } }, getProcDefBizRouteAndProcessInstance (params, callback) { this.$http.get('/act/process/getProcDefBizRouteAndProcessInstance', { diff --git a/back/src/views/modules/ability/bsabilityai.vue b/back/src/views/modules/ability/bsabilityai.vue index 53dd6b22..6c76a265 100644 --- a/back/src/views/modules/ability/bsabilityai.vue +++ b/back/src/views/modules/ability/bsabilityai.vue @@ -288,7 +288,8 @@ export default { getDataListIsPage: true, exportURL: '/ability/bsabilityai/export', deleteURL: '/resource/delete', - deleteIsBatch: true + deleteIsBatch: true, + createdIsNeed: false }, disabled: false, sceneArr: dictionaries.sceneArr, @@ -300,7 +301,8 @@ export default { infoList: [], delFlag: 0, type: '组件服务', - name: '' + name: '', + deptIds: [] }, // qp: false, // 关联应用弹窗 @@ -326,8 +328,12 @@ export default { this.dataForm.name = '' this.dataForm.type = '组件服务' this.$http.get('/sys/user/info').then(res => { - console.log('res', res.data.data) + console.log('res', res.data.data, !res.data.data.superAdmin, this.$store.state.user.roleIdList) this.superAdmin = res.data.data.superAdmin + if (!(res.data.data.superAdmin || this.$store.state.user.roleIdList.indexOf('运维管理员') !== -1)) { + this.dataForm.deptIds = [res.data.data.deptId] + } + this.query() }) }, mounted () { @@ -391,7 +397,8 @@ export default { infoList: [], delFlag: 0, type: '组件服务', - name: '' + name: '', + deptIds: this.dataForm.deptIds } ) .then(({ data: res }) => { @@ -546,7 +553,8 @@ export default { infoList: [], delFlag: 0, type: '组件服务', - name: names + name: names, + deptIds: this.dataForm.deptIds } ) .then(({ data: res }) => { diff --git a/back/src/views/modules/ability/bsabilityservice.vue b/back/src/views/modules/ability/bsabilityservice.vue index a9886b3c..56772eae 100644 --- a/back/src/views/modules/ability/bsabilityservice.vue +++ b/back/src/views/modules/ability/bsabilityservice.vue @@ -249,7 +249,8 @@ export default { getDataListIsPage: true, exportURL: '/ability/bsabilityai/export', deleteURL: '/resource/delete', - deleteIsBatch: true + deleteIsBatch: true, + createdIsNeed: false }, disabled: false, sceneArr: dictionaries.sceneArr, @@ -260,7 +261,8 @@ export default { creator: '', selectType: 0, delFlag: 0, - type: '应用资源' + type: '应用资源', + deptId: '' }, qp: false, relateApplicationResourceVisible: false, @@ -297,6 +299,11 @@ export default { this.$http.get('/sys/user/info').then(res => { console.log('res', res.data.data) this.superAdmin = res.data.data.superAdmin + this.superAdmin = res.data.data.superAdmin + if (!(res.data.data.superAdmin || this.$store.state.user.roleIdList.indexOf('运维管理员') !== -1)) { + this.dataForm.deptId = [res.data.data.deptId] + } + this.query() }) }, mounted () { @@ -319,7 +326,8 @@ export default { delFlag: 0, creator: '', type: '应用资源', - name: '' + name: '', + deptIds: this.dataForm.deptId }) ) .then(({ data: res }) => { @@ -405,7 +413,8 @@ export default { creator: '', selectType: 0, delFlag: 0, - name: names + name: names, + deptIds: this.dataForm.deptId }) ) .then(({ data: res }) => { diff --git a/back/src/views/modules/myAgent/CompetencyApplication.vue b/back/src/views/modules/myAgent/CompetencyApplication.vue index 941afd35..bfb11a81 100644 --- a/back/src/views/modules/myAgent/CompetencyApplication.vue +++ b/back/src/views/modules/myAgent/CompetencyApplication.vue @@ -2,7 +2,7 @@ * @Author: hisense.liangjunhua * @Date: 2022-06-27 11:27:22 * @LastEditors: Light - * @LastEditTime: 2022-12-06 10:18:28 + * @LastEditTime: 2022-12-15 10:28:03 * @Description: 能力申请 -->