From bf765ccba4a0438e6555a0362dcf73fd0fb07155 Mon Sep 17 00:00:00 2001 From: SUNJIABIN Date: Wed, 12 Apr 2023 10:28:29 +0800 Subject: [PATCH 1/4] =?UTF-8?q?=E8=A7=A3=E5=86=B3=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E7=B1=BB=E5=88=AB=E5=92=8C=E4=BC=81=E6=A0=87?= =?UTF-8?q?=E5=8F=B7=E4=B9=8B=E9=97=B4=E7=A9=BA=E6=A0=BC=E9=97=AE=E9=A2=98?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../components/EnterpriseStandardDatabase.vue | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue index 4994efac5..336365e53 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardDatabase/components/EnterpriseStandardDatabase.vue @@ -4139,11 +4139,11 @@ export default { //此处因企标编号中带有空格所以此处不再补充添加空格,如果企标编码中没有空格则补充空格 但是产品标准除外 var judgeFn = new RegExp(/\s+/g); if(judgeFn.test(nowstandinfo.standSort)){ - nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) }else if(nowstandinfo.standSort === 'Q/QCBFC'){ - nowstandinfo.standCode = nowstandinfo.standSort + "" + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) }else { - nowstandinfo.standCode = nowstandinfo.standSort + " " + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) + nowstandinfo.standCode = nowstandinfo.standSort + nowstandinfo.standNumber + (nowstandinfo.standYear === '' ? '' : '-' + nowstandinfo.standYear) } // if (nowstandinfo.standSort === 'Q/QCBFC'){ From 2bbe99ae86adcef9eecbcd4eab542a3399a35215 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 12 Apr 2023 10:30:08 +0800 Subject: [PATCH 2/4] =?UTF-8?q?=E5=B7=A5=E4=BD=9C=E7=BB=84=E7=BB=84?= =?UTF-8?q?=E9=95=BF=E6=94=B9=E4=B8=BA=E6=8A=80=E6=9C=AF=E5=A7=94=E5=91=98?= =?UTF-8?q?=E4=BC=9A=E8=AF=84=E5=AE=A1=E8=B4=9F=E8=B4=A3=E4=BA=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../enterpriseStandardPlan/index.vue | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue index 4239a2d88..609a6ba01 100644 --- a/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue +++ b/src/pages/regulatoryRepository/enterpriseStandardPlan/index.vue @@ -151,7 +151,7 @@ prop="wgLeaderName" width="120" align="center" - label="工作组组长"> + label="技术委员会评审负责人"> - + + - + @@ -489,10 +494,10 @@ @checkedRole="checkedRole" :nodeList="nodeList" > - + From 18cbebf949349b5f9d55e09400af780e53cadfc8 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 12 Apr 2023 10:36:42 +0800 Subject: [PATCH 3/4] =?UTF-8?q?=E6=8F=90=E4=BA=A4=E5=9B=9E=E7=AD=94?= =?UTF-8?q?=E4=BF=AE=E6=94=B9=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../my-questions/components/answerItem.vue | 26 ++++++++++++++----- 1 file changed, 20 insertions(+), 6 deletions(-) diff --git a/src/pages/personal/pages/my-questions/components/answerItem.vue b/src/pages/personal/pages/my-questions/components/answerItem.vue index c1254be4d..d00603046 100644 --- a/src/pages/personal/pages/my-questions/components/answerItem.vue +++ b/src/pages/personal/pages/my-questions/components/answerItem.vue @@ -144,12 +144,26 @@ export default { this.$http.postData('lawss/Reply/insertReply',{ ...this.form },{ _this: this }, res => { - this.$http.post("lawss/activiti/completeTask", { - json: JSON.stringify(this.form), - taskId: this.$route.query.taskIds, - userId: this.$store.getters.userInfo.userId - }, {}, res => { - }); + this.$http.get('lawss/activiti/questionsAndAnswers', { + askId: asdId, + answerer: this.$store.getters.userInfo.userId + }, { + _this: this, + }, res => { + if(res && res.data){ + const taskId = res.data.taskId + const json = res.data.mesg + this.$http.post("lawss/activiti/completeTask", { + // json: JSON.stringify(this.form), + // taskId: this.$route.query.taskIds, + json, + taskId, + userId: this.$store.getters.userInfo.userId + }, {}, res => { + }); + } + }, e => {}) + if(res.respCode === '200'){ this.form.reply = '' this.fileList = [] From bce8e2ae5cf596efec9ffbcba126d6e9720bce68 Mon Sep 17 00:00:00 2001 From: zyn Date: Wed, 12 Apr 2023 11:58:35 +0800 Subject: [PATCH 4/4] =?UTF-8?q?=E9=97=AE=E7=AD=94=E6=8F=90=E4=BA=A4?= =?UTF-8?q?=E5=90=8E=E5=9B=9E=E6=98=BE?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/pages/personal/pages/my-questions/index.vue | 9 +++++++++ src/pages/personal/pages/my-questions/index3.vue | 9 +++++++++ 2 files changed, 18 insertions(+) diff --git a/src/pages/personal/pages/my-questions/index.vue b/src/pages/personal/pages/my-questions/index.vue index 8596c8bb1..d29d3070a 100644 --- a/src/pages/personal/pages/my-questions/index.vue +++ b/src/pages/personal/pages/my-questions/index.vue @@ -1928,6 +1928,14 @@ export default { // }) // this.questionForm.fileInfo = list }, + submitGetData(){ + this.activeName = 'myQue' + this.handleClick() + this.activeType = this.standType + this.sourceClick(); + this.activestand = this.handleSelectTableList[0].id + this.standClick(); + }, //提交问题 queSubmit(){ if(this.standType === 'OTHER'){ @@ -1980,6 +1988,7 @@ export default { { _this: this }, res => { + this.submitGetData(); }, e => { }) }, e => { diff --git a/src/pages/personal/pages/my-questions/index3.vue b/src/pages/personal/pages/my-questions/index3.vue index 017d9ddb9..f747c56f0 100644 --- a/src/pages/personal/pages/my-questions/index3.vue +++ b/src/pages/personal/pages/my-questions/index3.vue @@ -1963,6 +1963,14 @@ export default { // }) // this.questionForm.fileInfo = list }, + submitGetData(){ + this.activeName = 'myQue' + this.handleClick() + this.activeType = this.standType + this.sourceClick(); + this.activestand = this.handleSelectTableList[0].id + this.standClick(); + }, //提交问题 queSubmit(){ if(this.standType === 'OTHER'){ @@ -2015,6 +2023,7 @@ export default { { _this: this }, res => { + this.submitGetData(); }, e => { }) }, e => {