diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue index bb29aea0e..a49e5f9a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -76,8 +76,8 @@ - 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息 @@ -132,8 +132,8 @@ - - + +
- 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息 @@ -283,10 +283,10 @@ label="评估人" /> - - + +
- 流程列表加载中
- - +
+ + + + +
+
基础信息
+
审批历史
+
+
+
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+
+ + +
+ + +
+
+
+
+
+
+
+ + + + + + + + + + + + + + + + + + + + + 流程列表加载中 +
+
+ + + + +
+ + + + + diff --git a/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue new file mode 100644 index 000000000..be6aaa8c9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -0,0 +1,1238 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 7ad6211d8..c769c9649 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -31,11 +31,11 @@ @click="adjustmentHandler" round >调整处理人 - 流程审批 + >汇总流程 @@ -147,6 +147,8 @@ export default { name: 'processDetail', data () { return { + approveShow:false, + approveRowIndex:0, assigneeNewLoading: false, // 调整处理人确定loading loginPeople: '', // 调整处理人抽屉状态 @@ -199,11 +201,11 @@ export default { } }) }, - // 流程审批 + // 汇总流程 approveHandler(){ let index = this.detailData.length - 1 // 当前流程任务最后一步index let isEnd = true - let row = {...this.detailData[0]} + let row = {...this.detailData[this.approveRowIndex]}//汇总页数据 row.taskIds = row.id row.taskInfo = row.name row.tabsName = this.$route.query.tabsName @@ -220,16 +222,13 @@ export default { this.setPrcLastDetail((JSON.stringify(row))) // 根据type判断跳转具体流程页面 if (prcType === '1') { - row = {...this.detailData[0]} // 标准入库流程数据 //第一步 this.toProcessDetail('bzrkStep1',row) }else if(prcType === '2'){ //标准调研流程 //第五步 - row = {...this.detailData[4]} this.toProcessDetail('bzdyStep5-1',row) }else if(prcType === '3'){ //标准征求意见 第七步 - row = {...this.detailData[6]} this.toProcessDetail('bzzqyjStep5-1',row) }else if(prcType === '4'){ //标准清单发布流程数据 第一步 @@ -239,47 +238,36 @@ export default { // this.toProcessDetail('bzjdStep1', row) }else if (prcType === '5'){ //标准合规评估流程 最后一步 - row = {...this.detailData[index]} this.toProcessDetail('bzpgStep8-2',row) }else if(prcType === '6'){ //项目合规评估流程 最后一步 - row = {...this.detailData[index]} - this.toProcessDetail('xmpg2Step12',row) + // this.toProcessDetail('xmpg2Step12-1',row) + this.toProcessDetail('xmpgStep5-1',row) }else if(prcType === '10'){ //项目清单确认 最后一步 - row = {...this.detailData[index]} - this.toProcessDetail('xmqdqrStep4',row) + this.toProcessDetail('xmqdqrStep4-1',row) }else if (prcType === '8') { // 未符合项整改 3 - row = {...this.detailData[2]} this.toProcessDetail('wfhxzgStep3',row) }else if(prcType === 'buss1'){ //企标制修订 技术标准 第9 - row = {...this.detailData[8]} this.toProcessDetail('bussLibrary9',row) }else if(prcType === 'buss2'){ //企标 产品标准 6 - row = {...this.detailData[5]} this.toProcessDetail('bussLibraryProduct6',row) }else if(prcType === 'buss3'){ //企标复审 4 - row = {...this.detailData[3]} this.toProcessDetail('qbfsStep4',row) }else if(prcType === '24'){ //企标废止 3 - row = {...this.detailData[2]} this.toProcessDetail('qbfzStep1',row) }else if(prcType === '25'){ //企标制修订计划管控 1 - row = {...this.detailData[0]} this.toProcessDetail('qbzxdjhgkStep1',row) }else if(prcType === '26'){ //企标制修订计划立项 1 - row = {...this.detailData[0]} this.toProcessDetail('qbzxdlxStep1',row) } - } else { - this.$message.warning('当前流程未全部办理完成,无法查看') } }, /** @@ -1177,7 +1165,8 @@ export default { loading: 'loading', _this: this }, res => { - console.log(res) + this.approveShow = res[res.length-1].isGather + this.approveRowIndex = res[res.length-1].index }, e => {}) } }, diff --git a/src/router/index.js b/src/router/index.js index 1a16542e7..65b0e35b2 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -791,6 +791,15 @@ const routes = [ title: '项目合规评估流程' } }, + { + path: '/xmpgStep5-1', + name: 'xmpgStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue'), + meta: { + requireAuth: true, + title: '项目合规评估流程' + } + }, { path: '/xmpgStep1-5', name: 'xmpgStep1-5', @@ -971,6 +980,15 @@ const routes = [ title: '项目清单确认流程' } }, + { + path: '/xmqdqrStep4-1', + name: 'xmqdqrStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue'), + meta: { + requireAuth: true, + title: '项目清单确认流程' + } + }, { path: '/xmqdqrStep1-4', name: 'xmqdqrStep1-4',