From 5ad5bb941829174cb892a2f5ed4a3c312b1d3dc9 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 11:35:25 +0800 Subject: [PATCH 1/4] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=A1=AB=E6=8A=A5=E8=A1=A8=E5=8D=95=E5=AF=BC?= =?UTF-8?q?=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/tbbd/Xq.vue | 29 +++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index ff8989f..a877a3d 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -14,9 +14,18 @@ $t('page.business.study.studyFormFill.tb') }} - 后台导出 - - {{ $t('page.business.study.studyFormFill.dcqbjcgj') }} + + {{ $t('page.business.study.studyFormFill.dcqbjcgj') }} + + {{ $t('page.business.study.studyFormFill.dclcjcgj') }} + + {{ $t('page.business.study.studyFormFill.dcbjjcgj') }} + + {{ $t('page.business.study.studyFormFill.dcxgjcgj') }} + + {{ $t('page.business.study.studyFormFill.dcbhsjgj') }} + +
-
- +
+
@@ -172,7 +181,7 @@ export default { pageNum: 1, formId: null, pageSize: 9999, - lang:this.$store.getters.language.split("_")[0] + lang: this.$store.getters.language.split("_")[0] } } }, @@ -184,9 +193,9 @@ export default { created() { }, methods: { - exportExcel() { + exportExcel(jcgjlx) { this.$modal.loading() - studyFormFill_exportDetail(this.queryParamsJcgj).then(response => { + studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx })).then(response => { window.open(this.baseUrl + response.msg) this.$modal.closeLoading() }).finally(() => { From cd51bdf6db1f81929fefa5a251362aeccf359ed5 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 12:53:33 +0800 Subject: [PATCH 2/4] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=A1=AB=E6=8A=A5?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/tbbd/Xq.vue | 9 ++++----- src/views/business/study/comp/ytbd/Bj.vue | 2 +- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index a877a3d..5745821 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -39,8 +39,8 @@ -->
- +
@@ -73,7 +73,7 @@ @pagination="getJjcgjList" /> -->
- +
@@ -181,7 +181,6 @@ export default { pageNum: 1, formId: null, pageSize: 9999, - lang: this.$store.getters.language.split("_")[0] } } }, @@ -195,7 +194,7 @@ export default { methods: { exportExcel(jcgjlx) { this.$modal.loading() - studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx })).then(response => { + studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx ,lang: this.$store.getters.language.split("_")[0]})).then(response => { window.open(this.baseUrl + response.msg) this.$modal.closeLoading() }).finally(() => { diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 3f8bf4b..20fb0cb 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -198,7 +198,7 @@ export default { console.log("data:" + JSON.stringify(data)) console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) if (data.type == 'fieldChanged') { - studyFormFill_updateBdnr( + studyFormPre_updateBdnr( { id: this.form.id, bdnr: JSON.stringify(this.$refs.templateTable.getFilledFormData()), From 390095c0c256066deeed742a5ffd7a0cec29b4dc Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 19 Jan 2026 14:10:29 +0800 Subject: [PATCH 3/4] =?UTF-8?q?fix=EF=BC=9A[=E8=AF=95=E9=AA=8C=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E9=A2=84=E5=A1=AB=E8=A1=A8=E5=8D=95]=E5=A4=8D?= =?UTF-8?q?=E5=88=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/public/public.js | 17 ----------------- src/api/business/study/studyFormPre.js | 17 +++++++++++++++++ src/views/business/form/drug/comp/ytbdList.vue | 15 ++++++++------- src/views/business/form/nonTrial/comp/ytbdList.vue | 9 +++++---- src/views/business/study/comp/ytbdList.vue | 9 +++++---- 5 files changed, 35 insertions(+), 32 deletions(-) diff --git a/src/api/business/public/public.js b/src/api/business/public/public.js index 9dec5b9..df14be5 100644 --- a/src/api/business/public/public.js +++ b/src/api/business/public/public.js @@ -34,23 +34,6 @@ export function public_templateList(query) { }) } -// 查询试验列表 -export function public_studyList(query) { - return request({ - url: '/system/business/public/studyList', - method: 'get', - params: query - }) -} - -// 查询试验预填表单列表 -export function public_studyFormPreList(query) { - return request({ - url: '/system/business/public/studyFormPreList', - method: 'get', - params: query - }) -} // 试验区域-饲养间列表 export function public_roomList(query) { return request({ diff --git a/src/api/business/study/studyFormPre.js b/src/api/business/study/studyFormPre.js index 0d190d3..d61d8bb 100644 --- a/src/api/business/study/studyFormPre.js +++ b/src/api/business/study/studyFormPre.js @@ -136,3 +136,20 @@ export function studyFormPre_jjgb(data) { }) } +// 查询试验列表 +export function studyFormPre_studyList(query) { + return request({ + url: '/system/business/studyFormPre/studyList', + method: 'get', + params: query + }) +} + +// 查询试验预填表单列表 +export function studyFormPre_studyFormPreList(query) { + return request({ + url: '/system/business/studyFormPre/studyFormPreList', + method: 'get', + params: query + }) +} \ No newline at end of file diff --git a/src/views/business/form/drug/comp/ytbdList.vue b/src/views/business/form/drug/comp/ytbdList.vue index b727b96..a197cd7 100644 --- a/src/views/business/form/drug/comp/ytbdList.vue +++ b/src/views/business/form/drug/comp/ytbdList.vue @@ -189,8 +189,7 @@