diff --git a/src/api/process.js b/src/api/process.js index c5a9fee18..0a39bbd5b 100644 --- a/src/api/process.js +++ b/src/api/process.js @@ -49,7 +49,14 @@ export function inboundLiaisonDetail (data) { params: data }) } - +// 联络人分配FO详情查询 +export function queryZchgxxmscTaskDetail (data) { + return axios({ + url: '/api/lawss/activiti/queryZchgxxmscTaskDetail', + method: 'get', + params: data + }) +} // 流程保存 export function saveTask (data) { return axios({ diff --git a/src/components/navMenu/index.vue b/src/components/navMenu/index.vue index d5cd40ff4..5a1bf6d34 100644 --- a/src/components/navMenu/index.vue +++ b/src/components/navMenu/index.vue @@ -443,16 +443,16 @@ // path: '/DynamicInformations', // menuId: '3C87BSHJUF' // }, - // // { - // // title: '流程分类管理', - // // path: '/processClassificationManage', - // // menuId: 'N323F2UB9FTUV5SD3GTD' - // // }, - // // { - // // title: '流程管理', - // // path: '/processManage', - // // menuId: 'K5KXSS3X9CF7CS8AMFJ5' - // // }, + { + title: '流程分类管理', + path: '/processClassificationManage', + // menuId: 'N323F2UB9FTUV5SD3GTD' + }, + { + title: '流程管理', + path: '/processManage', + // menuId: 'K5KXSS3X9CF7CS8AMFJ5' + }, // { // title: 'SVPPS', // path: '/svpps', diff --git a/src/components/roleTree/index.vue b/src/components/roleTree/index.vue index 8382c090f..95cc0e074 100644 --- a/src/components/roleTree/index.vue +++ b/src/components/roleTree/index.vue @@ -1,12 +1,13 @@ + :title="isTitle" + v-if="visible" + :visible.sync="visible" + :wrapperClosable="false" + @close="handleTreeDrawerCancel" + append-to-body + size="460px"> - - - 查询 - - + + + 查询 + + @@ -72,7 +73,7 @@ ref="tree" :lazy="false" :key="treeKey" - > + > {{ node.label }} @@ -90,13 +91,19 @@ closable> {{tag.name}} - 全部删除 + 全部删除 + - 确定 + 确定 + - 取消 + 取消 + 导入中... @@ -104,15 +111,16 @@ + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue new file mode 100644 index 000000000..2f790544e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/addModel.vue @@ -0,0 +1,460 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.lawName }} + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/approvalHistory.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/approvalHistory.vue new file mode 100644 index 000000000..8986b06c5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/approvalHistory.vue @@ -0,0 +1,86 @@ + + + + + + + + + {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + {{ scope.row.commentText }} + + + + + {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }} + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue new file mode 100644 index 000000000..7d4c099c7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionEdit.vue @@ -0,0 +1,234 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + SOP时间超过法规时限的空档期的业务应对方案 + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue new file mode 100644 index 000000000..04aa3d015 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/businessDivisionList.vue @@ -0,0 +1,155 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue new file mode 100644 index 000000000..932b66fc2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/fetchList.vue @@ -0,0 +1,436 @@ + + + + + 调取 + 删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 查询 + + + 清空 + + + + + + + + + + + + + + + + + + + + + 查看 + + + + + + + 数据获取中 + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue new file mode 100644 index 000000000..e4f2dc250 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/personnelInformation.vue @@ -0,0 +1,336 @@ + + + + + + + + 起草 + + + + + + + + + + + + 审核 + + + + + + + + + + + + 审定 + + + + + + + + + + + + 批准 + + + + + + + + + + + + 责任对接人分配任务 + + + + + + + + + + + + 管理员 + + + + + + + + + + + + 审核 + + + + + + + + + + + + 审定 + + + + + + + + + + + + 批准 + + + + + + + + + + + + 抄送 + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue new file mode 100644 index 000000000..a6d775378 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/components/productPlanningList.vue @@ -0,0 +1,404 @@ + + + + + 新增 + + + 批量删除 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 编辑 + + 删除 + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue new file mode 100644 index 000000000..b258da5f4 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue @@ -0,0 +1,1043 @@ + + + + 重点认证标准/政策合规性项目审查流程 + {{taskKeyName}} + + + 基础信息 + 人员信息 + + 审批历史 + + + + + + + 基础信息 + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + 点击上传 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 正在加载数据 + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue new file mode 100644 index 000000000..abbf069f1 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/addModel.vue @@ -0,0 +1,295 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + 点击上传 + + + + + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue new file mode 100644 index 000000000..8986b06c5 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/approvalHistory.vue @@ -0,0 +1,86 @@ + + + + + + + + + {{ scope.row.createTime ? $moment(scope.row.createTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + {{ scope.row.endTime ? $moment(scope.row.endTime).format('YYYY-MM-DD HH:mm:ss') : '' }} + + + + + {{ scope.row.commentText }} + + + + + {{ scope.row.endTime ? '已完成' : scope.row.receiveStatus ? '已接收' : '未完成' }} + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/fileViewModel.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/fileViewModel.vue new file mode 100644 index 000000000..3688470c7 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/fileViewModel.vue @@ -0,0 +1,75 @@ + + + + + {{ item.name || item.oldFileName }} + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue new file mode 100644 index 000000000..9c1f7f9c6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/personnelInformation.vue @@ -0,0 +1,333 @@ + + + + + + + + 起草 + + + + + + + + + + + + 审核 + + + + + + + + + + + + 审定 + + + + + + + + + + + + 批准 + + + + + + + + + + + + 责任对接人分配任务 + + + + + + + + + + + + 管理员 + + + + + + + + + + + + 审核 + + + + + + + + + + + + 审定 + + + + + + + + + + + + 批准 + + + + + + + + + + + + 抄送 + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/policySolicitingOpinions.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/policySolicitingOpinions.vue new file mode 100644 index 000000000..4b726ffb6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/policySolicitingOpinions.vue @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + 查询 + + + 清空 + + + + + + + + + + + + {{ + scope.row.lawsNumber }} + + + + + {{ scope.row.lawsName }} + + + + {{ scope.row.issueTime ? + $moment(scope.row.issueTime).format('YYYY-MM-DD') : '' }} + + + + + {{ scope.row.standStatusShow }} + + + + + 查看 + + + + + + + 数据获取中 + + + + 正在加载数据 + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue new file mode 100644 index 000000000..746856766 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/components/solicitationList.vue @@ -0,0 +1,410 @@ + + + + 征求意见列表 + + + 新增 + + 批量删除 + + 生成汇总单 + + 生成上报意见 + + 导出 + + + + + + + + + + + + + + + + + + + + + + 查看文件 + -- + + + + + + + + + + + + + + + + + + + + 编辑 + + 删除 + + + + + + + + + + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue new file mode 100644 index 000000000..40a843753 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/policyConsultation/index.vue @@ -0,0 +1,1006 @@ + + + + 政策征求意见流程 + {{taskKeyName}} + + + 基础信息 + 人员信息 + + 审批历史 + + + + + + + 基础信息 + + + + + + + + 选择征求意见政策 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + {{ item.name }} + + + + + + + 点击上传 + + + + + + + + + + + + + + + + + + + 是 + + 否 + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 正在加载数据 + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index bf58447ea..cd279bb8e 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -275,7 +275,45 @@ export default { this.toProcessDetail('qbzxdjhgkStep1-1',row) }else if(prcType === '26'){ //企标制修订计划立项 1 - this.toProcessDetail('qbzxdlxStep1-1',row) + this.toProcessDetail('qbzxdlxStep1-1', row) + } else if (prcType === '33') { + let data = [] + this.detailData.forEach(res => { + if (res.taskDefinitionKey == 'PolicySolicitOpinionProcessKey11') { + data.push(res) + } + }) + this.$router.push({ + path: '/policyConsultation', + query: { + taskIds: data[0].id, + prcNum: data[0].prcNum, + prcName: data[0].prcName, + prcType: data[0].prcType, + prcId: data[0].processInstanceId, + taskDefinitionKey: data[0].taskDefinitionKey, + operate: 'view', + } + }) + } else if (prcType === '34') { + let data = [] + this.detailData.forEach(res => { + if (res.taskDefinitionKey == 'PolicyComplianceProgramReviewProcessKey11') { + data.push(res) + } + }) + this.$router.push({ + path: '/policyComplianceReview', + query: { + taskIds: data[0].id, + prcNum: data[0].prcNum, + prcName: data[0].prcName, + prcType: data[0].prcType, + prcId: data[0].processInstanceId, + taskDefinitionKey: data[0].taskDefinitionKey, + operate: 'view', + } + }) } } }, @@ -406,6 +444,32 @@ export default { // 政策法规资料入库流程 const params = { type: 'step1' } this.toProcessDetailForParams('policyRegulatoryMaterials', row, params) + } else if (prcType === '33') { + this.$router.push({ + path: '/policyConsultation', + query: { + taskIds: row.id, + prcNum: row.prcNum, + prcId: row.processInstanceId, + prcName: row.prcName, + prcType: row.prcType, + taskDefinitionKey: row.taskDefinitionKey, + operate: 'view', + } + }) + } else if (prcType === '34') { + this.$router.push({ + path: '/policyComplianceReview', + query: { + taskIds: row.id, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + prcId: row.processInstanceId, + taskDefinitionKey: row.taskDefinitionKey, + operate: 'view', + } + }) } } else { this.$message.warning('当前流程未全部办理完成,无法查看') diff --git a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue index e629b8951..51079b112 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/newProcess/index.vue @@ -547,13 +547,13 @@ export default { case '12': // 政策征求意见流程 this.$router.push({ - name: 'zczqyjStep1' + path: 'policyConsultation' }) break case '13': // 重点认证标准/政策合规性项目审查流程 this.$router.push({ - name: 'zdrzbzORzchgxxmscStep1' + path: 'policyComplianceReview' }) break case '17': diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 4ac6d872f..43ad255f2 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -2363,6 +2363,32 @@ export default { }) } break + case '33': + this.$router.push({ + path: 'policyConsultation', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + taskDefinitionKey: row.taskDefinitionKey + } + }) + break + case '34': + this.$router.push({ + path: 'policyComplianceReview', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType, + taskDefinitionKey: row.taskDefinitionKey + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue index ce1c07b6c..5b03037d7 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/taskDraft/index.vue @@ -1003,6 +1003,23 @@ export default { } }) break + + case '33': + this.$router.push({ + path: 'policyConsultation', + query: { + bpnId: id + } + }) + break + case '34': + this.$router.push({ + path: 'policyComplianceReview', + query: { + bpnId: id + } + }) + break } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index e794ab3bf..ec9cfeae2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -514,6 +514,15 @@ const routes = [ } }, { + path: '/policyConsultation', + name: 'policyConsultation', + component: () => import('@/pages/processCenter/pages/creatProcess/policyConsultation/index.vue'), + meta: { + requireAuth: true, + title: '政策征求意见流程' + } + }, + { path: '/zczqyjStep1', name: 'zczqyjStep1', component: () => import('@/pages/processCenter/pages/creatProcess/zczqyj/step1.vue'), @@ -603,6 +612,15 @@ const routes = [ } }, { + path: '/policyComplianceReview', + name: 'policyComplianceReview', + component: () => import('@/pages/processCenter/pages/creatProcess/policyComplianceReview/index.vue'), + meta: { + requireAuth: true, + title: '重点认证标准/政策合规性项目审查流程' + } + }, + { path: '/zdrzbzORzchgxxmscStep1', name: 'zdrzbzORzchgxxmscStep1', component: () => import('@/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue'), diff --git a/src/sysConfig/index.js b/src/sysConfig/index.js index a10432652..523461111 100644 --- a/src/sysConfig/index.js +++ b/src/sysConfig/index.js @@ -11,20 +11,20 @@ // const devIp = '10.10.10.46' // const devInterfacePORT = '4202' // // const devIp = '10.0.3.10' -const devIp = 'localhost' +const devIp = '10.0.3.11' const devInterfacePORT = '10086' // const devIp = '62.234.136.153' // const devInterfacePORT = '8033' // 配置 idm 认证 -const ssoLogin = 'http://sso.foton.com.cn/oauth2.0/authorize?client_id=app_slrs&response_type=code&redirect_uri=' +const ssoLogin = 'http://localhost:9090/#/' // 配置 前端服务 -const devWebUrl = 'http://62.234.136.153:8038/#/' +const devWebUrl = 'http://localhost:9090/#/' // webLoginType : idm (线上统一登录) 、 webLoginType: dev (测试环境登录) const webLoginType = 'dev' // 配置onlyOffice 前端服务 -// const onlyOfficeUrl = 'http://127.0.0.1:8080' -const onlyOfficeUrl = 'http://10.10.10.46:8889' +const onlyOfficeUrl = 'http://127.0.0.1:8080' +// const onlyOfficeUrl = 'http://10.10.10.46:8889' // 云端端口号 const DEV_CLOUD_RES_INTERFACE_PORT = '7777' @@ -50,8 +50,8 @@ const processPort = '17210' // 生产环境配置 // const prodIp = '39.98.140.126' // const prodInterfacePORT = '4201' -// const prodIp = '10.10.10.46' -// const prodInterfacePORT = '4202' +const prodIp = '10.10.10.46' +const prodInterfacePORT = '4202' // const prodIp = 'slrs.foton.com.cn' // const prodInterfacePORT = ''