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 @@
-
@@ -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 => {