diff --git a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue index d8a54e3c2..62e0b2512 100644 --- a/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue +++ b/src/pages/localTool/standAutoSplit/pages/itemSplitInfo.vue @@ -2652,6 +2652,14 @@ export default { width:50%; height: 50%; } + /deep/.sub{ + vertical-align: sub; + font-size: small; + } + /deep/.sup{ + vertical-align: super; + font-size: small; + } .preImgStyle { text-align: center; /deep/.wordImg { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue new file mode 100644 index 000000000..b9fff7703 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue @@ -0,0 +1,581 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue new file mode 100644 index 000000000..bdd588f52 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue @@ -0,0 +1,643 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue new file mode 100644 index 000000000..57cb4b6be --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue @@ -0,0 +1,788 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue new file mode 100644 index 000000000..d36095150 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue @@ -0,0 +1,1676 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue new file mode 100644 index 000000000..2c56a6a75 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue @@ -0,0 +1,4049 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue new file mode 100644 index 000000000..39f440ebe --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue @@ -0,0 +1,814 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue new file mode 100644 index 000000000..bd352bf5a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/common/formListStep4-1.vue @@ -0,0 +1,932 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue new file mode 100644 index 000000000..637487100 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue @@ -0,0 +1,796 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue new file mode 100644 index 000000000..5ca8bfef6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue @@ -0,0 +1,588 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue new file mode 100644 index 000000000..5ca6258f6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/common/formEditList-1.vue @@ -0,0 +1,985 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue new file mode 100644 index 000000000..d692796d2 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue @@ -0,0 +1,2904 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/allScore.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/allScore.vue new file mode 100644 index 000000000..07201709e --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/allScore.vue @@ -0,0 +1,227 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue new file mode 100644 index 000000000..e08993ecf --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/common/formList-1.vue @@ -0,0 +1,715 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue new file mode 100644 index 000000000..13b68d765 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue @@ -0,0 +1,2453 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue new file mode 100644 index 000000000..41a3453ba --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue @@ -0,0 +1,833 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue new file mode 100644 index 000000000..f379f15f6 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue @@ -0,0 +1,1199 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue new file mode 100644 index 000000000..31d8c505a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue @@ -0,0 +1,598 @@ + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue index 4007f8371..94509d2a6 100644 --- a/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/wfhxzg/step3.vue @@ -256,6 +256,7 @@ export default { }) }, getFormFieldList (item) { + console.log(item) this.$nextTick(() => { if (item.passInfo !== 0) { this.passInfo = JSON.parse(JSON.stringify(item)).passInfo diff --git a/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue new file mode 100644 index 000000000..89b2528c9 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmpg/step5-1.vue @@ -0,0 +1,656 @@ + + + + + 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..069bb9633 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/xmqdqr/step4-1.vue @@ -0,0 +1,1239 @@ + + + + + + diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index e0dd8d72c..d0c23ddb5 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -31,6 +31,11 @@ @click="adjustmentHandler" round >调整处理人 + 汇总流程 @@ -138,10 +143,14 @@ import { mapMutations } from 'vuex' import { changeAssigneeNew } from 'api/process' import axios from 'axios' +import eventBus from '@/common/eventHub' + export default { name: 'processDetail', data () { return { + approveShow:false, + approveRowIndex:0, assigneeNewLoading: false, // 调整处理人确定loading loginPeople: '', // 调整处理人抽屉状态 @@ -194,6 +203,82 @@ export default { } }) }, + // 汇总流程 + approveHandler(){ + let index = this.detailData.length - 1 // 当前流程任务最后一步index + let isEnd = true + let row = {...this.detailData[this.approveRowIndex+1]}//汇总页下一步拿到数据 + if(this.approveRowIndex ===this.detailData.length-1){ //最后一步 + row = {...this.detailData[this.approveRowIndex]} + } + row.taskIds = row.id + row.taskInfo = row.name + row.tabsName = this.$route.query.tabsName + + let currentItem = this.detailData[this.approveRowIndex] + row.currentItem = currentItem + + let prcType = this.detailData[index].prcType // 流程类型 + if (isEnd) { + if (this.$store.state.detailMap !== '') { + let lastDetailMap = this.$store.getters.getLastDetailMap + lastDetailMap.push(this.$store.state.detailMap) + this.$store.commit('setLastDetailMap', JSON.stringify(lastDetailMap)) + } + this.$store.commit('setDetailMap', this.$route.path) + row.isEnd = isEnd + this.setHandleInfo((JSON.stringify(row))) + this.setPrcLastDetail((JSON.stringify(row))) + // 根据type判断跳转具体流程页面 + if (prcType === '1') { + // 标准入库流程数据 //第一步 + this.toProcessDetail('bzrkStep1-1',row) + }else if(prcType === '2'){ + //标准调研流程 //第五步 + this.toProcessDetail('bzdyStep5-1',row) + }else if(prcType === '3'){ + //标准征求意见 第七步 + this.toProcessDetail('bzzqyjStep5-1',row) + }else if(prcType === '4'){ + //标准清单发布流程数据 第一步 + this.toProcessDetail('bzqdfbStep1_1',row) + } else if(prcType === '9') { + //标准解读流程 数据汇总页面 最后一步 暂时没有 + this.toProcessDetail('bzjdStep6-1', row) + }else if (prcType === '5'){ + //标准合规评估流程 最后一步 + this.toProcessDetail('bzpgStep8-2',row) + }else if(prcType === '6'){ + //项目合规评估流程 最后一步 + // this.toProcessDetail('xmpg2Step12-1',row) + this.toProcessDetail('xmpgStep5-1',row) + }else if(prcType === '10'){ + //项目清单确认 最后一步 + this.toProcessDetail('xmqdqrStep4-1',row) + }else if (prcType === '8') { + // 未符合项整改 3 + this.toProcessDetail('wfhxzgStep3-1',row) + }else if(prcType === 'buss1'){ + //企标制修订 技术标准 第9 + this.toProcessDetail('bussLibrary11-1',row) + }else if(prcType === 'buss2'){ + //企标 产品标准 6 + this.toProcessDetail('bussLibraryProduct6-1',row) + }else if(prcType === 'buss3'){ + //企标复审 4 + this.toProcessDetail('bussFs2-1',row) + }else if(prcType === '24'){ + //企标废止 3 + this.toProcessDetail('qbfzStep4-1',row) + }else if(prcType === '25'){ + //企标制修订计划管控 1 + this.toProcessDetail('qbzxdjhgkStep1-1',row) + }else if(prcType === '26'){ + //企标制修订计划立项 1 + this.toProcessDetail('qbzxdlxStep1-1',row) + } + } + }, /** * @author liruohao * @date 2019/4/22 @@ -322,6 +407,11 @@ export default { prcType: row.prcType, disabledXX:true, verifySarStandard:true, + index:this.approveRowIndex, + processInstanceId:row.processInstanceId + }, + params:{ + currentItem:row.currentItem } } if (unShowReceipt) { @@ -1078,6 +1168,20 @@ export default { } } this.processTable() + }, + // 流程审批按钮是否显示 + getApproveShow(){ + this.$http.get('lawss/activiti/get_gather_by_instance',{ + prcNum: this.$route.query.prcNum, + sortWord: this.shunxu ? this.paixu : '', + shunxu: this.shunxu + },{ + loading: 'loading', + _this: this + }, res => { + this.approveShow = res[res.length-1].isGather + this.approveRowIndex = res[res.length-1].index + }, e => {}) } }, components: { @@ -1112,6 +1216,7 @@ export default { mounted () { this.processNum() this.processTable() + this.getApproveShow() } } diff --git a/src/router/index.js b/src/router/index.js index e9a655477..c18b79f5a 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -432,6 +432,15 @@ const routes = [ title: '标准清单发布/更新流程' } }, + { + path: '/bzqdfbStep1_1', + name: 'bzqdfbStep1_1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzqdfb/step1_1.vue'), + meta: { + requireAuth: true, + title: '标准清单发布/更新流程' + } + }, { path: '/bzqdfbStep1-1', name: 'bzqdfbStep1-1', @@ -737,6 +746,14 @@ const routes = [ requireAuth: true, title: '标准合规评估流程' } + },{ + path: '/bzpgStep8-2', + name: 'bzpgStep8-2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzpg/step8-2.vue'), + meta: { + requireAuth: true, + title: '标准合规评估流程' + } }, { path: '/xmpgStep1', @@ -783,6 +800,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', @@ -963,6 +989,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', @@ -999,6 +1034,15 @@ const routes = [ title: '未符合项整改/更新流程' } }, + { + path: '/wfhxzgStep3-1', + name: 'wfhxzgStep3-1', + component: () => import('@/pages/processCenter/pages/creatProcess/wfhxzg/step3-1.vue'), + meta: { + requireAuth: true, + title: '未符合项整改/更新流程' + } + }, { path: '/wfhxzgStep4', name: 'wfhxzgStep4', @@ -1035,6 +1079,15 @@ const routes = [ title: '标准入库流程' } }, + { + path: '/bzrkStep1-1', + name: 'bzrkStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzrk/step1-1.vue'), + meta: { + requireAuth: true, + title: '标准入库流程' + } + }, { path: '/bzrkStep3', name: 'bzrkStep3', @@ -1213,7 +1266,8 @@ const routes = [ requireAuth: true, title: '企标制修订流程及企业标准库流程' } - },{ + }, + { path: '/bussLibrary11', name: 'bussLibrary11', component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11.vue'), @@ -1222,6 +1276,15 @@ const routes = [ title: '企标制修订流程及企业标准库流程' } },{ + path: '/bussLibrary11-1', + name: 'bussLibrary11-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step11-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订流程及企业标准库流程' + } + }, + { path: '/bussLibrary12', name: 'bussLibrary12', component: () => import('@/pages/processCenter/pages/creatProcess/qbrk/step12.vue'), @@ -1310,6 +1373,15 @@ const routes = [ title: '企标制修订-产品标准' } }, + { + path: '/bussLibraryProduct6-1', + name: 'bussLibraryProduct6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbrk-product/step6-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订-产品标准' + } + }, { path: '/bussLibraryProductC6', name: 'bussLibraryProductC6', @@ -1536,6 +1608,14 @@ const routes = [ requireAuth: true, title: '标准调研流程' } + },{ + path: '/bzzqyjStep5-1', + name: 'bzzqyjStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step5-1.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } }, { path: '/bzzqyjStep8', @@ -1652,6 +1732,15 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzdyStep5-1', + name: 'bzdyStep5-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzdy/step5-1.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep6', name: 'bzdyStep6', @@ -1821,6 +1910,15 @@ const routes = [ title: '标准解读流程' } }, + { + path: '/bzjdStep6-1', + name: 'bzjdStep6-1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step6-1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, { path: '/bzjdStep1-6', name: 'bzjdStep1-6', @@ -2101,6 +2199,15 @@ const routes = [ title: '企标复审流程' } }, + { + path: '/bussFs2-1', + name: 'bussFs2-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfs/step4-1.vue'), + meta: { + requireAuth: true, + title: '企标复审流程' + } + }, { path: '/bussFsC2', name: 'bussFsC2', @@ -2202,6 +2309,15 @@ const routes = [ title: '企标废止流程' } }, + { + path: '/qbfzStep4-1', + name: 'qbfzStep4-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbfz/step4-1.vue'), + meta: { + requireAuth: true, + title: '企标废止流程' + } + }, { path: '/qbfzStep5', name: 'qbfzStep5', @@ -2248,6 +2364,15 @@ const routes = [ title: '企标制修订计划管控流程' } }, + { + path: '/qbzxdjhgkStep1-1', + name: 'qbzxdjhgkStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdjhgk/step1-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订计划管控流程' + } + }, { path: '/qbzxdjhgkStep2', name: 'qbzxdjhgkStep2', @@ -2312,6 +2437,15 @@ const routes = [ title: '企标制修订立项计划流程(流程发起)' } }, + { + path: '/qbzxdlxStep1-1', + name: 'qbzxdlxStep1-1', + component: () => import('@/pages/processCenter/pages/creatProcess/qbzxdlx/step1-1.vue'), + meta: { + requireAuth: true, + title: '企标制修订立项计划流程(流程发起)' + } + }, { path: '/qbzxdlxStep2', name: 'qbzxdlxStep2',