diff --git a/src/pages/localTool/standAutoSplit/index.vue b/src/pages/localTool/standAutoSplit/index.vue index 018032f77..17566a64b 100644 --- a/src/pages/localTool/standAutoSplit/index.vue +++ b/src/pages/localTool/standAutoSplit/index.vue @@ -29,8 +29,8 @@
拆分 - 上传 - 导入拆分结果 + + 删除
@@ -110,21 +110,21 @@ 查看 - - 收藏 - - - 取消收藏 - - 分享 + + + + + + + + + + + + + + + 删除 diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue new file mode 100644 index 000000000..de83172fa --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -0,0 +1,612 @@ + + + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue new file mode 100644 index 000000000..8f931edfe --- /dev/null +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step2.vue @@ -0,0 +1,300 @@ + + + + + diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index f94edf853..b62928f2d 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -29,7 +29,7 @@ 选择征求意见
- + @@ -177,34 +176,34 @@
- - - - - - - - - - - - - - - --> + + + + + + + + + + + + + + + + + + + - @click="sarStandCompareHisInfo">查询 - 清空 - - + + + + + + +
@@ -220,10 +219,17 @@ @selection-change="handleSelection" :header-cell-style="{background: '#f8f8f9', color: '#515a6e'}"> - - - - + + + + + +
@@ -326,12 +332,12 @@ export default { }, // 标准征求意见数据可库 standCommonlySearch: { - categorg: '', - cname: '', - start: '', - end: '', + // categorg: '', + // cname: '', + // start: '', + // end: '', page: 1, - size: this.$store.getters.userInfo.configContent + pageSize: this.$store.getters.userInfo.configContent }, spinShow: false, standInfoList: [], @@ -394,7 +400,7 @@ export default { }, methods: { addZqyjList() { - this.title = '标准征求意见库' + this.title = '国内外标准库' this.listModel = true }, /** 标准征求意见库方法* @@ -416,15 +422,23 @@ export default { // 查询表格 sarStandCompareHis () { this.spinShow = true - var form = this.standCommonlySearch - this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { - _this: this - }, res => { - this.standInfoList = res.data.records - this.total = res.data.total + var formData = this.standCommonlySearch + this.$http.get('sarStandardsInfo/sar-standards-info/getSarStandardsInfoPage', formData, { + _this: this + }, res => { + this.standInfoList = res.data.list + this.total = res.data.count this.spinShow = false - }, e => { }) + // var form = this.standCommonlySearch + // this.$http.get('slrs/sar-public-idea/SelectAllPage', form, { + // _this: this + // }, res => { + // this.standInfoList = res.data.records + // this.total = res.data.total + // this.spinShow = false + // }, e => { + // }) }, pageChange (page) { this.standCommonlySearch.page = page @@ -457,9 +471,12 @@ export default { for (let i = 0; i < this.selectedList.length; i++) { bringData.push(deposit.get(this.selectedList[i])); } - this.form.cid = bringData[0].cid - this.form.cname = bringData[0].cname; - this.form.endTime = bringData[0].endTime; + if (bringData[0].standYear) { + this.form.cid = bringData[0].standSortShow + ' ' + bringData[0].standNumber + '-' + bringData[0].standYear + } else { + this.form.cid = bringData[0].standSortShow + '-' + bringData[0].standNumber + } + this.form.cname = bringData[0].standName; this.listModel = false; } else if (this.selectedList.length > 1) { this.$message.warning("只能选择一条数据进行带入"); diff --git a/src/pages/processCenter/pages/newProcess/index.vue b/src/pages/processCenter/pages/newProcess/index.vue index b8dc2838e..e67bc49f0 100644 --- a/src/pages/processCenter/pages/newProcess/index.vue +++ b/src/pages/processCenter/pages/newProcess/index.vue @@ -12,6 +12,7 @@
标准清单发布/更新流程
项目合规评估流程
未符合项整改流程
+
标准解读流程
@@ -98,6 +99,10 @@ export default { }) break case '9': + // 标准解读流程 + this.$router.push({ + name:'bzjdStep1' + }) break case '10': break diff --git a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue index f4560e1ba..0227134b8 100644 --- a/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue +++ b/src/pages/processCenter/pages/processList/tabComponents/processCenter/index.vue @@ -344,7 +344,6 @@ export default { }) } break; - break case '3': if (row.taskInfo === '责任对接人选择责任人') { this.$router.push({ @@ -489,7 +488,19 @@ export default { }) } break - + case '9': + if (row.taskInfo === '') { + this.$router.push({ + name: 'bzjdStep2', + query: { + taskIds: row.taskIds, + prcId: row.prcId, + prcNum: row.prcNum, + prcName: row.prcName, + prcType: row.prcType + } + }) + } } }, ...mapMutations(['setProcess', 'setHandleInfo']), diff --git a/src/router/index.js b/src/router/index.js index a61dcc0e4..5ffdff44e 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -591,6 +591,24 @@ const routes = [ title: '标准调研流程' } }, + { + path: '/bzjdStep1', + name: 'bzjdStep1', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step1.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, + { + path: '/bzjdStep2', + name: 'bzjdStep2', + component: () => import('@/pages/processCenter/pages/creatProcess/bzjd/step2.vue'), + meta: { + requireAuth: true, + title: '标准解读流程' + } + }, ] }, // 本地工具