From 3524e7730c0975d6c4218b5b536c93e6e043f683 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 19 Mar 2024 12:14:53 +0800 Subject: [PATCH 1/3] =?UTF-8?q?=E4=B8=AD=E5=BF=83=E8=B0=83=E7=A0=94?= =?UTF-8?q?=E5=AE=A1=E6=A0=B8=E6=8F=90=E7=A4=BA=E4=BF=A1=E6=81=AF=E4=BF=AE?= =?UTF-8?q?=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/research/form.vue | 18 +++++++++++------- src/views/reviewers/components/Employment.vue | 7 +++---- 2 files changed, 14 insertions(+), 11 deletions(-) diff --git a/src/views/research/form.vue b/src/views/research/form.vue index 26e4199e..daa58125 100644 --- a/src/views/research/form.vue +++ b/src/views/research/form.vue @@ -14,7 +14,7 @@ v-if="(state === 0 && userTypeEnumInt === 0)" type="primary" size="small" - @click="handleSubmit" + @click="handleSubmit('submit')" > {{ $t('trials:researchForm:button:submit') }} @@ -23,7 +23,7 @@ v-if="(state === 1 && hasPermi(['role:spm','role:cpm']))" type="primary" size="small" - @click="handleSubmit" + @click="handleSubmit('approve')" > {{ $t('trials:researchForm:button:auditPasses') }} @@ -243,17 +243,17 @@ export default { }).catch(() => { this.loading = false }) }, // 提交 - handleSubmit() { + handleSubmit(type) { if (this.userTypeEnumInt === 0) { this.loading = true this.$refs['baseResearchInfo'].handleSave(true).then(res => { this.loading = false if (res) { - this.submit() + this.submit(type) } }).catch(() => { this.loading = false }) } else { - this.submit() + this.submit(type) } }, submit() { @@ -275,7 +275,11 @@ export default { this.$emit('refreshPage') } // this.$message.success(this.$t('common:message:savedSuccessfully')) - this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully')) + if(type === 'approve'){ + this.$message.success(this.$t('common:message:approvedSuccessfully')) + }else{ + this.$message.success(this.$t('trials:researchForm:message:savedSuccessfully')) + } } }).catch(() => { this.loading = false }) }).catch(() => {}) @@ -308,7 +312,7 @@ export default { if (res.IsSuccess) { this.initPage() this.$emit('refreshPage') - this.$message.success(this.$t('common:message:savedSuccessfully')) + this.$message.success(this.$t('common:message:approvedSuccessfully')) } }).catch(() => { this.loading = false diff --git a/src/views/reviewers/components/Employment.vue b/src/views/reviewers/components/Employment.vue index 0ad731c8..24bbeea7 100644 --- a/src/views/reviewers/components/Employment.vue +++ b/src/views/reviewers/components/Employment.vue @@ -45,7 +45,6 @@ v-model="UniversityAffiliated" type="textarea" autosize - disabled size="small" /> @@ -54,21 +53,21 @@ - + - + - + From d5594e87b2c328bd5cf90a9f31ce402b76cb0e35 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Tue, 19 Mar 2024 17:45:32 +0800 Subject: [PATCH 2/3] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=8D=B3=E9=A6=96=E6=AC=A1=E8=87=AA=E8=BA=AB/?= =?UTF-8?q?=E7=BB=84=E9=97=B4=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=97=B6=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consistency-analysis/components/ReaderRulesForm.vue | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue index 4c429e70..951adaa8 100644 --- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue +++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue @@ -29,7 +29,7 @@ - + @@ -125,6 +125,7 @@ export default { IsEnable: true, Note: '' }, + Result:{}, // 接口返回弹窗数据，用于虚拟中心可编辑校验 rules: { IsHaveReadingPeriod: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }], IsGenerateGlobalTask: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: 'blur' }], @@ -153,7 +154,8 @@ export default { TrialReadingCriterionId: this.TrialReadingCriterionId }).then(res => { if (res.Result) { - this.form = res.Result + this.form = res.Result; + this.Result = JSON.parse(JSON.stringify(res.Result)); } else { let o = this.trialCriterionList.find(v => { return v.TrialReadingCriterionId === this.TrialReadingCriterionId From ee049b4017da4966f1fc6cd0ac40d1fbf778aeb5 Mon Sep 17 00:00:00 2001 From: wangxiaoshuang <825034831@qq.com> Date: Wed, 20 Mar 2024 09:21:11 +0800 Subject: [PATCH 3/3] =?UTF-8?q?=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86?= =?UTF-8?q?=E6=9E=90=E5=8D=B3=E9=A6=96=E6=AC=A1=E8=87=AA=E8=BA=AB/?= =?UTF-8?q?=E7=BB=84=E9=97=B4=E4=B8=80=E8=87=B4=E6=80=A7=E5=88=86=E6=9E=90?= =?UTF-8?q?=E6=97=B6=E8=99=9A=E6=8B=9F=E4=B8=AD=E5=BF=83=E7=BC=96=E5=8F=B7?= =?UTF-8?q?=E5=8F=AF=E7=BC=96=E8=BE=91?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../consistency-analysis/components/ReaderRulesForm.vue | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue index 951adaa8..013d54ef 100644 --- a/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue +++ b/src/views/trials/trials-panel/reading/consistency-analysis/components/ReaderRulesForm.vue @@ -29,7 +29,7 @@ - + @@ -146,6 +146,13 @@ export default { // } this.getFrom() }, + watch:{ + "OtherInfo.VitrualSiteCode":{ + handler(){ + this.form.BlindTrialSiteCode = this.OtherInfo.VitrualSiteCode; + } + } + }, methods: { getFrom() { getConsistentRule({