From 98bf0809414b126468783d6e5989dd07955c4da0 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 15:20:05 +0800 Subject: [PATCH 01/21] feat: There is no way the,#56483 --- .../pages/creatProcess/bzzqyj/step1.vue | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue index 10e0cd0d2..0fec3f7ef 100644 --- a/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzzqyj/step1.vue @@ -382,7 +382,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' -import {saveTaskFirst, taskDel} from 'api/process' +import {saveTaskFirst, taskDel,queryTaskFirst} from 'api/process' export default { name: "bzzqyjStep1", @@ -498,6 +498,9 @@ export default { ProcessTitle }, mounted() { + if(this.$route.query.bpnId){ + this.getTaskId() + } this.$http.get('lawss/sarStandAttrDetails/getListData', '', { _this: this }, res => { @@ -516,6 +519,16 @@ export default { } }, methods: { + getTaskId() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.form = JSON.parse(JSON.stringify(mes.form)) + this.roleForm = mes.roleForm + this.commentText = mes.commentText + }) + }, filesUpload (file) { // 下载 const attId = file.attId if (attId) { From 44828087b0416e7362fbb7423851eb1394e3b547 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 15:44:42 +0800 Subject: [PATCH 02/21] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,56486?= =?UTF-8?q?=20=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=E6=A0=87=E5=87=86=E6=B8=85=E5=8D=95=E5=8F=91=E5=B8=83?= =?UTF-8?q?/=E6=9B=B4=E6=96=B0=E6=B5=81=E7=A8=8B=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/bzqdfb/step1.vue | 29 ++++++++++++++----- 1 file changed, 22 insertions(+), 7 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue index 9af114bd2..f5cd68038 100644 --- a/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzqdfb/step1.vue @@ -25,9 +25,9 @@ - 国家/地区清单 - 车型类别清单 - 其他清单 + 国家/地区清单 + 车型类别清单 + 其他清单 选择清单 @@ -78,8 +78,8 @@ - 是 - 否 + 是 + 否 @@ -707,7 +707,7 @@ import ProcessHeader from "../../components/ProcessHeader"; import ProcessFooter from "../../components/ProcessFooter"; import ProcessTitle from "../../components/ProcessTitle"; -import { saveTaskFirst, taskDel } from "api/process"; +import { saveTaskFirst, taskDel,queryTaskFirst } from "api/process"; import seeDatalis from "@/pages/localTool/standContrast/pages/seeDatalis"; export default { @@ -1503,10 +1503,25 @@ export default { this.pageSizeNo = this.$store.getters.userInfo.configContent; this.getStandData(); - } + }, + getTaskId() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.listForm = JSON.parse(JSON.stringify(mes.form)) + this.fileInfoList = this.listForm.fileName + this.dataList = this.listForm.dataList + this.roleForm = mes.roleForm + this.commentText = mes.commentText + }) + }, }, computed: {}, mounted() { + if(this.$route.query.bpnId){ + this.getTaskId() + } //从数据库中查询下拉框数据 this.$http.get("sys/dictype/getDicTypeListCode", {}, { _this: this From 2d77927018865954b06f772ec754dad5d4b45f7c Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 16:13:10 +0800 Subject: [PATCH 03/21] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#5?= =?UTF-8?q?6488=20=20=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0?= =?UTF-8?q?=E6=8D=AE=EF=BC=9A=E8=A7=A3=E8=AF=BB=E6=B5=81=E7=A8=8B=EF=BC=8C?= =?UTF-8?q?=E6=B5=81=E7=A8=8B=E8=BF=87=E7=A8=8B=E4=B8=AD=EF=BC=8C=E7=82=B9?= =?UTF-8?q?=E5=87=BB=E6=9F=A5=E7=9C=8B=E6=B5=81=E7=A8=8B=E6=95=B0=E6=8D=AE?= =?UTF-8?q?=20=E4=B8=8D=E6=98=BE=E7=A4=BA=E6=95=B0=E6=8D=AE=E4=BF=A1?= =?UTF-8?q?=E6=81=AF?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../pages/creatProcess/bzjd/step1.vue | 24 +++++++++++++++---- 1 file changed, 19 insertions(+), 5 deletions(-) diff --git a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue index 3588c3e3a..fc7cf7d6b 100644 --- a/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/bzjd/step1.vue @@ -78,8 +78,8 @@ - 隐藏基础信息 - 展开基础信息 + 隐藏基础信息 + 展开基础信息 @@ -127,7 +127,7 @@ show-overflow-tooltip align="center"> @@ -513,7 +513,7 @@ import ProcessHeader from '../../components/ProcessHeader' import ProcessFooter from '../../components/ProcessFooter' import ProcessTitle from '../../components/ProcessTitle' - import {saveTaskFirst, taskDel} from 'api/process' + import {saveTaskFirst, taskDel,queryTaskFirst} from 'api/process' export default { name: "bzjdStep1", @@ -1168,9 +1168,23 @@ export default { return this.$message.warning('请完善基础信息') } }) - } + }, + getTaskId() { + queryTaskFirst({ + bpnId: this.$route.query.bpnId + }).then(res => { + let mes = JSON.parse(res.mes) + this.form = JSON.parse(JSON.stringify(mes.form)) + this.itemList = mes.itemList + this.roleForm = mes.roleForm + this.commentText1 = mes.commentText1 + }) + }, }, mounted() { + if(this.$route.query.bpnId){ + this.getTaskId() + } window.addEventListener('resize', this.handleResize); this.$http.get('sys/dictype/getDicTypeListCode', '', { _this: this From 72569984d4f2afff48bae31aa6612ebbc4d75808 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Tue, 12 Jul 2022 17:22:05 +0800 Subject: [PATCH 04/21] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?493=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 05/21] =?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 06/21] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=2056?= =?UTF-8?q?495=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 07/21] =?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 08/21] =?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 09/21] =?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 => { From 2b2c6698d2100ee280c102d30f16fb5ff5da6eed Mon Sep 17 00:00:00 2001 From: yuezhihang Date: Wed, 13 Jul 2022 10:15:45 +0800 Subject: [PATCH 10/21] =?UTF-8?q?=E9=97=AE=E7=AD=94=E5=BA=93=20=E6=9F=A5?= =?UTF-8?q?=E8=AF=A2=E6=9D=A1=E4=BB=B6=E6=B8=85=E7=A9=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/regulatoryRepository/standQA/index.vue | 1 - 1 file changed, 1 deletion(-) diff --git a/src/pages/regulatoryRepository/standQA/index.vue b/src/pages/regulatoryRepository/standQA/index.vue index 9cbcb0e2a..f0edbbf3c 100644 --- a/src/pages/regulatoryRepository/standQA/index.vue +++ b/src/pages/regulatoryRepository/standQA/index.vue @@ -944,7 +944,6 @@ export default { //清空 delSearch(){ this.questionSerach = { - classification: 'INLAND', standardName: '', //标准名称 standardEncdoing: '', //标准编号 questioner: this.$store.getters.userInfo.userId, //提问人 From 56e86aacf72f41d891c9e5d36b677ab8a2905015 Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 13 Jul 2022 10:41:50 +0800 Subject: [PATCH 11/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056447=20=E8=B5=84?= =?UTF-8?q?=E6=96=99=E4=B8=AD=E5=BF=83-=E8=B5=84=E6=96=99=E8=AF=A6?= =?UTF-8?q?=E6=83=85=EF=BC=8CUI=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../dataCenter/dataCenterDetail.vue | 41 +++++++++++++------ .../regulatoryRepository/dataCenter/index.vue | 4 +- 2 files changed, 32 insertions(+), 13 deletions(-) diff --git a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue index 63f10cf27..9b194fdfa 100644 --- a/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue +++ b/src/pages/regulatoryRepository/dataCenter/dataCenterDetail.vue @@ -4,17 +4,18 @@
-
- {{ detailInfoForm.dataTitle + '-详情' }} -
+ + +
+ + {{detailInfoForm.dataTitle}} +

- - {{ detailInfoForm.dataType }} - + {{ detailInfoForm.dataType }}

@@ -204,8 +205,8 @@ export default { }, created() { - this.detailInfoId = this.$route.params.id - console.log('13', this.$route.params.id) + this.detailInfoId = this.$route.query.id + console.log('13', this.$route.query.id) }, mounted() { let fileId @@ -250,15 +251,14 @@ export default { .transition-box { padding: 0 10% 0 10%; background: #ffffff; - font-size: 28px; + font-size: 16px; .transition-box-p { line-height: 50px; - + border-bottom: 1px solid #E5E5E5; .transition-box-label { display: inline-block; - font-weight: bolder; - width: 200px; + width: 100px; vertical-align: top; } @@ -266,6 +266,8 @@ export default { display: inline-block; color: #7e8083; width: calc(~'100% - 100px'); + word-break: break-all; + white-space: pre-wrap; } .file-box { @@ -277,6 +279,7 @@ export default { width: 100%; cursor: pointer; color: #4498f0; + word-break: break-all; } p { @@ -309,4 +312,18 @@ export default { } } } + + +.details-header { + padding: 34px 20%; + font-size: 20px; + font-weight: bold; + color: #555555; + text-align: center; + word-break: break-all; + white-space: pre-wrap; + & > span { + width: 100%; + } +} diff --git a/src/pages/regulatoryRepository/dataCenter/index.vue b/src/pages/regulatoryRepository/dataCenter/index.vue index f38187e46..2ef442319 100644 --- a/src/pages/regulatoryRepository/dataCenter/index.vue +++ b/src/pages/regulatoryRepository/dataCenter/index.vue @@ -134,12 +134,14 @@ prop="dataType" width="250" label="类型" + :show-overflow-tooltip="true" align="center"> @@ -190,6 +191,7 @@ :config="{attrName: '采用标准'}" :labelWidth="'180px'" v-model="qbfsForm.esStandRelations" + :disabled="disabledXX" > From 30468e619931ebfd696fcadb287ec2d2569c213b Mon Sep 17 00:00:00 2001 From: hanshaozhuang Date: Wed, 13 Jul 2022 16:19:20 +0800 Subject: [PATCH 19/21] =?UTF-8?q?=E4=BF=AE=E6=94=B9bug=2056147=20=E9=97=AE?= =?UTF-8?q?=E7=AD=94=E6=A8=A1=E5=9D=97=E4=B8=AD=E7=9A=84=E7=9B=B8=E4=BC=BC?= =?UTF-8?q?=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/questionDetail.vue | 76 +++++++++++++++++++ .../personal/pages/my-questions/index.vue | 24 +++--- src/router/index.js | 10 +++ 3 files changed, 101 insertions(+), 9 deletions(-) create mode 100644 src/pages/personal/pages/my-questions/components/questionDetail.vue diff --git a/src/pages/personal/pages/my-questions/components/questionDetail.vue b/src/pages/personal/pages/my-questions/components/questionDetail.vue new file mode 100644 index 000000000..973f33b00 --- /dev/null +++ b/src/pages/personal/pages/my-questions/components/questionDetail.vue @@ -0,0 +1,76 @@ + + + + + + diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index e24339956..b842f62d6 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1399,16 +1399,22 @@ export default { //点击跳转问题详情 historyJump(item){ this.$router.push({ - path: '/standQA', - query:{ - standId: item.standardId, - queId: item.id, - standType: item.classification, - sourceType: 'dialog', - standName: item.standardName, + path: "/questionDetail", + query: { + id: item.id } - }) - this.dialogVisible = false + }); + // this.$router.push({ + // path: '/standQA', + // query:{ + // standId: item.standardId, + // queId: item.id, + // standType: item.classification, + // sourceType: 'dialog', + // standName: item.standardName, + // } + // }) + // this.dialogVisible = false }, // 点击查看 handlePreview(item) { diff --git a/src/router/index.js b/src/router/index.js index aa922feaf..3d9ee3cac 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -323,6 +323,16 @@ const routes = [ menuId: '' } }, + { + path: '/questionDetail', + name: 'QuestionDetail', + component: resolve => require(['@/pages/personal/pages/my-questions/components/questionDetail.vue'], resolve), + meta: { + requireAuth: true, + title: '问题详情', + menuId: '' + } + } // { // path: '/questionsAndAnswers', // name: 'QuestionsAndAnswers', From b0685d898bb28963663e3bc2e25e2b3d961c6e69 Mon Sep 17 00:00:00 2001 From: "396572590@qq.com" Date: Wed, 13 Jul 2022 16:38:23 +0800 Subject: [PATCH 20/21] =?UTF-8?q?feat:=20There=20is=20no=20way=20the,=20#5?= =?UTF-8?q?6535=20=20=E6=8A=80=E6=9C=AF=E6=A0=87=E5=87=86-=E5=BD=93?= =?UTF-8?q?=E7=B1=BB=E5=9E=8B=E4=B8=BA=E5=88=B6=E5=AE=9A=E6=97=B6=EF=BC=8C?= =?UTF-8?q?=E4=BB=A3=E6=9B=BF=E4=BC=81=E6=A0=87=E7=BC=96=E5=8F=B7=E4=B8=BA?= =?UTF-8?q?=E9=9D=9E=E5=BF=85=E5=A1=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/processCenter/pages/creatProcess/qbrk/step1.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue index 95deef6a6..bea9a9221 100644 --- a/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue +++ b/src/pages/processCenter/pages/creatProcess/qbrk/step1.vue @@ -337,7 +337,10 @@

- + Date: Wed, 13 Jul 2022 17:12:09 +0800 Subject: [PATCH 21/21] feat: There is no way the,56555 56538 --- public/static/pdf/web/viewer.css | 2 +- public/static/pdf/web/viewer.html | 2 +- src/pages/phone/domesticStand.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/public/static/pdf/web/viewer.css b/public/static/pdf/web/viewer.css index accde2053..051eb68d9 100644 --- a/public/static/pdf/web/viewer.css +++ b/public/static/pdf/web/viewer.css @@ -462,7 +462,7 @@ html[dir='rtl'] #outerContainer.sidebarOpen > #sidebarContainer { html[dir='ltr'] #outerContainer.sidebarOpen > #mainContainer { -webkit-transition-property: left; transition-property: left; - left: 200px; + /*left: 200px;*/ } html[dir='rtl'] #outerContainer.sidebarOpen > #mainContainer { -webkit-transition-property: right; diff --git a/public/static/pdf/web/viewer.html b/public/static/pdf/web/viewer.html index e9673f3e2..fd3522605 100644 --- a/public/static/pdf/web/viewer.html +++ b/public/static/pdf/web/viewer.html @@ -232,7 +232,7 @@ See https://github.com/adobe-type-tools/cmap-resources
-
+