From a5f2bff546cb3e4f617129978c4377303affc454 Mon Sep 17 00:00:00 2001 From: zhutianqi Date: Fri, 9 Jul 2021 17:27:05 +0800 Subject: [PATCH] commit --- src/assets/styles/newStyle.less | 3 + src/common/axios/index.js | 41 ++ src/pages/login/index.vue | 3 +- .../pages/creatProcess/bzdy/step4.vue | 13 +- .../pages/creatProcess/bzzqyj/step3.vue | 356 ++++++++++++++++- .../pages/creatProcess/bzzqyj/step4.vue | 292 +++++++++++++- .../pages/creatProcess/bzzqyj/step5.vue | 345 +++++++++++++++- .../pages/creatProcess/bzzqyj/step6.vue | 364 +++++++++++++++++ .../pages/creatProcess/bzzqyj/step7.vue | 367 ++++++++++++++++++ .../pages/creatProcess/bzzqyj/step8.vue | 367 ++++++++++++++++++ .../pages/creatProcess/bzzqyj/step9.vue | 367 ++++++++++++++++++ .../tabComponents/processCenter/index.vue | 77 ++++ .../pags/consultationDetails.vue | 3 +- src/router/index.js | 36 ++ 14 files changed, 2604 insertions(+), 30 deletions(-) create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue create mode 100644 src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue diff --git a/src/assets/styles/newStyle.less b/src/assets/styles/newStyle.less index ef8706955..34d3fea50 100644 --- a/src/assets/styles/newStyle.less +++ b/src/assets/styles/newStyle.less @@ -906,3 +906,6 @@ tr.el-table__row{ margin: 10px; width: calc(~'100% - 20px'); } +.button-list { + padding: 5px 0px; +} diff --git a/src/common/axios/index.js b/src/common/axios/index.js index 9034bc7c2..c53e52bc9 100644 --- a/src/common/axios/index.js +++ b/src/common/axios/index.js @@ -282,6 +282,47 @@ export default { exeFun.call(this, err) }) }, + downloadFile (url, param, fileName) { + _axios({ + method: 'post', + url, + data: param, + responseType: 'blob' + }).then( + res => { + const data = res.data + const r = new FileReader() + r.onload = function () { + try { + const resData = JSON.parse(this.result) + } catch (err) { + // 下载正常处理 + // 兼容ie11 + if (window.navigator.msSaveOrOpenBlob) { + try { + const blobObject = new Blob([data]) + window.navigator.msSaveOrOpenBlob(blobObject, fileName) + } catch (e) { + console.log(e) + } + return + } + // a标签实现下载 + let url = window.URL.createObjectURL(new Blob([data])) + let link = document.createElement('a') + link.style.display = 'none' + link.href = url + link.setAttribute('download', fileName) + document.body.appendChild(link) + link.click() + resolve(fileName) + } + } + r.readAsText(data) // FileReader的API + }).catch(res => { + console.log(res) + }) + }, /** * @description: delete方法 * @author: chenxiaoxi diff --git a/src/pages/login/index.vue b/src/pages/login/index.vue index 214dd7983..c15f9b668 100644 --- a/src/pages/login/index.vue +++ b/src/pages/login/index.vue @@ -115,7 +115,8 @@ export default { // 获取用户菜单 this.getMenu().then((menuList) => { let hasHomeMenu = menuList.some((menuItem) => { - return menuItem.id === 'G72J4WNFM8' + // return menuItem.id === 'G72J4WNFM8' + return menuItem.id === 'asdfadf' }) if (hasHomeMenu) { diff --git a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue index 2059a9309..89b5009a2 100644 --- a/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzdy/step4.vue @@ -55,13 +55,6 @@ - - - - - - - - - @@ -84,13 +77,13 @@ diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue index d4122495f..e44dbca0f 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step3.vue @@ -1,13 +1,357 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue index 848d27d8d..78655e47e 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step4.vue @@ -1,13 +1,293 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue index e7e508d86..a2bb22b44 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step5.vue @@ -1,13 +1,346 @@ - diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue new file mode 100644 index 000000000..0fe14f99c --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue @@ -0,0 +1,364 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue new file mode 100644 index 000000000..c6c16671a --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue new file mode 100644 index 000000000..5a0415f34 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue new file mode 100644 index 000000000..02a8a2e72 --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue @@ -0,0 +1,367 @@ + + + + + diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index 5557de462..f4560e1ba 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -357,6 +357,83 @@ export default { prcType: row.prcType } }) + } else if (row.taskInfo === '责任人填写征求意见'){ + this.$router.push({ + name: 'bzzqyjStep3', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任对接人审批') { + this.$router.push({ + name: 'bzzqyjStep4', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '标准法规工程师汇总填写处理意见') { + this.$router.push({ + name: 'bzzqyjStep5', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '责任人会签') { + this.$router.push({ + name: 'bzzqyjStep6', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo === '部长+对接人审核') { + this.$router.push({ + name: 'bzzqyjStep7', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else if (row.taskInfo.indexOf('技术委员会相关专委会主任') == 0 ) { + this.$router.push({ + name: 'bzzqyjStep8', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } else { + this.$router.push({ + name: 'bzzqyjStep9', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) } break //标准清单更新/发布流程 diff --git a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue index fce17ead3..2be14000d 100644 --- a/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue +++ b/src/pages/regulatoryRepository/standardForComments/pags/consultationDetails.vue @@ -131,7 +131,8 @@ export default { form: { cid: this.$route.query.item.cid, page: 1, - size: this.$store.getters.userInfo.configContent + size: this.$store.getters.userInfo.configContent, + userId: this.$store.getters.userInfo.userId, } // 详情数据 } }, diff --git a/src/router/index.js b/src/router/index.js index c99fab019..4ed8d5f38 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -447,6 +447,42 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzzqyjStep6', + name: 'bzzqyjStep6', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step6.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzzqyjStep7', + name: 'bzzqyjStep7', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step7.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzzqyjStep8', + name: 'bzzqyjStep8', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step8.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, + { + path: '/bzzqyjStep9', + name: 'bzzqyjStep9', + component: () => import('@/pages/processCenter/pages/creatProcess/bzzqyj/step9.vue'), + meta: { + requireAuth: true, + title: '标准调研流程' + } + }, { path: '/bzdyStep4', name: 'bzdyStep4',