From 3f220b2dfed0a435c0593443af47f85fa2807922 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?ZHANGTENG=5C=E5=BC=A0=E8=85=BE?= <894697943@qq.com> Date: Mon, 9 Mar 2026 10:32:12 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=C2=B7=E7=AE=A1?= =?UTF-8?q?=E7=90=86]xb001=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../business/comps/template/comps/xb/XB001.vue | 24 ++++++++++++++++++++-- 1 file changed, 22 insertions(+), 2 deletions(-) diff --git a/src/views/business/comps/template/comps/xb/XB001.vue b/src/views/business/comps/template/comps/xb/XB001.vue index 36d9aec..e609180 100644 --- a/src/views/business/comps/template/comps/xb/XB001.vue +++ b/src/views/business/comps/template/comps/xb/XB001.vue @@ -49,6 +49,7 @@ { + if(item.startTime && item.endTime){ + const m1 = moment(item.startTime); + const m2 = moment(item.endTime); + const diffMinutes = m2.diff(m1, 'minutes'); + this.$refs.tableSecondRef?.updateDataSourceByRowIndex(index, { fysc: diffMinutes }); + } + }) + console.log(this.getFilledFormData()) + }, } }; From 9c7de1c706683a8cbad192cf1a960501f2efc279 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Mar 2026 10:52:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]G?= =?UTF-8?q?SP005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/gsp/GSP005.vue | 5 +++++ src/views/business/study/comp/tbbd/Bj.vue | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue index 4e1d604..f7fdcff 100644 --- a/src/views/business/comps/template/comps/gsp/GSP005.vue +++ b/src/views/business/comps/template/comps/gsp/GSP005.vue @@ -42,6 +42,7 @@ :ref="`formZlConfigFormPackageRef_${zlIndex}`" :formConfig="formZlConfig" @beforeReagentSubmit="(data) => onTableBeforeReagentZlSubmit(data, zlIndex, formZlConfig)" @onRegentSubmit="(data) => onTableRegentZlSubmit(zlIndex, data)" + @clickButton="(data) => onClickButtonZl(zlIndex, data)" :formData="formzlConfig" /> - +
{{ $t('page.business.study.studyFormFill.cc') }} From 56987db96bb78891116b5ed64a64351adeef11f7 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Mar 2026 10:54:12 +0800 Subject: [PATCH 3/4] =?UTF-8?q?FIX:[=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86]G?= =?UTF-8?q?SP005?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/comps/template/comps/gsp/GSP005.vue | 1 + 1 file changed, 1 insertion(+) diff --git a/src/views/business/comps/template/comps/gsp/GSP005.vue b/src/views/business/comps/template/comps/gsp/GSP005.vue index f7fdcff..8316e62 100644 --- a/src/views/business/comps/template/comps/gsp/GSP005.vue +++ b/src/views/business/comps/template/comps/gsp/GSP005.vue @@ -347,6 +347,7 @@ export default { thirdFillType: "preFill", fillType: "actFill", subFillType: "actFill", + subDisabled: true, fourthType: "button", fourthKey: "sywzsjclzButtonValue", fourthFillType: "actFill", From 5ea7f95a0d7627443b9b7634f6a4e44b5eae414e Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 9 Mar 2026 12:20:27 +0800 Subject: [PATCH 4/4] =?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/study/comp/jhbd/Bj.vue | 2 +- src/views/business/study/comp/sqbd/Bj.vue | 2 +- src/views/business/study/comp/tbbd/Bj.vue | 2 +- src/views/business/study/comp/ytbd/Bj.vue | 2 +- src/views/business/study/comp/ytbdList.vue | 1 + 5 files changed, 5 insertions(+), 4 deletions(-) diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index a5b29b4..b832387 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -276,7 +276,7 @@ export default { edit(row) { this.reset() this.studyType = row.studyType || null - this.studyFormType = row.studyFormType || null + this.studyFormType = row.studyFormType || 10 this.form.qmyy = this.$t('page.business.study.studyFormPlan.cjjl') if (row && row.id) { this.showIndex = 2 diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 9067c5f..a8c9d2e 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -279,7 +279,7 @@ export default { edit(row) { this.reset() this.studyType = row.studyType || null - this.studyFormType = row.studyFormType || null + this.studyFormType = row.studyFormType || 15 if (row && row.id) { this.showIndex = 2 this.$modal.loading() diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index c976676..d21e302 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -582,7 +582,7 @@ export default { try { params = JSON.parse(caesarDecipher(this.$route.params.key)) this.studyType = params.studyType || null - this.studyFormType = params.studyFormType || null + this.studyFormType = params.studyFormType || 5 this.selectedDeptId = params.selectedDeptId || null } catch (e) { console.log('参数错误') diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 6b389a4..b0e5bf6 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -280,7 +280,7 @@ export default { this.reset() this.permitForSecectUser = row.permitForSecectUser this.studyType = row.studyType || null - this.studyFormType = row.studyFormType || null + this.studyFormType = row.studyFormType || 1 this.selectedDeptId = row.selectedDeptId || null if (row && row.id) { this.showIndex = 2 diff --git a/src/views/business/study/comp/ytbdList.vue b/src/views/business/study/comp/ytbdList.vue index 8ad4915..7dd0421 100644 --- a/src/views/business/study/comp/ytbdList.vue +++ b/src/views/business/study/comp/ytbdList.vue @@ -452,6 +452,7 @@ export default { studyId: this.searchForm.studyId, selectedDeptId: this.selectedDeptId, studyType: 1, + studyFormType: 1, studySubjectId: this.searchForm.studySubjectId, permitForSecectUser: 'business:studyFormPre:sh' })