From 72569984d4f2afff48bae31aa6612ebbc4d75808 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 17:22:05 +0800 Subject: [PATCH 1/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205649?= =?UTF-8?q?3=20=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9A=E9=A1=B9=E7=9B=AE=E5=90=88=E8=A7=84=E8=AF=84=E4=BC=B0?= =?UTF-8?q?=E6=B5=81=E7=A8=8B-=E9=A1=B9=E7=9B=AE=EF=BC=8C=E6=B5=81?= =?UTF-8?q?=E7=A8=8B=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E7=82=B9=E5=87=BB?= =?UTF-8?q?=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=20?= =?UTF-8?q?=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=A1=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/xmpg2/step1.vue | 20 ++++++++++++++++--- 1 file changed, 17 insertions(+), 3 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue index 8af764c60..a354530e1 100644 --- a/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/xmpg2/step1.vue @@ -24,7 +24,7 @@ - 选择项目 + 选择项目 { + let mes = JSON.parse(res.mes) + this.listForm = JSON.parse(JSON.stringify(mes.form)) + this.dataList = this.listForm.dataList ? this.listForm.dataList : [] + this.roleForm = mes.roleForm + this.commentText = mes.commentText + }) + }, }, mounted() { + if(this.$route.query.bpnId){ + this.getTaskId() + } this.getProjectData(); // 查询各下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", "", { From 54de79d3764657001d0c541b879c7a6b0acbbde2 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 17:47:37 +0800 Subject: [PATCH 2/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E7=9B=91=E6=8E=A7=20+=2056495?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../creatProcess/zdrzbzORzchgxxmsc/step1.vue | 57 +++++- .../pages/processDetail/index.vue | 162 +++++------------- 2 files changed, 93 insertions(+), 126 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue index cc9888ba9..fccf447a6 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue @@ -353,7 +353,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import {saveTaskFirst} from "api/process"; +import {saveTaskFirst,taskDel,queryTaskFirst} from "api/process"; export default { name: "zdrzbzORzchgxxmscStep1", @@ -475,7 +475,23 @@ export default { saveLoading: false, } }, + mounted() { + if(this.$route.query.bpnId){ + this.getTaskId() + } + }, methods: { + getTaskId() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.listForm = JSON.parse(JSON.stringify(mes.form)) + this.dataList = this.listForm.dataList ? this.listForm.dataList : [] + this.roleForm = mes.roleForm + this.commentText = mes.commentText + }) + }, deleteSelectChange(data) { console.log('483',data) this.deleteSelectedList = [] @@ -683,24 +699,26 @@ export default { }, //保存事件 handleSave() { - this.saveLoading = true; + this.isSubmit = true + this.saveLoading = true let _formData = new FormData(); _formData.append("id", this.bpnId || ""); _formData.append("createUser", this.$store.getters.userInfo.userId); _formData.append("createUserName", this.$store.getters.userInfo.userName); - _formData.append("prcType", "12"); + _formData.append("prcType", "laws3"); _formData.append("json", JSON.stringify({ - taskInfo: "人确认", form: this.infoForm, roleForm: this.roleForm, commentText: this.commentText })); saveTaskFirst(_formData).then(res => { - this.saveLoading = false; + this.isSubmit = false + this.saveLoading = false this.$message.success("保存成功"); this.bpnId = res.result; }).catch(e => { - this.saveLoading = false; + this.isSubmit = false + this.saveLoading = false }); }, //提交事件 @@ -711,12 +729,22 @@ export default { this.$refs['Form'].validate((valid) => { if (valid) { this.isSubmit = true + this.saveLoading = true let infoTableDatas = [] infoTableDatas = JSON.stringify(this.infoTableDatas) localStorage.setItem('infoTableDatas', JSON.stringify(this.infoTableDatas)) - this.$http.get('lawss/activiti/startProcess', { + this.$http.post('lawss/activiti/startProcessRollBack', { + createUser: this.$store.getters.userInfo.userId, + createUserName: this.$store.getters.userInfo.userName, type: 'laws3', - }, {_this: this}, res => { + json: JSON.stringify({ + form: this.infoForm, + roleForm: this.roleForm, + commentText: this.commentText + }) + }, { + _this: this + }, res => { if (res.ok) { var json = Object.assign(this.form, this.roleForm) json.commentText = this.commentText @@ -730,16 +758,27 @@ export default { }, {_this: this}, res => { if (res.success) { this.$message.success('流程发起成功') + if (this.$route.query.bpnId && this.$route.query.bpnId !== '') { + let taskId = { + id: this.$route.query.bpnId + } + taskDel(taskId).then(res=>{ + return res + }) + } this.$router.push('/processCenter') this.isSubmit = false + this.saveLoading = false } else { this.$message.warning('流程启动失败') this.isSubmit = false - } + this.saveLoading = false + } }) } else { this.$message.warning('流程启动失败') this.isSubmit = false + this.saveLoading = false } }) } else { diff --git a/src/pages/processCenter/pages/processDetail/index.vue b/src/pages/processCenter/pages/processDetail/index.vue index 9c051d20d..150e6d018 100644 --- a/src/pages/processCenter/pages/processDetail/index.vue +++ b/src/pages/processCenter/pages/processDetail/index.vue @@ -209,11 +209,11 @@ export default { let prcType = this.detailData[index].prcType // 流程类型 console.log(prcType); // 判断当前流程是否已全部办理完成 - this.detailData.map(item => { - if (!item.endTime) { - isEnd = false - } - }) + // this.detailData.map(item => { + // if (!item.endTime) { + // isEnd = false + // } + // }) if (isEnd) { if (this.$store.state.detailMap !== '') { let lastDetailMap = this.$store.getters.getLastDetailMap @@ -225,16 +225,18 @@ export default { this.setHandleInfo((JSON.stringify(row))) this.setPrcLastDetail((JSON.stringify(row))) // 根据type判断跳转具体流程页面 - // 根据type判断跳转具体流程页面 if (prcType === '1') { // 标准入库流程数据 - this.toProcessDetail('bzrkStep5',row) + this.toProcessDetail('bzrkStep1',row) }else if(prcType === 'laws1'){ //政策入库 - this.toProcessDetail('zcrkStep5',row) + this.toProcessDetail('zcrkStep1',row) }else if(prcType === 'laws2'){ - //政策入库 - this.toProcessDetail('zczqyjStep9Detil',row) + //政策征求意见流程 + this.toProcessDetail('zczqyjStep1',row) + }else if(prcType === 'laws3'){ + //重点认证标准/政策合规性项目审查流程 + this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) }else if(prcType === 'buss1'){ //企标入库 this.toProcessDetail('bussLibrary1',row) @@ -242,144 +244,70 @@ export default { //企标入库 this.toProcessDetail('bussLibraryProduct1',row) }else if(prcType === 'buss3'){ - //企标复审 - this.toProcessDetail('qbfsStep1',row) + //企标复审 + this.toProcessDetail('qbfsStep1',row) }else if(prcType === '4'){ //标准清单发布流程数据 - this.toProcessDetail('bzqdfbStep1-4',row) + this.toProcessDetail('bzqdfbStep1',row) }else if (prcType === '5'){ //标准项目合规评估 - this.toProcessDetail('bzpgStep8-1',row) + this.toProcessDetail('bzpgStep1',row) }else if(prcType === '6'){ //标准项目合规评估 项目维度 - this.toProcessDetail('xmpgStep1-5',row) + this.toProcessDetail('xmpg2Step1',row) } else if (prcType === '8') { // 未符合项整改 - this.toProcessDetail('wfhxzgStep5-1',row) + this.toProcessDetail('wfhxzgStep1',row) } else if(prcType === '9'){ - this.toProcessDetail('bzjdStep1-6',row) + this.toProcessDetail('bzjdStep1',row) //标准调研流程 }else if(prcType === '2'){ - this.toProcessDetail('bzdyStep1-9',row) + this.toProcessDetail('bzdyStep1',row) }else if(prcType === '3'){ //标准征求意见 - this.toProcessDetail('bzzqyjStep1-9',row) + this.toProcessDetail('bzzqyjStep1',row) }else if(prcType === '10'){ //项目清单确认 - this.toProcessDetail('xmqdqrStep1-4',row, 'unShowReceipt') + this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt') + }else if(prcType === '14'){ + //加入标准化协会信息备案流程 + this.toProcessDetail('cywbbzzxdStep1',row,) + }else if(prcType === '15'){ + //加入标准化协会信息备案流程 + this.toProcessDetail('jrbzhxhStep1',row,) } else if(prcType === '16'){ //外部署名 - this.toProcessDetail('wbsmStep1-5',row) + this.toProcessDetail('wbsmStep1',row) }else if(prcType === '20') { // 入会流程 - this.toProcessDetail('bzrhStep6-1',row) + this.toProcessDetail('bzrhStep1',row) } else if(prcType === '21') { // 参会流程 - this.toProcessDetail('bzchStep6-1',row) + this.toProcessDetail('bzchStep1',row) } else if(prcType === '23'){ //企标复审 - this.toProcessDetail('qbfsStep1-4',row) + this.toProcessDetail('qbfsStep1',row) }else if(prcType === '24'){ //企标废止 - this.toProcessDetail('qbfzStep1-7',row) + this.toProcessDetail('qbfzStep1',row) }else if(prcType === '25'){ //企标制修订计划管控 - this.toProcessDetail('qbzxdjhgkStep1-5',row) + this.toProcessDetail('qbzxdjhgkStep1',row) }else if(prcType === '26'){ //企标制修订计划立项 - this.toProcessDetail('qbzxdlxStep1-2',row) + this.toProcessDetail('qbzxdlxStep1',row) + }else if(prcType === '17'){ + //政策课题入会发起流程 + this.toProcessDetail('zcrhStep1',row) + }else if(prcType === '18'){ + //政策课题参会发起流程 + this.toProcessDetail('zcchStep1',row) + }else if(prcType === '12'){ + //政策课题参会发起流程 + this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) } - // if (prcType === '1') { - // // 标准入库流程数据 - // this.toProcessDetail('bzrkStep1',row) - // }else if(prcType === 'laws1'){ - // //政策入库 - // this.toProcessDetail('zcrkStep1',row) - // }else if(prcType === 'laws2'){ - // //政策征求意见流程 - // this.toProcessDetail('zczqyjStep1',row) - // }else if(prcType === 'buss1'){ - // //企标入库 - // this.toProcessDetail('bussLibraryDetail',row) - // }else if(prcType === 'buss2'){ - // //企标入库 - // this.toProcessDetail('bussLibraryProductDetail',row) - // }else if(prcType === 'buss3'){ - // //企标复审 - // this.toProcessDetail('qbfsStep1',row) - // }else if(prcType === '4'){ - // //标准清单发布流程数据 - // this.toProcessDetail('bzqdfbStep1',row) - // }else if (prcType === '5'){ - // //标准项目合规评估 - // this.toProcessDetail('bzpgStep1',row) - // }else if(prcType === '6'){ - // //标准项目合规评估 项目维度 - // this.toProcessDetail('xmpg2Step1',row) - // } else if (prcType === '8') { - // // 未符合项整改 - // this.toProcessDetail('wfhxzgStep1',row) - // } else if(prcType === '9'){ - // this.toProcessDetail('bzjdStep1',row) - // //标准调研流程 - // }else if(prcType === '2'){ - // this.toProcessDetail('bzdyStep1',row) - // }else if(prcType === '3'){ - // //标准征求意见 - // this.toProcessDetail('bzzqyjStep1',row) - // }else if(prcType === '10'){ - // //项目清单确认 - // this.toProcessDetail('xmqdqrStep1',row, 'unShowReceipt') - // }else if(prcType === '14'){ - // //加入标准化协会信息备案流程 - // this.toProcessDetail('cywbbzzxdStep1',row,) - // }else if(prcType === '15'){ - // //加入标准化协会信息备案流程 - // this.toProcessDetail('jrbzhxhStep1',row,) - // } else if(prcType === '16'){ - // //外部署名 - // this.toProcessDetail('wbsmStep1',row) - // }else if(prcType === '20') { - // // 入会流程 - // this.toProcessDetail('bzrhStep1',row) - // } else if(prcType === '21') { - // // 参会流程 - // this.toProcessDetail('bzchStep1',row) - // } else if(prcType === '23'){ - // //企标复审 - // this.toProcessDetail('qbfsStep1',row) - // }else if(prcType === '24'){ - // //企标废止 - // this.toProcessDetail('qbfzStep1',row) - // }else if(prcType === '25'){ - // //企标制修订计划管控 - // this.toProcessDetail('qbzxdjhgkStep1',row) - // }else if(prcType === '26'){ - // //企标制修订计划立项 - // this.toProcessDetail('qbzxdlxStep1',row) - // }else if(prcType === '17'){ - // //政策课题入会发起流程 - // this.toProcessDetail('zcrhStep1',row) - // }else if(prcType === '18'){ - // //政策课题参会发起流程 - // this.toProcessDetail('zcchStep1',row) - // }else if(prcType === '12'){ - // //政策课题参会发起流程 - // this.toProcessDetail('zdrzbzORzchgxxmscStep1',row) - // } } else { - if(prcType === 'buss1'){ - //企标入库 - this.toProcessDetail('bussLibrary1',row) - }else if(prcType === 'buss2'){ - //企标入库 - this.toProcessDetail('bussLibraryProduct1',row) - }else if(prcType === 'buss3'){ - //企标复审 - this.toProcessDetail('qbfsStep1',row) - }else { - this.$message.warning('当前流程未全部办理完成，无法查看') - } + this.$message.warning('当前流程未全部办理完成，无法查看') } }, toProcessDetail(componentName,row,unShowReceipt) { From d9fcce067ed019c8ad57a1e9e7c0a936b1ef0e57 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 17:54:08 +0800 Subject: [PATCH 3/6] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=205649?= =?UTF-8?q?5=20=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=EF=BC=9A=E9=87=8D=E7=82=B9=E8=AE=A4=E8=AF=81=E6=A0=87=E5=87=86?= =?UTF-8?q?/=E6=94=BF=E7=AD=96=E5=90=88=E8=A7=84=E6=80=A7=E9=A1=B9?= =?UTF-8?q?=E7=9B=AE=E5=AE=A1=E6=9F=A5=E6=B5=81=E7=A8=8B-=E6=9F=A5?= =?UTF-8?q?=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE=E6=8C=89=E9=92=AE?= =?UTF-8?q?=E6=97=A0=E6=B3=95=E7=82=B9=E5=BC=80?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue index fccf447a6..bcf7469dc 100644 --- a/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/zdrzbzORzchgxxmsc/step1.vue @@ -486,8 +486,8 @@ export default { bpnId: this.$route.query.bpnId }).then(res => { let mes = JSON.parse(res.mes) - this.listForm = JSON.parse(JSON.stringify(mes.form)) - this.dataList = this.listForm.dataList ? this.listForm.dataList : [] + this.form = JSON.parse(JSON.stringify(mes.form)) + this.infoTableDatas = mes.infoTableDatas ? mes.infoTableDatas : [] this.roleForm = mes.roleForm this.commentText = mes.commentText }) @@ -738,9 +738,11 @@ export default { createUserName: this.$store.getters.userInfo.userName, type: 'laws3', json: JSON.stringify({ - form: this.infoForm, + form: this.form, roleForm: this.roleForm, - commentText: this.commentText + commentText: this.commentText, + infoTableDatas: infoTableDatas, + }) }, { _this: this From 5e150069d1f206b09a1d6f10bd055f78e3ef419f Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 13 Jul 2022 00:09:16 +0800 Subject: [PATCH 4/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/standQA/index.vue | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 9cbcb0e2a..971eb8b2c 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -671,6 +671,9 @@ export default { case '查看': this.handleDetail(command[0]) break + case '订阅': + this.subscribe(command[0]) + break } }, handleDetail(row){ @@ -686,6 +689,16 @@ export default { }, e => { }) }, + subscribe(row){ + this.$http.postData('lawss/Subscription/insertSubscription',{ + askId: row.id, + usId: this.$store.getters.userInfo.userId, + },{ + _this: this + }, res => { + console.log(res); + }) + } refreshStandMap(){ this.standMap = new Map() this.standList.forEach(item=>{ From 0bb2cf25c293eeb52db241767361c35f151c1588 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 13 Jul 2022 09:18:02 +0800 Subject: [PATCH 5/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=20=E9=97=AE=E9=A2=98?= =?UTF-8?q?=E5=BA=93?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/standQA/index.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 971eb8b2c..9d17ccf0f 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -698,7 +698,7 @@ export default { }, res => { console.log(res); }) - } + }, refreshStandMap(){ this.standMap = new Map() this.standList.forEach(item=>{ From b827ea1617792486a64ad79638621b98177cd10f Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 13 Jul 2022 09:26:51 +0800 Subject: [PATCH 6/6] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=B5=84=E6=96=99?= =?UTF-8?q?=E4=B8=AD=E5=BF=83?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/dataCenter/index.vue | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index cc758b084..f38187e46 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -81,9 +81,9 @@ @@ -666,8 +666,13 @@ export default { }, searchInfo() { this.loading = true - this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] - this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] + if(this.dataCenterSearch.dataUploadTime && this.dataCenterSearch.dataUploadTime.length !== 0){ + this.dataCenterSearch.startDataUploadTime = this.dataCenterSearch.dataUploadTime[0] + this.dataCenterSearch.endDataUploadTime = this.dataCenterSearch.dataUploadTime[1] + }else{ + this.dataCenterSearch.startDataUploadTime ='' + this.dataCenterSearch.endDataUploadTime = '' + } this.$http.get('fileMaterialCenter/file-material', this.dataCenterSearch, { _this: this }, res => {