Merge branch 'master' of http://182.151.8.209:9010/eln_TD/eln_web

src/views/business/study/comp/ytbdList.vue

@@ -104,11 +104,11 @@
               </template>
               <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
                 <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')
-                  }}</el-button>
+                }}</el-button>
               </template>
               <template v-if="scope.row.bdzt === 9 && id == scope.row.sjshryId">
                 <el-button type="text" @click="qrgb(scope.row)">{{ $t('page.business.study.studyFormPre.qrgb')
-                  }}</el-button>
+                }}</el-button>
               </template>
             </template>
           </el-table-column>
@@ -179,7 +179,8 @@
 
     <el-dialog :title="$t('page.business.study.studyFormPre.yulan')" :visible.sync="openPreview" width="80%"
       append-to-body :close-on-click-modal="false">
-      <TemplateTable ref="templateTable" :sn="formPreview.templateSn" fillType="preFill" />
+      <TemplateTable ref="templateTable" :sn="formDatePreview.templateSn" v-if="openPreview"
+        :templateData="formDatePreview" fillType="detail" />
     </el-dialog>
   </div>
 
@@ -187,7 +188,7 @@
 
 <script>
 import { studySubject_isMatchSubject } from "@/api/business/study/studySubject"
-import { studyFormPre_list, studyFormPre_info,studyFormPre_studyList, studyFormPre_studyFormPreList } from '@/api/business/study/studyFormPre'
+import { studyFormPre_list, studyFormPre_info, studyFormPre_studyList, studyFormPre_studyFormPreList } from '@/api/business/study/studyFormPre'
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import Bj from "./ytbd/Bj";
 import Xq from "./ytbd/Xq";
@@ -231,9 +232,7 @@ export default {
   data() {
     return {
       isMatchSubject: false,
-      formPreview: {
-        templateSn: null
-      },
+      formDatePreview: {},
       openPreview: false,
       openXz: false,
       open: false,
@@ -301,12 +300,17 @@ export default {
       })
     },
     previewFzbd() {
-      let that = this
-      let _index = _.findIndex(this.formPreList, function (item) {
-        return item.id = that.formXz.formPreId
+      this.$modal.loading()
+      studyFormPre_info({ id: this.formXz.formPreId }).then(response => {
+        this.formDatePreview = _.merge({}, response.data, {
+          studySn: this.searchForm.studySn,
+          studyMc: this.searchForm.studyMc,
+          studyId: this.searchForm.studyId,
+        })
+        this.openPreview = true
+      }).finally(() => {
+        this.$modal.closeLoading()
       })
-      this.formPreview.templateSn = that.formPreList[_index].templateSn
-      this.openPreview = true
     },
     saveCopy() {
       let that = this