From 19d3e4d6666755534b4014600c57ab3f8f3296aa Mon Sep 17 00:00:00 2001
From: "15881625488@163.com" <15881625488@163.com>
Date: Thu, 15 Jan 2026 15:44:21 +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=E8=A1=A8=E5=8D=95]?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/views/business/study/comp/tbbd/Bj.vue |  4 ++--
 src/views/business/study/comp/tbbd/Xq.vue |  3 ++-
 src/views/business/study/comp/ytbd/Bj.vue | 11 ++---------
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/src/views/business/study/comp/tbbd/Bj.vue b/src/views/business/study/comp/tbbd/Bj.vue
index a989d35..4e21a40 100644
--- a/src/views/business/study/comp/tbbd/Bj.vue
+++ b/src/views/business/study/comp/tbbd/Bj.vue
@@ -76,7 +76,7 @@
           </el-form>
         </div>
         <div class="content" v-if="showIndex == 2">
-          <TemplateTable emitName="onEditCallback" @onEditCallback="onEditCallback" ref="templateTable"
+          <TemplateTable emitName="onFillCallback" @onFillCallback="onFillCallback" ref="templateTable"
             :sn="form.templateSn" :templateData="form" fillType="actFill" />
         </div>
       </div>
@@ -297,7 +297,7 @@ export default {
     this.getInfo()
   },
   methods: {
-    onEditCallback(data) {
+    onFillCallback(data) {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       // {"type":"fieldChanged","newRecord":{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0333","title":"修改记录","time":"2026-01-14 19:44:02"},"resourceList":[{"userNameCn":"谭飞","userNameEn":"tf","key":"_versionNum","field":"试验基本信息-版本号","oldValue":"1.0","value":"1.0","title":"修改记录","time":"2026-01-14 19:43:57"}]}
diff --git a/src/views/business/study/comp/tbbd/Xq.vue b/src/views/business/study/comp/tbbd/Xq.vue
index c7f4144..c4bb2ee 100644
--- a/src/views/business/study/comp/tbbd/Xq.vue
+++ b/src/views/business/study/comp/tbbd/Xq.vue
@@ -124,7 +124,7 @@ export default {
       openApprove: false,
       formApprove: {
         id: null,
-        qmyy:  $t('page.business.study.studyFormFill.cjjl'),
+        qmyy:  this.$t('page.business.study.studyFormFill.cjjl'),
         remark: '',
         qmrmm: '',
       },
@@ -230,6 +230,7 @@ export default {
     show(row) {
       this.reset()
       this.$modal.loading()
+      debugger
       this.formApprove.id = row.id
       this.queryParamsJcgj.formId = row.id
       this.queryParamsQmxx.formId = row.id
diff --git a/src/views/business/study/comp/ytbd/Bj.vue b/src/views/business/study/comp/ytbd/Bj.vue
index 71bf42f..4a556ff 100644
--- a/src/views/business/study/comp/ytbd/Bj.vue
+++ b/src/views/business/study/comp/ytbd/Bj.vue
@@ -196,14 +196,6 @@ export default {
       this.$refs["form"].validate(valid => {
         if (valid) {
           this.showIndex = 2
-          this.$modal.loading()
-          studyFormPre_bc(this.form).then(response => {
-            this.form = response.data
-            this.templateData = deepClone(this.form)
-            this.showIndex = 2
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
         }
       })
     },
@@ -212,6 +204,7 @@ export default {
       this.form.templateMc = val.name
       this.form.bdmc = val.name
       this.form.templateSn = val.sn
+      this.templateData = deepClone(this.form)
     },
     cancel() {
       this.$emit('close')
@@ -243,7 +236,6 @@ export default {
         this.$modal.loading()
         studyFormPre_info({ id: row.id }).then(response => {
           this.form = response.data
-          this.templateData = deepClone(this.form)
           this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
           this.$modal.closeLoading()
         }).finally(() => {
@@ -253,6 +245,7 @@ export default {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
       }
+      this.templateData = deepClone(this.form)
     },
     save() {
       this.$refs["form"].validate(valid => {