From 403f7087e7827dd32478924a14474f0d98d94423 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 29 Jan 2026 09:48:43 +0800 Subject: [PATCH 1/6] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E4=BE=9B=E8=AF=95=E5=93=81=E7=AE=A1=E7=90=86]?= =?UTF-8?q?=E7=AD=BE=E5=90=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/resource/gsp/comps/gsp/Bj.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Cz.vue | 2 +- .../business/resource/gsp/comps/gsp/CzBatch.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Ff.vue | 8 +- src/views/business/resource/gsp/comps/gsp/Gd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Gh.vue | 8 +- src/views/business/resource/gsp/comps/gsp/Jd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Js.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Jy.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Sd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Shbj.vue | 2 +- .../business/resource/gsp/comps/gsp/Shxgkc.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Xgkc.vue | 6 +- src/views/business/resource/gsp/comps/gsp/Xq.vue | 39 +--- .../business/resource/gsp/comps/gsp/XqExport.vue | 252 --------------------- src/views/business/resource/gsp/comps/gsp/Xz.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Ysff.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Bj.vue | 2 +- 18 files changed, 25 insertions(+), 314 deletions(-) delete mode 100644 src/views/business/resource/gsp/comps/gsp/XqExport.vue diff --git a/src/views/business/resource/gsp/comps/gsp/Bj.vue b/src/views/business/resource/gsp/comps/gsp/Bj.vue index f719514..bc23506 100644 --- a/src/views/business/resource/gsp/comps/gsp/Bj.vue +++ b/src/views/business/resource/gsp/comps/gsp/Bj.vue @@ -88,7 +88,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Cz.vue b/src/views/business/resource/gsp/comps/gsp/Cz.vue index eeba9d4..6a9c63d 100644 --- a/src/views/business/resource/gsp/comps/gsp/Cz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Cz.vue @@ -65,7 +65,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue index b5f27bb..3f6d5d5 100644 --- a/src/views/business/resource/gsp/comps/gsp/CzBatch.vue +++ b/src/views/business/resource/gsp/comps/gsp/CzBatch.vue @@ -55,7 +55,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Ff.vue b/src/views/business/resource/gsp/comps/gsp/Ff.vue index 049200e..3e59af7 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ff.vue @@ -150,7 +150,7 @@ - @@ -163,7 +163,7 @@ - @@ -176,7 +176,7 @@ - @@ -189,7 +189,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Gd.vue b/src/views/business/resource/gsp/comps/gsp/Gd.vue index 0d9b264..e604b0f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gd.vue @@ -33,7 +33,7 @@ - + diff --git a/src/views/business/resource/gsp/comps/gsp/Gh.vue b/src/views/business/resource/gsp/comps/gsp/Gh.vue index ace3131..db20100 100644 --- a/src/views/business/resource/gsp/comps/gsp/Gh.vue +++ b/src/views/business/resource/gsp/comps/gsp/Gh.vue @@ -101,7 +101,7 @@ - @@ -114,7 +114,7 @@ - @@ -127,7 +127,7 @@ - @@ -140,7 +140,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Jd.vue b/src/views/business/resource/gsp/comps/gsp/Jd.vue index 2315622..ae00e77 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Jd.vue @@ -58,7 +58,7 @@ - + diff --git a/src/views/business/resource/gsp/comps/gsp/Js.vue b/src/views/business/resource/gsp/comps/gsp/Js.vue index 28bb847..2114c00 100644 --- a/src/views/business/resource/gsp/comps/gsp/Js.vue +++ b/src/views/business/resource/gsp/comps/gsp/Js.vue @@ -48,7 +48,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Jy.vue b/src/views/business/resource/gsp/comps/gsp/Jy.vue index 9cac9ff..438300f 100644 --- a/src/views/business/resource/gsp/comps/gsp/Jy.vue +++ b/src/views/business/resource/gsp/comps/gsp/Jy.vue @@ -68,7 +68,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Sd.vue b/src/views/business/resource/gsp/comps/gsp/Sd.vue index c822ad8..818c13e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Sd.vue +++ b/src/views/business/resource/gsp/comps/gsp/Sd.vue @@ -32,7 +32,7 @@ - + diff --git a/src/views/business/resource/gsp/comps/gsp/Shbj.vue b/src/views/business/resource/gsp/comps/gsp/Shbj.vue index d148517..7c72915 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shbj.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shbj.vue @@ -71,7 +71,7 @@ - + diff --git a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue index a718f4e..fd5c3cb 100644 --- a/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Shxgkc.vue @@ -61,7 +61,7 @@ - + diff --git a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue index a82aa8f..edaf391 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xgkc.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xgkc.vue @@ -32,8 +32,8 @@ - - + + @@ -71,7 +71,7 @@ export default { open: false, form: {}, rules: { - sdrmm: [{ + qmrmm: [{ required: true, message: ' ', trigger: 'blur' diff --git a/src/views/business/resource/gsp/comps/gsp/Xq.vue b/src/views/business/resource/gsp/comps/gsp/Xq.vue index 94e267a..262c7e0 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xq.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xq.vue @@ -121,7 +121,6 @@ @pagination="getJjcgjList" /> - @@ -131,12 +130,9 @@ diff --git a/src/views/business/resource/gsp/comps/gsp/Xz.vue b/src/views/business/resource/gsp/comps/gsp/Xz.vue index f127f51..babb82e 100644 --- a/src/views/business/resource/gsp/comps/gsp/Xz.vue +++ b/src/views/business/resource/gsp/comps/gsp/Xz.vue @@ -98,7 +98,7 @@ - diff --git a/src/views/business/resource/gsp/comps/gsp/Ysff.vue b/src/views/business/resource/gsp/comps/gsp/Ysff.vue index 29e3139..a727b87 100644 --- a/src/views/business/resource/gsp/comps/gsp/Ysff.vue +++ b/src/views/business/resource/gsp/comps/gsp/Ysff.vue @@ -97,7 +97,7 @@ - diff --git a/src/views/business/resource/gsp/comps/rkjl/Bj.vue b/src/views/business/resource/gsp/comps/rkjl/Bj.vue index 7542f49..5d13fe7 100644 --- a/src/views/business/resource/gsp/comps/rkjl/Bj.vue +++ b/src/views/business/resource/gsp/comps/rkjl/Bj.vue @@ -83,7 +83,7 @@ - From 38a18e2736943e773ae25abf4b101dcf771f6db6 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 29 Jan 2026 10:50:26 +0800 Subject: [PATCH 2/6] =?UTF-8?q?fix:[=E8=AF=95=E9=AA=8C=E7=AE=A1=E7=90=86][?= =?UTF-8?q?=E8=AF=95=E9=AA=8C=E6=96=B9=E6=B3=95]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/study/comp/syff/Xq.vue | 2 +- src/views/business/study/comp/syff/Xz.vue | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/views/business/study/comp/syff/Xq.vue b/src/views/business/study/comp/syff/Xq.vue index 6b24e49..01cc033 100644 --- a/src/views/business/study/comp/syff/Xq.vue +++ b/src/views/business/study/comp/syff/Xq.vue @@ -31,7 +31,7 @@ class="el-icon-arrow-right el-icon--right"> -
+
{{ $t('page.business.study.studyMethod.qmhz') }}
diff --git a/src/views/business/study/comp/syff/Xz.vue b/src/views/business/study/comp/syff/Xz.vue index 4fc3a1f..8367ae9 100644 --- a/src/views/business/study/comp/syff/Xz.vue +++ b/src/views/business/study/comp/syff/Xz.vue @@ -186,6 +186,7 @@ export default { if (res.code === 200) { this.form.fileUrl = res.data.url this.form.fileName = res.data.name + this.form.ffmc = res.data.originalFileName this.fileList.push({ name: res.data.name, url: res.data.url }) this.$modal.closeLoading() } else { From 45fc64bf028a8ad28dc902e1163eb028a7a6b433 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 29 Jan 2026 10:52:04 +0800 Subject: [PATCH 3/6] =?UTF-8?q?fix=EF=BC=9A[=E8=A1=A8=E5=8D=95=E7=AE=A1?= =?UTF-8?q?=E7=90=86]bug?= 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 | 5 ++++- src/views/business/study/comp/ytbd/Bj.vue | 2 +- 4 files changed, 7 insertions(+), 4 deletions(-) diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index 4a6935d..b6a657e 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -192,7 +192,7 @@ export default { onPlanCallback(data) { console.log("data:" + JSON.stringify(data)) console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) - if (data.type == 'fieldChanged') { + if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') { studyFormPlan_updateBdnr( { id: this.form.id, diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index 9f44184..d812424 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -192,7 +192,7 @@ export default { onApplyCallback(data) { console.log("data:" + JSON.stringify(data)) console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) - if (data.type == 'fieldChanged') { + if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') { studyFormApply_updateBdnr( { id: this.form.id, diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 2114e84..836a061 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -359,7 +359,7 @@ export default { onFillCallback(data) { console.log("data:" + JSON.stringify(data)) console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) - if (data.type == 'fieldChanged') { + if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') { studyFormFill_updateBdnr( { id: this.form.id, @@ -512,7 +512,10 @@ export default { this.$modal.loading() studyFormFill_bcOnly(this.form).then(response => { this.form = response.data + this.templateData = deepClone(this.form) this.showIndex = 2 + const obj = Object.assign({}, this.$route, { title: this.form.bdmc }) + this.$tab.updatePage(obj); }).finally(() => { this.$modal.closeLoading() }) diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 49267a8..8b22944 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -199,7 +199,7 @@ export default { onPreCallback(data) { console.log("data:" + JSON.stringify(data)) console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) - if (data.type == 'fieldChanged') { + if (data.type == 'fieldChanged'&&data.newRecord&&data.newRecord!='') { studyFormPre_updateBdnr( { id: this.form.id, From 5bb0093f0c05d190f18b6451b967db2cba2df195 Mon Sep 17 00:00:00 2001 From: HanLong <404402223@qq.com> Date: Thu, 29 Jan 2026 11:03:02 +0800 Subject: [PATCH 4/6] =?UTF-8?q?fix:[=E8=B5=84=E6=BA=90=E5=BA=93=E7=AE=A1?= =?UTF-8?q?=E7=90=86][=E5=AF=86=E7=A0=81=E8=BE=93=E5=85=A5]?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/views/business/form/nonTrial/comp/syff/Xz.vue | 2 +- src/views/business/form/nonTrial/comp/syff/Yd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Gd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Js.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Jy.vue | 2 +- src/views/business/resource/gsp/comps/ffjl/Sd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Bj.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Cz.vue | 2 +- src/views/business/resource/gsp/comps/gsp/CzBatch.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Gd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Jd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Js.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Jy.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Sd.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Shbj.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Shxgkc.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Xgkc.vue | 2 +- src/views/business/resource/gsp/comps/gsp/Xz.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Bj.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Gd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Jd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Js.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Jy.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Sd.vue | 2 +- src/views/business/resource/gsp/comps/rkjl/Xz.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Gd.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jd.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jq.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Js.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Jy.vue | 2 +- src/views/business/resource/gyzj/comps/ffjl/Sd.vue | 2 +- src/views/business/resource/gyzj/comps/gyzj/Bj.vue | 2 +- src/views/business/resource/sj/comps/Bj.vue | 6 +++--- src/views/business/resource/sj/comps/Cz.vue | 2 +- src/views/business/resource/sj/comps/CzBatch.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 | 2 +- src/views/business/resource/sj/comps/Sd.vue | 2 +- src/views/business/resource/sj/comps/Xgkc.vue | 6 +++--- src/views/business/resource/yq/list.vue | 2 +- src/views/business/study/comp/syff/Xz.vue | 2 +- src/views/business/study/comp/syff/Yd.vue | 2 +- 46 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/views/business/form/nonTrial/comp/syff/Xz.vue b/src/views/business/form/nonTrial/comp/syff/Xz.vue index 4fc3a1f..8e59ce2 100644 --- a/src/views/business/form/nonTrial/comp/syff/Xz.vue +++ b/src/views/business/form/nonTrial/comp/syff/Xz.vue @@ -54,7 +54,7 @@ G