From f838632c14452adc32ea18a0a8d16016a25e8bbf Mon Sep 17 00:00:00 2001 From: luojie <125330818@qq.com> Date: Thu, 26 Mar 2026 14:37:18 +0800 Subject: [PATCH 01/12] =?UTF-8?q?feat:[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86][update]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/components/Template/HandleFormItem.vue | 2 +- .../Template/StepComponents/pcr/hsypfz.vue | 75 ++++++++++++++-------- src/components/Template/mixins/stepMixins.js | 26 ++++++++ 3 files changed, 75 insertions(+), 28 deletions(-) diff --git a/src/components/Template/HandleFormItem.vue b/src/components/Template/HandleFormItem.vue index 115c85a..83c8450 100644 --- a/src/components/Template/HandleFormItem.vue +++ b/src/components/Template/HandleFormItem.vue @@ -1202,7 +1202,7 @@ console.log("fillll") if (!isOldValueEmpty && !(isSame) && (this.templateFillType === "actFill" || this.templateFillType === "blxjsh")&&this.type !== "attachment") { console.log("需要电子签名") // 通过EventBus触发电子签名弹窗 - // EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); + EventBus.$emit('showEditSignDialog', { uuid: this.uuid }); } else {//如果是第一次填写，不需要密码验证 this.handleUpdateRecord() } diff --git a/src/components/Template/StepComponents/pcr/hsypfz.vue b/src/components/Template/StepComponents/pcr/hsypfz.vue index 69f5b7c..7f7d562 100644 --- a/src/components/Template/StepComponents/pcr/hsypfz.vue +++ b/src/components/Template/StepComponents/pcr/hsypfz.vue @@ -1,6 +1,7 @@ From 905c99eb89cc11843e5fc5c6f9d4df68653d4f23 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 11:44:09 +0800 Subject: [PATCH 07/12] =?UTF-8?q?fic:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/zh/business/study/studyFormFill.js | 2 +- src/lang/zh/business/study/studyFormPre.js | 2 +- src/views/business/comps/template/comps/bl/BL002.vue | 4 ++-- src/views/business/form/drug/comp/ytbdList.vue | 6 ++++-- src/views/business/form/nonTrial/comp/ytbdList.vue | 4 +++- src/views/business/study/comp/tbbd/Blxjsh.vue | 2 +- 6 files changed, 12 insertions(+), 8 deletions(-) diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 61d1744..e340efe 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -66,7 +66,7 @@ export default { fhtg: '复核通过', tongguo: '通过', txbtjjl: '填写并提交记录', - zztjyzbd: '制作提交预制表单', + zztjyzbd: '制作并提交预制表单', mfhtg: '免复核通过', lianghao: '良好', zhong: '中', diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js index 207d91a..41b353f 100644 --- a/src/lang/zh/business/study/studyFormPre.js +++ b/src/lang/zh/business/study/studyFormPre.js @@ -36,7 +36,7 @@ export default { fzyybd: '复制已有表单', yes: '是', no: '否', - zztjyzbd: '制作提交预制表单', + zztjyzbd: '制作并提交预制表单', sqgb: '申请关闭', qrgb: '确认关闭', gbtgjj:'关闭通过/拒绝', diff --git a/src/views/business/comps/template/comps/bl/BL002.vue b/src/views/business/comps/template/comps/bl/BL002.vue index 930d04e..118a9a4 100644 --- a/src/views/business/comps/template/comps/bl/BL002.vue +++ b/src/views/business/comps/template/comps/bl/BL002.vue @@ -130,7 +130,7 @@ export default { ztblxjRemark: { label: '', type: 'textarea', - fillType: 'actFill', + fillType: 'blxjsh', span: 1, placeholder: 'template.bl.bl002.ztblxjbz', maxlength: 1000, @@ -204,7 +204,7 @@ export default { prop: "ztblxjqrxx", isNeedCheck: true, bodyType: 'checkbox', - bodyFillType: 'actFill', + bodyFillType: 'blxjsh', checkboxLabel: 'template.bl.bl002.txwzqx' }, ] diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue index d6e4d29..4668f52 100644 --- a/src/views/business/form/drug/comp/ytbdList.vue +++ b/src/views/business/form/drug/comp/ytbdList.vue @@ -51,15 +51,17 @@ diff --git a/src/views/business/form/nonTrial/comp/ytbdList.vue b/src/views/business/form/nonTrial/comp/ytbdList.vue index 1f838fc..4120d80 100644 --- a/src/views/business/form/nonTrial/comp/ytbdList.vue +++ b/src/views/business/form/nonTrial/comp/ytbdList.vue @@ -56,9 +56,11 @@ $t('page.business.form.statusYtj') }} {{ $t('page.business.form.statusYtg') }} + {{ + $t('page.business.form.statusWtg') }} {{ $t('page.business.form.statusDgb') }} - {{ + {{ $t('page.business.form.statusYgb') }} diff --git a/src/views/business/study/comp/tbbd/Blxjsh.vue b/src/views/business/study/comp/tbbd/Blxjsh.vue index 32f9f42..0b43306 100644 --- a/src/views/business/study/comp/tbbd/Blxjsh.vue +++ b/src/views/business/study/comp/tbbd/Blxjsh.vue @@ -19,7 +19,7 @@
+ :sn="form.templateSn" :templateData="form" fillType="blxjsh" />
{{ $t('page.business.study.studyFormFill.qmxx') }}
From b1963a95bbb483b9e8dab87aa8c639159c451bc6 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 11:59:57 +0800 Subject: [PATCH 08/12] =?UTF-8?q?fix:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/assets/styles/index.scss | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss index 40f35e0..ee30bab 100644 --- a/src/assets/styles/index.scss +++ b/src/assets/styles/index.scss @@ -212,7 +212,10 @@ aside { background: #409EFF; } &.ytj { - background: #F78B07; + background: #2AC663; + } + &.wtg { + background: #f73f07; } &.ytg { background: #2AC663; From bd9b7f6461f9ea699d3fc6cce14b03b31ea6e827 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 12:09:10 +0800 Subject: [PATCH 09/12] =?UTF-8?q?fix:[=E9=9D=9E=E5=AE=9E=E9=AA=8C=E8=A1=A8?= =?UTF-8?q?=E5=8D=95]=E5=BA=9F=E6=AD=A2?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/drug/comp/sqbdList.vue | 2 +- src/views/business/form/drug/comp/tbbdList.vue | 2 +- src/views/business/form/nonTrial/comp/tbbdList.vue | 2 +- src/views/business/study/comp/tbbdList.vue | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 9ad7354..f7946f9 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -174,7 +174,7 @@ $t('page.business.study.studyFormApply.sh') }} {{ + >{{ $t('page.business.study.studyFormApply.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} {{ + >{{ $t('page.business.study.studyFormFill.fz') }} Date: Fri, 27 Mar 2026 12:15:30 +0800 Subject: [PATCH 10/12] =?UTF-8?q?fix:[=E8=A1=A8=E5=8D=95=E7=AE=A1=E7=90=86?= =?UTF-8?q?]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/drug/comp/sqbdList.vue | 42 ++++++++------------------ src/views/business/form/drug/comp/tbbdList.vue | 2 +- 2 files changed, 13 insertions(+), 31 deletions(-) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index f7946f9..380e17f 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -2,48 +2,37 @@
- - - + - - - - + - - + - - - - + - - + - - + @@ -51,17 +40,14 @@ - - + - - - - + + @@ -74,21 +60,17 @@ - - + {{ $t('form.search') }} + {{ $t('form.reset') }}
- + {{ $t('page.business.study.studyFormApply.xzbd') }} - - {{ $t('form.search') }} - {{ $t('form.reset') }} -
- + Date: Fri, 27 Mar 2026 12:35:31 +0800 Subject: [PATCH 11/12] =?UTF-8?q?fix:[=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95?= =?UTF-8?q?]bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/ytbd/Xq.vue | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/src/views/business/study/comp/ytbd/Xq.vue b/src/views/business/study/comp/ytbd/Xq.vue index f6cf103..196b9fb 100644 --- a/src/views/business/study/comp/ytbd/Xq.vue +++ b/src/views/business/study/comp/ytbd/Xq.vue @@ -192,6 +192,25 @@ export default { this.openApprove = true } }, + toRead(data) { + this.$alert(data.ffmc, '', { + confirmButtonText: this.$t('page.business.study.studyMethod.qyd'), + callback: action => { + if (this.$route.path === data.toUrl) { + this.$emit('changeTab', { key: 'syff' }) + } else { + let index = _.findIndex(this.$store.state.tagsView.visitedViews, (tab) => { + return tab.path === data.toUrl + }) + if (index > -1) { + this.$tab.refreshPage(this.$store.state.tagsView.visitedViews[index]); + } else { + this.$tab.openPage("loading", data.toUrl) + } + } + } + }); + }, getIsMatchSubject() { studySubject_isMatchSubject({ studySubjectId: this.form.studySubjectId }).then(response => { this.isMatchSubject = response.data From 1e84def9dfb6eef0dea85050fd119713061f6ec3 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Fri, 27 Mar 2026 12:44:50 +0800 Subject: [PATCH 12/12] =?UTF-8?q?fix:[=E7=94=B3=E8=AF=B7=E8=A1=A8=E5=8D=95?= =?UTF-8?q?]=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/drug/comp/sqbdList.vue | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/views/business/form/drug/comp/sqbdList.vue b/src/views/business/form/drug/comp/sqbdList.vue index 380e17f..39e6dbf 100644 --- a/src/views/business/form/drug/comp/sqbdList.vue +++ b/src/views/business/form/drug/comp/sqbdList.vue @@ -174,13 +174,13 @@ - + - + - + - +