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

src/views/business/form/drug/comp/ytbdList.vue

@@ -159,7 +159,7 @@
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.fzbd')" prop="formPreId">
               <el-select v-model="formXz.formPreId" :placeholder="$t('form.placeholderSelect')">
-                <el-option :label="item.bdbh" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
+                <el-option :label="item.bdmc" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -178,7 +178,7 @@
 
     <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>
 
     <Sign ref="fsySignRef" @callback="doSign" />
@@ -236,7 +236,7 @@ export default {
     return {
       formCount: 0,
       formFinishCount: 0,
-      formPreview: {
+      formDatePreview: {
         templateSn: null
       },
       openPreview: false,
@@ -303,12 +303,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

src/views/business/form/nonTrial/comp/ytbdList.vue

@@ -160,7 +160,7 @@
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.fzbd')" prop="formPreId">
               <el-select v-model="formXz.formPreId" :placeholder="$t('form.placeholderSelect')">
-                <el-option :label="item.bdbh" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
+                <el-option :label="item.bdmc" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -179,7 +179,7 @@
 
     <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>
 
     <Sign ref="fsySignRef" @callback="doSign" />
@@ -237,7 +237,7 @@ export default {
     return {
       formCount: 0,
       formFinishCount: 0,
-      formPreview: {
+      formDatePreview: {
         templateSn: null
       },
       openPreview: false,
@@ -304,12 +304,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

src/views/business/study/comp/sqbd/Sy.vue

@@ -195,7 +195,7 @@ export default {
     resetApprove() {
       this.formApprove = {
         id: null,
-        qmyy: $t('page.business.study.studyFormApply.ysy'),
+        qmyy:  this.$t('page.business.study.studyFormApply.ysy'),
         remark: '',
         bdnr: '',
         qmrmm: '',

src/views/business/study/comp/tbbd/Xq.vue

@@ -25,7 +25,7 @@
       </el-button>
       <el-button type="primary" @click="exportExcel(999)">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
       </el-button>
-       <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
+       <!-- <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
         </el-button>
         <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
         </el-button>
@@ -36,11 +36,11 @@
         <el-button type="primary" @click="dcxgjcgj">{{ $t('page.business.study.studyFormFill.dcxgjcgj') }}
         </el-button>
         <el-button type="primary" @click="dcbhsjgj">{{ $t('page.business.study.studyFormFill.dcbhsjgj') }}
-        </el-button>
+        </el-button> -->
       <div class="edit-content ">
         <div class="content" style="width: 100%;">
-           <vue-html2pdf :show-layout="false" pdf-content-width="100%" :float-layout="false" pdf-orientation="landscape"
-            :enable-download="true" :preview-modal="true" ref="html2Pdf"> 
+           <!-- <vue-html2pdf :show-layout="false" pdf-content-width="100%" :float-layout="false" pdf-orientation="landscape"
+            :enable-download="true" :preview-modal="true" ref="html2Pdf">  -->
             <section slot="pdf-content">
               <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="detail" />
               <div class="content-title">
@@ -72,8 +72,8 @@
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" /> -->
             </section>
-
-          </vue-html2pdf> 
+<!-- 
+          </vue-html2pdf>  -->
         </div>
       </div>
     </div>

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

@@ -160,7 +160,7 @@
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.fzbd')" prop="formPreId">
               <el-select v-model="formXz.formPreId" :placeholder="$t('form.placeholderSelect')">
-                <el-option :label="item.bdbh" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
+                <el-option :label="item.bdmc" :value="item.id" v-for="(item, index) in formPreList" :key="index" />
               </el-select>
             </el-form-item>
           </el-col>