diff --git a/public/pdfjs/web/viewer.js b/public/pdfjs/web/viewer.js index 29f0feb0..c48841f5 100644 --- a/public/pdfjs/web/viewer.js +++ b/public/pdfjs/web/viewer.js @@ -1554,6 +1554,7 @@ exports.PDFViewerApplication = PDFViewerApplication; if (!file) { return; } + // 可以在这里从localStorage取token放在file里,处理复制链接后不能预览的判断 try { const viewerOrigin = new URL(window.location.href).origin || "null"; if (HOSTED_VIEWER_ORIGINS.includes(viewerOrigin)) { diff --git a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue index e13a9df9..48cc1809 100644 --- a/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue +++ b/src/views/workCenter/standardProcurementProcess/StandardProcurementProcess.vue @@ -163,11 +163,14 @@ import { agreeProcurementProcess, rejectProcurementProcess, transferProcurementProcess, - carbonCopyProcurementProcess + carbonCopyProcurementProcess, + getProcessNodeList } from '../../../api/workCenter' import UserSelection from '../../../components/selection/UserSelection' import UserSelectModal from '../../../components/selection/UserSelectModal' import { downFile } from '../../../api/manage' +import Vue from 'vue' +import { USER_INFO } from '../../../store/mutation-types' export default { name: 'StandardProcurementProcess', @@ -284,6 +287,40 @@ export default { }) }, methods: { + // 查询人员信息结构数据,callback用于获取完流程才可以初始化人员信息 + getPersonInfoStructure (key, callback) { + const param = {} + param.processDefinitionKey = key + if (this.$route.query.processInstanceId) { + param.processInstanceId = this.$route.query.processInstanceId + } + getProcessNodeList(param).then(res => { + if (res.success) { + console.log(res.result) + // 处理人员信息数据,判断每个节点是否能选人 + this.personnelInfoData = res.result.map(item => { + return { + ...item, + chooseType: item.variableType === 'string' ? 'radio' : 'checkbox' + } + }) + if (!this.$route.query.processInstanceId) { + // 说明是在新发起一个节点,初始化发起人员信息 + this.personnelInfoData[0].linkUserIds = Vue.ls.get(USER_INFO).id + this.personnelInfoData[0].linkUserIds_dictText = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + this.personnelInfoData[0].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + // 发起节点,最后一个节点也需要返回当前登陆人 + const lastIndex = this.personnelInfoData.length - 1 + this.personnelInfoData[lastIndex].linkUserIds = Vue.ls.get(USER_INFO).id + this.personnelInfoData[lastIndex].linkUserIds_dictText = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + this.personnelInfoData[lastIndex].userList = Vue.ls.get(USER_INFO).realname + '(' + Vue.ls.get(USER_INFO).username + ')' + } + if (callback) { + callback() + } + } + }) + }, onSelectChange (selectedRowKeys) { this.selectedRowKeys = selectedRowKeys },