From 7352d7a2ccf9b203d088b9db0d041c57cb56efef Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 2 Feb 2026 11:41:55 +0800 Subject: [PATCH 01/10] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=AF=BC=E5=87=BA?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/api/business/study/studyFormFill.js | 7 +++ src/views/business/comps/common/JcgjList.vue | 8 ++- src/views/business/study/comp/tbbd/Xq.vue | 93 ++++++++++++++++++---------- 3 files changed, 73 insertions(+), 35 deletions(-) diff --git a/src/api/business/study/studyFormFill.js b/src/api/business/study/studyFormFill.js index 14d1263..94d27bd 100644 --- a/src/api/business/study/studyFormFill.js +++ b/src/api/business/study/studyFormFill.js @@ -24,6 +24,13 @@ export function studyFormFill_exportDetail(query) { params: query }) } +export function studyFormFill_jcgjqmxxList(query) { + return request({ + url: '/system/business/studyFormFill/jcgjqmxxList', + method: 'get', + params: query + }) +} //签名信息 export function studyFormFill_qmxx(query) { diff --git a/src/views/business/comps/common/JcgjList.vue b/src/views/business/comps/common/JcgjList.vue index e915d51..ff1ac26 100644 --- a/src/views/business/comps/common/JcgjList.vue +++ b/src/views/business/comps/common/JcgjList.vue @@ -1,11 +1,11 @@ \ No newline at end of file From 305d4c77ac21fa1e0e33cdba01948d1ba6687c00 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 2 Feb 2026 13:48:51 +0800 Subject: [PATCH 03/10] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=AF=BC=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 | 28 +++++++++++++++++++++------- 1 file changed, 21 insertions(+), 7 deletions(-) diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index daa26ea..9a5a46b 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -27,9 +27,9 @@
- +
@@ -56,11 +56,11 @@ -
+
{{ $t('page.business.study.studyFormFill.jcgj') }}
- +
@@ -200,7 +200,7 @@ export default { showExport: false, qmxxExportList: [], jcgjExportList: [], - + jcgjlxExport:0 } }, computed: { @@ -213,6 +213,7 @@ export default { methods: { onProgress(progress) { console.log(`生成进度: ${progress}%`) + this.removePageBreak() if (progress == 100) { this.showExport = false this.$modal.closeLoading() @@ -220,8 +221,8 @@ export default { }, exportExcel(jcgjlx) { this.$modal.loading() + this.jcgjlxExport=jcgjlx this.showExport = true - this.$modal.loading() studyFormFill_jcgjqmxxList({ jcgjlx: jcgjlx, id: this.form.id }).then(response => { this.jcgjExportList = response.data.jcgj this.qmxxExportList = response.data.qmxx @@ -231,6 +232,12 @@ export default { }, 200); }) }, + //移除分页空白 + removePageBreak() { + document.querySelectorAll('.html2pdf__page-break').forEach(el => { + el.remove() + }) + }, exportExcel_bak(jcgjlx) { this.$modal.loading() studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx, lang: this.$store.getters.language.split("_")[0] })).then(response => { @@ -339,6 +346,9 @@ export default { .pdf-content { padding: 20px; font-family: Arial, sans-serif; + page-break-inside: avoid !important; + break-inside: avoid !important; + page-break-after: avoid !important; } .pdf-content h1 { @@ -413,4 +423,8 @@ export default { line-height: 35px; text-align: center; } + +.html2pdf__page-break { + display: none !important; +} \ No newline at end of file From 3540eddfa80e098ce5576f5c0f52ab843151c970 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Mon, 2 Feb 2026 13:50:27 +0800 Subject: [PATCH 04/10] =?UTF-8?q?fix=EF=BC=9A[=E6=A8=A1=E6=9D=BF=E7=AE=A1?= =?UTF-8?q?=E7=90=86]=E5=AF=BC=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 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue index 9a5a46b..10f1e4a 100644 --- a/src/views/business/study/comp/tbbd/Xq.vue +++ b/src/views/business/study/comp/tbbd/Xq.vue @@ -29,7 +29,7 @@
+ :preview-modal="false" :filename="form.bdmc" ref="html2Pdf" @progress="onProgress">
From a0f76b9026d8571bb520ba143e8aeab9af444206 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 29 Jan 2026 16:42:48 +0800 Subject: [PATCH 05/10] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82=E7=AE=A1=E7=90=86]=E6=A1=A3?= =?UTF-8?q?=E6=A1=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gsp/comps/gsp/Xgkc.vue | 2 +- src/views/business/resource/sj/comps/Bj.vue | 2 +- src/views/business/resource/sj/comps/Gd.vue | 2 +- src/views/business/resource/sj/comps/Jd.vue | 2 +- src/views/business/resource/sj/comps/Js.vue | 2 +- src/views/business/resource/sj/comps/Jy.vue | 5 +++-- src/views/business/resource/sj/comps/Sd.vue | 2 +- src/views/business/resource/sj/comps/Xgkc.vue | 2 +- 8 files changed, 10 insertions(+), 9 deletions(-) diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue index dc53a00..638762a 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue @@ -111,7 +111,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.gsp.xgkc'), - sdrmm: null, + qmrmm: null, kc: '', kcdw: '', } diff --git a/src/views/business/resource/sj/comps/Bj.vue b/src/views/business/resource/sj/comps/Bj.vue index e9c2e3a..b384d8a 100644 --- a/src/views/business/resource/sj/comps/Bj.vue +++ b/src/views/business/resource/sj/comps/Bj.vue @@ -143,7 +143,7 @@ export default { mc: null, bh: null, qmyy: this.$t('form.edit'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, diff --git a/src/views/business/resource/sj/comps/Gd.vue b/src/views/business/resource/sj/comps/Gd.vue index e42add3..5516cb1 100644 --- a/src/views/business/resource/sj/comps/Gd.vue +++ b/src/views/business/resource/sj/comps/Gd.vue @@ -94,7 +94,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.sqgd'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, diff --git a/src/views/business/resource/sj/comps/Jd.vue b/src/views/business/resource/sj/comps/Jd.vue index 5bd2549..7bbba81 100644 --- a/src/views/business/resource/sj/comps/Jd.vue +++ b/src/views/business/resource/sj/comps/Jd.vue @@ -93,7 +93,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.sqjd'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, diff --git a/src/views/business/resource/sj/comps/Js.vue b/src/views/business/resource/sj/comps/Js.vue index ad44a37..4b69cf8 100644 --- a/src/views/business/resource/sj/comps/Js.vue +++ b/src/views/business/resource/sj/comps/Js.vue @@ -81,7 +81,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.jssj'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, diff --git a/src/views/business/resource/sj/comps/Jy.vue b/src/views/business/resource/sj/comps/Jy.vue index 00a80ad..24debd7 100644 --- a/src/views/business/resource/sj/comps/Jy.vue +++ b/src/views/business/resource/sj/comps/Jy.vue @@ -3,7 +3,7 @@ - + @@ -107,7 +107,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.sqjy'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, @@ -119,6 +119,7 @@ export default { this.form.id = row.id this.form.mc = row.mc this.form.bh = row.bh + this.daterange = [] this.open = true }, save() { diff --git a/src/views/business/resource/sj/comps/Sd.vue b/src/views/business/resource/sj/comps/Sd.vue index 7d6e654..09f62be 100644 --- a/src/views/business/resource/sj/comps/Sd.vue +++ b/src/views/business/resource/sj/comps/Sd.vue @@ -93,7 +93,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.sdsj'), - sdrmm: null + qmrmm: null } this.resetForm("form") }, diff --git a/src/views/business/resource/sj/comps/Xgkc.vue b/src/views/business/resource/sj/comps/Xgkc.vue index 99354df..006ce87 100644 --- a/src/views/business/resource/sj/comps/Xgkc.vue +++ b/src/views/business/resource/sj/comps/Xgkc.vue @@ -109,7 +109,7 @@ export default { mc: null, bh: null, qmyy: this.$t('page.business.resource.sj.xgkc'), - sdrmm: null, + qmrmm: null, kc: '', kcdw: '', } From 7dbc04ccc71bf52ab260c711160ed43e243d2cac Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Mon, 2 Feb 2026 14:40:57 +0800 Subject: [PATCH 06/10] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E8=AF=95=E5=89=82]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gsp/comps/ffjl/Jq.vue | 1 - src/views/business/resource/sj/comps/Bj.vue | 3 ++- src/views/business/resource/sj/comps/Jd.vue | 2 +- src/views/business/resource/sj/comps/Js.vue | 2 +- src/views/business/resource/sj/comps/Sd.vue | 3 ++- src/views/business/resource/sj/comps/Xgkc.vue | 3 ++- 6 files changed, 8 insertions(+), 6 deletions(-) diff --git a/src/views/business/resource/gsp/comps/ffjl/Jq.vue b/src/views/business/resource/gsp/comps/ffjl/Jq.vue index 56fde7f..3c77bc0 100644 --- a/src/views/business/resource/gsp/comps/ffjl/Jq.vue +++ b/src/views/business/resource/gsp/comps/ffjl/Jq.vue @@ -3,7 +3,6 @@ -
- {{ $t('page.business.study.studyFormPlan.dcqbjcgj') }} - - {{ $t('page.business.study.studyFormPlan.dclcjcgj') }} - - {{ $t('page.business.study.studyFormPlan.dcbjjcgj') }} - - {{ $t('page.business.study.studyFormPlan.dcxgjcgj') }} - - {{ $t('page.business.study.studyFormPlan.dcbhsjgj') }} - - -
-
-
{{ $t('page.business.study.studyFormPlan.qmxx') }}
-
-
- - - - - - -
-
- + {{ $t('page.business.study.studyFormPlan.dcqbjcgj') }} + + {{ $t('page.business.study.studyFormPlan.dclcjcgj') }} + + {{ $t('page.business.study.studyFormPlan.dcbjjcgj') }} + + {{ $t('page.business.study.studyFormPlan.dcxgjcgj') }} + + {{ $t('page.business.study.studyFormPlan.dcbhsjgj') }} + +
+
+ +
+
+ +
+
+
+
{{ $t('page.business.study.studyFormPlan.qmxx') }}
+
+ + + + + + + + + + + + + + + + + +
{{ $t('page.business.study.studyFormPlan.qmr') }}{{ $t('page.business.study.studyFormPlan.qmyy') }}{{ $t('page.business.study.studyFormPlan.qmsj') }}{{ $t('page.business.study.studyFormPlan.bzyy') }}
{{ item.qmrMc }}{{ $i18n.locale === 'zh_CN' ? item.qmyy : item.qmyyEn }}{{ item.createTime }}{{ item.remark }}
+
+
+
{{ $t('page.business.study.studyFormPlan.jcgj') }}
+
+ +
+
+
+
+ +
+
+
+
{{ $t('page.business.study.studyFormPlan.qmxx') }}
+
+
+ + + + + + +
+ +
+
+
{{ $t('page.business.study.studyFormPlan.jcgj') }}
+
+ +
-
-
-
{{ $t('page.business.study.studyFormPlan.jcgj') }}
-
- -
+ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
+ {{ $t('form.confirm') }} + {{ $t('form.cancel') }} +
+
+ \ No newline at end of file diff --git a/src/views/business/study/comp/sqbd/Xq.vue b/src/views/business/study/comp/sqbd/Xq.vue index 0568164..975e963 100644 --- a/src/views/business/study/comp/sqbd/Xq.vue +++ b/src/views/business/study/comp/sqbd/Xq.vue @@ -14,52 +14,89 @@ $t('page.business.study.studyFormApply.tb') }}
-
-
-
- - {{ $t('page.business.study.studyFormApply.dcqbjcgj') }} - - {{ $t('page.business.study.studyFormApply.dclcjcgj') }} - - {{ $t('page.business.study.studyFormApply.dcbjjcgj') }} - - {{ $t('page.business.study.studyFormApply.dcxgjcgj') }} - - {{ $t('page.business.study.studyFormApply.dcbhsjgj') }} - -
- -
-
-
{{ $t('page.business.study.studyFormApply.qmxx') }}
-
-
- - - - - - -
-
- + {{ $t('page.business.study.studyFormApply.dcqbjcgj') }} + + {{ $t('page.business.study.studyFormApply.dclcjcgj') }} + + {{ $t('page.business.study.studyFormApply.dcbjjcgj') }} + + {{ $t('page.business.study.studyFormApply.dcxgjcgj') }} + + {{ $t('page.business.study.studyFormApply.dcbhsjgj') }} + +
+
+ +
+
+ +
+
+
+
{{ $t('page.business.study.studyFormApply.qmxx') }}
+
+ + + + + + + + + + + + + + + + + +
{{ $t('page.business.study.studyFormApply.qmr') }}{{ $t('page.business.study.studyFormApply.qmyy') }}{{ $t('page.business.study.studyFormApply.qmsj') }}{{ $t('page.business.study.studyFormApply.bzyy') }}
{{ item.qmrMc }}{{ $i18n.locale === 'zh_CN' ? item.qmyy : item.qmyyEn }}{{ item.createTime }}{{ item.remark }}
+
+
+
{{ $t('page.business.study.studyFormApply.jcgj') }}
+
+ +
+
+
+
+ +
+
+
+
{{ $t('page.business.study.studyFormApply.qmxx') }}
+
+
+ + + + + + +
+ +
+
+
{{ $t('page.business.study.studyFormApply.jcgj') }}
+
+ +
-
-
-
{{ $t('page.business.study.studyFormApply.jcgj') }}
-
- - -
-
@@ -97,8 +134,7 @@ -
- @@ -113,18 +149,22 @@ + \ No newline at end of file diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index fea8fb0..3b12144 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -166,11 +166,11 @@ export default { message: this.$t('form.placeholderSelect'), trigger: 'blur' }], - shryId: [{ - required: true, - message: ' ', - trigger: 'blur' - }] + // shryId: [{ + // required: true, + // message: ' ', + // trigger: 'blur' + // }] }, rules: { bdmc: [{