From 371868cda2fab6d9c8012ad1a490501630a15954 Mon Sep 17 00:00:00 2001 From: "15881625488@163.com" <15881625488@163.com> Date: Thu, 8 Jan 2026 11:41:38 +0800 Subject: [PATCH] =?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=EF=BC=8C=E9=A2=84=E5=A1=AB?= =?UTF-8?q?=EF=BC=8C=E7=94=B3=E8=AF=B7=EF=BC=8C=E8=AE=A1=E5=88=92]?= =?UTF-8?q?=E7=BC=96=E8=BE=91=E4=BC=98=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- src/lang/en/business/study/studyFormApply.js | 1 + src/lang/en/business/study/studyFormFill.js | 1 + src/lang/en/business/study/studyFormPlan.js | 1 + src/lang/en/business/study/studyFormPre.js | 1 + src/lang/zh/business/study/studyFormApply.js | 1 + src/lang/zh/business/study/studyFormFill.js | 1 + src/lang/zh/business/study/studyFormPlan.js | 1 + src/lang/zh/business/study/studyFormPre.js | 1 + src/views/business/comps/select/SelectTemplate.vue | 7 ++++--- src/views/business/study/comp/jhbd/Bj.vue | 13 +++++++++---- src/views/business/study/comp/sqbd/Bj.vue | 21 +++++++++++++-------- src/views/business/study/comp/tbbd/Bj.vue | 16 ++++++++++------ src/views/business/study/comp/ytbd/Bj.vue | 17 +++++++++++------ vue.config.js | 4 ++-- 14 files changed, 57 insertions(+), 29 deletions(-) diff --git a/src/lang/en/business/study/studyFormApply.js b/src/lang/en/business/study/studyFormApply.js index ad3b0cb..8f24fad 100644 --- a/src/lang/en/business/study/studyFormApply.js +++ b/src/lang/en/business/study/studyFormApply.js @@ -13,6 +13,7 @@ export default { zc:'暂存', next:'Next', save:'Save', + pre:'Pre', submit:'Submit', bdnr:'表单内容', qmxx:'签名信息', diff --git a/src/lang/en/business/study/studyFormFill.js b/src/lang/en/business/study/studyFormFill.js index 90ba19d..9a2fab6 100644 --- a/src/lang/en/business/study/studyFormFill.js +++ b/src/lang/en/business/study/studyFormFill.js @@ -13,6 +13,7 @@ export default { zc:'暂存', next:'Next', save:'Save', + pre:'Pre', submit:'Submit', bdnr:'表单内容', qmxx:'签名信息', diff --git a/src/lang/en/business/study/studyFormPlan.js b/src/lang/en/business/study/studyFormPlan.js index a4fc4d1..da876b1 100644 --- a/src/lang/en/business/study/studyFormPlan.js +++ b/src/lang/en/business/study/studyFormPlan.js @@ -10,6 +10,7 @@ export default { zc: '暂存', next:'Next', save:'Save', + pre:'Pre', submit:'Submit', bdnr: '表单内容', qmxx: '签名信息', diff --git a/src/lang/en/business/study/studyFormPre.js b/src/lang/en/business/study/studyFormPre.js index bc5527d..d33c3b0 100644 --- a/src/lang/en/business/study/studyFormPre.js +++ b/src/lang/en/business/study/studyFormPre.js @@ -14,6 +14,7 @@ export default { reject:'Reject', shtg:'审核通过', shjj:'审核拒绝', + pre:'Pre', tb:'填报', bdnr:'表单内容', qmxx:'签名信息', diff --git a/src/lang/zh/business/study/studyFormApply.js b/src/lang/zh/business/study/studyFormApply.js index 4bd4334..1bac2f2 100644 --- a/src/lang/zh/business/study/studyFormApply.js +++ b/src/lang/zh/business/study/studyFormApply.js @@ -12,6 +12,7 @@ export default { bdsm:'表单说明', zc:'暂存', next:'下一步', + pre:'上一步', save:'保存', submit:'提交', bdnr:'表单内容', diff --git a/src/lang/zh/business/study/studyFormFill.js b/src/lang/zh/business/study/studyFormFill.js index 4bd4334..1bac2f2 100644 --- a/src/lang/zh/business/study/studyFormFill.js +++ b/src/lang/zh/business/study/studyFormFill.js @@ -12,6 +12,7 @@ export default { bdsm:'表单说明', zc:'暂存', next:'下一步', + pre:'上一步', save:'保存', submit:'提交', bdnr:'表单内容', diff --git a/src/lang/zh/business/study/studyFormPlan.js b/src/lang/zh/business/study/studyFormPlan.js index cde4a58..e3ac624 100644 --- a/src/lang/zh/business/study/studyFormPlan.js +++ b/src/lang/zh/business/study/studyFormPlan.js @@ -9,6 +9,7 @@ export default { bdsm: '表单说明', zc: '暂存', next: '下一步', + pre:'上一步', save: '保存', submit: '提交', bdnr: '表单内容', diff --git a/src/lang/zh/business/study/studyFormPre.js b/src/lang/zh/business/study/studyFormPre.js index 1787f9a..2394a0b 100644 --- a/src/lang/zh/business/study/studyFormPre.js +++ b/src/lang/zh/business/study/studyFormPre.js @@ -4,6 +4,7 @@ export default { xzbd:'新增表单', zc:'暂存', next:'下一步', + pre:'上一步', save:'保存', submit:'提交', bdsm:'表单说明', diff --git a/src/views/business/comps/select/SelectTemplate.vue b/src/views/business/comps/select/SelectTemplate.vue index 82412f5..d8b306f 100644 --- a/src/views/business/comps/select/SelectTemplate.vue +++ b/src/views/business/comps/select/SelectTemplate.vue @@ -2,7 +2,8 @@ @@ -21,7 +22,7 @@ export default { type: String, default: '' }, - readOnly: { + disabled: { type: Boolean, default: false }, @@ -56,7 +57,7 @@ export default { }, methods: { showSelectTemplate(){ - if(!this.readOnly){ + if(!this.disabled){ this.$refs.selectTemplateDialog.show({needPre:this.needPre}) } }, diff --git a/src/views/business/study/comp/jhbd/Bj.vue b/src/views/business/study/comp/jhbd/Bj.vue index 202de85..b807b1e 100644 --- a/src/views/business/study/comp/jhbd/Bj.vue +++ b/src/views/business/study/comp/jhbd/Bj.vue @@ -31,6 +31,7 @@ {{ $t('page.business.study.studyFormPlan.save') }} {{ $t('page.business.study.studyFormPlan.submit') }} + {{ $t('page.business.study.studyFormPlan.pre') }} @@ -40,7 +41,8 @@ - + @@ -137,7 +139,9 @@ export default { created() { }, methods: { - + pre() { + this.showIndex = 1 + }, next() { this.$refs["form"].validate(valid => { if (valid) { @@ -147,7 +151,7 @@ export default { }, selectTemplateChange(val) { this.form.bdnr = val.content - this.form.bdmc=val.name + this.form.bdmc = val.name this.form.templateMc = val.name this.form.templateSn = val.sn }, @@ -176,8 +180,8 @@ export default { }, edit(row) { this.reset() - this.showIndex = 1 if (row && row.id) { + this.showIndex = 2 this.$modal.loading() studyFormPlan_info({ id: row.id }).then(response => { this.form = response.data @@ -186,6 +190,7 @@ export default { this.$modal.closeLoading() }) } else { + this.showIndex = 1 this.form = _.merge({}, this.form, row) this.open = true } diff --git a/src/views/business/study/comp/sqbd/Bj.vue b/src/views/business/study/comp/sqbd/Bj.vue index ab73838..339d87b 100644 --- a/src/views/business/study/comp/sqbd/Bj.vue +++ b/src/views/business/study/comp/sqbd/Bj.vue @@ -31,6 +31,7 @@ {{ $t('page.business.study.studyFormApply.save') }} {{ $t('page.business.study.studyFormApply.submit') }} + {{ $t('page.business.study.studyFormApply.pre') }} @@ -40,7 +41,8 @@ - + @@ -54,10 +56,10 @@ - - - - + + + + @@ -152,7 +154,9 @@ export default { created() { }, methods: { - + pre() { + this.showIndex = 1 + }, next() { this.$refs["form"].validate(valid => { if (valid) { @@ -161,7 +165,7 @@ export default { }) }, selectTemplateChange(val) { - this.form.bdmc=val.name + this.form.bdmc = val.name this.form.bdnr = val.content this.form.templateMc = val.name this.form.templateSn = val.sn @@ -192,8 +196,8 @@ export default { }, edit(row) { this.reset() - this.showIndex = 1 if (row && row.id) { + this.showIndex = 2 this.$modal.loading() studyFormApply_info({ id: row.id }).then(response => { this.form = response.data @@ -202,6 +206,7 @@ export default { this.$modal.closeLoading() }) } else { + this.showIndex = 1 this.form = _.merge({}, this.form, row) this.open = true } diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue index 2f89fd0..73657c3 100644 --- a/src/views/business/study/comp/tbbd/Bj.vue +++ b/src/views/business/study/comp/tbbd/Bj.vue @@ -31,6 +31,7 @@ {{ $t('page.business.study.studyFormFill.save') }} {{ $t('page.business.study.studyFormFill.submit') }} + {{ $t('page.business.study.studyFormFill.pre') }} @@ -40,8 +41,8 @@ - + @@ -55,7 +56,7 @@ - + @@ -153,7 +154,9 @@ export default { created() { }, methods: { - + pre() { + this.showIndex = 1 + }, next() { this.$refs["form"].validate(valid => { if (valid) { @@ -164,7 +167,7 @@ export default { selectTemplateChange(val) { this.form.bdnr = val.content this.form.templateMc = val.name - this.form.bdmc=val.name + this.form.bdmc = val.name this.form.templateSn = val.sn }, cancel() { @@ -193,8 +196,8 @@ export default { }, edit(row) { this.reset() - this.showIndex = 1 if (row && row.id) { + this.showIndex = 2 this.$modal.loading() studyFormFill_info({ id: row.id }).then(response => { this.form = response.data @@ -203,6 +206,7 @@ export default { this.$modal.closeLoading() }) } else { + this.showIndex = 1 this.form = _.merge({}, this.form, row) this.open = true } diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue index 9006b68..1572949 100644 --- a/src/views/business/study/comp/ytbd/Bj.vue +++ b/src/views/business/study/comp/ytbd/Bj.vue @@ -31,6 +31,7 @@ {{ $t('page.business.study.studyFormPre.save') }} {{ $t('page.business.study.studyFormPre.submit') }} + {{ $t('page.business.study.studyFormPre.pre') }} @@ -40,14 +41,15 @@ - + - + @@ -63,7 +65,7 @@
- +
@@ -185,7 +187,9 @@ export default { created() { }, methods: { - + pre(){ + this.showIndex = 1 + }, next() { this.$refs["form"].validate(valid => { if (valid) { @@ -196,7 +200,7 @@ export default { selectTemplateChange(val) { this.form.bdnr = val.content this.form.templateMc = val.name - this.form.bdmc=val.name + this.form.bdmc = val.name this.form.templateSn = val.sn }, cancel() { @@ -224,8 +228,8 @@ export default { }, edit(row) { this.reset() - this.showIndex = 1 if (row && row.id) { + this.showIndex = 2 this.$modal.loading() studyFormPre_info({ id: row.id }).then(response => { this.form = response.data @@ -236,6 +240,7 @@ export default { this.$modal.closeLoading() }) } else { + this.showIndex = 1 this.form = _.merge({}, this.form, row) this.open = true } diff --git a/vue.config.js b/vue.config.js index d474f56..5e39e4b 100644 --- a/vue.config.js +++ b/vue.config.js @@ -34,8 +34,8 @@ module.exports = { proxy: { // detail: https://cli.vuejs.org/config/#devserver-proxy [process.env.VUE_APP_BASE_API]: { - // target: `http://localhost:8080`, - target: `http://39.99.251.173:8080`, + target: `http://localhost:8080`, + // target: `http://39.99.251.173:8080`, changeOrigin: true, pathRewrite: { ['^' + process.env.VUE_APP_BASE_API]: ''