Browse Source

fix:[试验管理][填报表单]

lkf
15881625488@163.com 3 months ago
parent
commit
19d3e4d666
3 changed files with 6 additions and 12 deletions
  1. +2
    -2
      src/views/business/study/comp/tbbd/Bj.vue
  2. +2
    -1
      src/views/business/study/comp/tbbd/Xq.vue
  3. +2
    -9
      src/views/business/study/comp/ytbd/Bj.vue

+ 2
- 2
src/views/business/study/comp/tbbd/Bj.vue View File

@ -76,7 +76,7 @@
</el-form> </el-form>
</div> </div>
<div class="content" v-if="showIndex == 2"> <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" /> :sn="form.templateSn" :templateData="form" fillType="actFill" />
</div> </div>
</div> </div>
@ -297,7 +297,7 @@ export default {
this.getInfo() this.getInfo()
}, },
methods: { methods: {
onEditCallback(data) {
onFillCallback(data) {
console.log("data:" + JSON.stringify(data)) console.log("data:" + JSON.stringify(data))
console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData())) 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"}]} // {"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"}]}

+ 2
- 1
src/views/business/study/comp/tbbd/Xq.vue View File

@ -124,7 +124,7 @@ export default {
openApprove: false, openApprove: false,
formApprove: { formApprove: {
id: null, id: null,
qmyy: $t('page.business.study.studyFormFill.cjjl'),
qmyy: this.$t('page.business.study.studyFormFill.cjjl'),
remark: '', remark: '',
qmrmm: '', qmrmm: '',
}, },
@ -230,6 +230,7 @@ export default {
show(row) { show(row) {
this.reset() this.reset()
this.$modal.loading() this.$modal.loading()
debugger
this.formApprove.id = row.id this.formApprove.id = row.id
this.queryParamsJcgj.formId = row.id this.queryParamsJcgj.formId = row.id
this.queryParamsQmxx.formId = row.id this.queryParamsQmxx.formId = row.id

+ 2
- 9
src/views/business/study/comp/ytbd/Bj.vue View File

@ -196,14 +196,6 @@ export default {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {
if (valid) { if (valid) {
this.showIndex = 2 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.templateMc = val.name
this.form.bdmc = val.name this.form.bdmc = val.name
this.form.templateSn = val.sn this.form.templateSn = val.sn
this.templateData = deepClone(this.form)
}, },
cancel() { cancel() {
this.$emit('close') this.$emit('close')
@ -243,7 +236,6 @@ export default {
this.$modal.loading() this.$modal.loading()
studyFormPre_info({ id: row.id }).then(response => { studyFormPre_info({ id: row.id }).then(response => {
this.form = response.data this.form = response.data
this.templateData = deepClone(this.form)
this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd') this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
this.$modal.closeLoading() this.$modal.closeLoading()
}).finally(() => { }).finally(() => {
@ -253,6 +245,7 @@ export default {
this.showIndex = 1 this.showIndex = 1
this.form = _.merge({}, this.form, row) this.form = _.merge({}, this.form, row)
} }
this.templateData = deepClone(this.form)
}, },
save() { save() {
this.$refs["form"].validate(valid => { this.$refs["form"].validate(valid => {

Loading…
Cancel
Save