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

src/api/business/public/public.js

@@ -34,23 +34,6 @@ export function public_templateList(query) {
   })
 }
 
-// 查询试验列表
-export function public_studyList(query) {
-  return request({
-    url: '/system/business/public/studyList',
-    method: 'get',
-    params: query
-  })
-}
-
-// 查询试验预填表单列表
-export function public_studyFormPreList(query) {
-  return request({
-    url: '/system/business/public/studyFormPreList',
-    method: 'get',
-    params: query
-  })
-}
 // 试验区域-饲养间列表
 export function public_roomList(query) {
   return request({

src/api/business/study/studyFormPre.js

@@ -136,3 +136,20 @@ export function studyFormPre_jjgb(data) {
   })
 }
 
+// 查询试验列表
+export function studyFormPre_studyList(query) {
+  return request({
+    url: '/system/business/studyFormPre/studyList',
+    method: 'get',
+    params: query
+  })
+}
+
+// 查询试验预填表单列表
+export function studyFormPre_studyFormPreList(query) {
+  return request({
+    url: '/system/business/studyFormPre/studyFormPreList',
+    method: 'get',
+    params: query
+  })
+}

src/lang/zh/business/study/studyFormApply.js

@@ -32,7 +32,7 @@ export default {
   dclcjcgj: '导出(流程稽查轨迹)',
   dcbjjcgj: '导出(编辑稽查轨迹)',
   dcxgjcgj: '导出(修改稽查轨迹)',
-  dcbhsjgj: '导出(不含数据轨迹)',
+  dcbhsjgj: '导出(不含稽查轨迹)',
   tbz: '填报中',
   ytj: '已提交',
   wtg: '未通过',

src/lang/zh/business/study/studyFormFill.js

@@ -40,7 +40,7 @@ export default {
   dclcjcgj: '导出(流程稽查轨迹)',
   dcbjjcgj: '导出(编辑稽查轨迹)',
   dcxgjcgj: '导出(修改稽查轨迹)',
-  dcbhsjgj: '导出(不含数据轨迹)',
+  dcbhsjgj: '导出(不含稽查轨迹)',
   ytbd: '预填表单',
   tbz: '填报中',
   ytj: '已提交',

src/lang/zh/business/study/studyFormPlan.js

@@ -29,7 +29,7 @@ export default {
   dclcjcgj: '导出(流程稽查轨迹)',
   dcbjjcgj: '导出(编辑稽查轨迹)',
   dcxgjcgj: '导出(修改稽查轨迹)',
-  dcbhsjgj: '导出(不含数据轨迹)',
+  dcbhsjgj: '导出(不含稽查轨迹)',
   rybg: '人员变更',
   tbz: '填报中',
   ytj: '已提交',

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

@@ -189,8 +189,7 @@
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
 import { drug_checkSd, drug_sd } from "@/api/business/form/drug"
-import { studyFormPre_list, studyFormPre_info } from '@/api/business/study/studyFormPre'
-import { public_studyList, public_studyFormPreList } from '@/api/business/public/public'
+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 "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
@@ -292,7 +291,7 @@ export default {
     checkRole,
     copy() {
       this.$modal.loading()
-      public_studyList().then(response => {
+      studyFormPre_studyList().then(response => {
         this.studyList = response.data
         this.formXz.studyId = null
         this.formXz.formPreId = null
@@ -324,14 +323,16 @@ export default {
             this.showEdit = true
             this.$emit('showDetail', this.showEdit)
             this.$refs.Bj.edit({
-              studySn: this.searchForm.studySn,
-              studyMc: this.searchForm.studyMc,
-              studyId: this.searchForm.studyId,
               templateId: tmp.templateId,
               templateMc: tmp.templateMc,
+              templateMcEn: tmp.templateMcEn,
+              templateShowSn: tmp.templateShowSn,
               templateSn: tmp.templateSn,
               bdmc: tmp.bdmc,
               bdnr: tmp.bdnr,
+              studySn: this.searchForm.studySn,
+              studyMc: this.searchForm.studyMc,
+              studyId: this.searchForm.studyId,
               permitForSecectUser: 'business:drugFormPre:sh'
             })
           }).finally(() => {
@@ -343,7 +344,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      public_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()

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

@@ -190,8 +190,7 @@
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
 import { nonTrial_checkSd, nonTrial_sd } from "@/api/business/form/nonTrial"
-import { studyFormPre_list, studyFormPre_info } from '@/api/business/study/studyFormPre'
-import { public_studyList, public_studyFormPreList } from '@/api/business/public/public'
+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 "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
@@ -293,7 +292,7 @@ export default {
     checkRole,
     copy() {
       this.$modal.loading()
-      public_studyList().then(response => {
+      studyFormPre_studyList().then(response => {
         this.studyList = response.data
         this.formXz.studyId = null
         this.formXz.formPreId = null
@@ -327,6 +326,8 @@ export default {
             this.$refs.Bj.edit({
               templateId: tmp.templateId,
               templateMc: tmp.templateMc,
+              templateMcEn: tmp.templateMcEn,
+              templateShowSn: tmp.templateShowSn,
               templateSn: tmp.templateSn,
               bdmc: tmp.bdmc,
               bdnr: tmp.bdnr,
@@ -344,7 +345,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      public_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()

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

@@ -14,9 +14,18 @@
             $t('page.business.study.studyFormFill.tb') }}</el-button>
         </div>
       </div>
-       <el-button type="primary" @click="exportExcel">后台导出
-        </el-button>
-        <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
+      <!-- 1:流程；3：编辑；5：人员；7：修改；9：补充说明 -->
+      <el-button type="primary" @click="exportExcel(-1)">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
+      </el-button>
+      <el-button type="primary" @click="exportExcel(1)">{{ $t('page.business.study.studyFormFill.dclcjcgj') }}
+      </el-button>
+      <el-button type="primary" @click="exportExcel(3)">{{ $t('page.business.study.studyFormFill.dcbjjcgj') }}
+      </el-button>
+      <el-button type="primary" @click="exportExcel(7)">{{ $t('page.business.study.studyFormFill.dcxgjcgj') }}
+      </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>
         <el-button type="primary" @click="dcqbjcgj">{{ $t('page.business.study.studyFormFill.dcqbjcgj') }}
         </el-button>
@@ -27,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">
+        <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"> -->
             <section slot="pdf-content">
               <TemplateTable ref="templateTable" :sn="form.templateSn" :templateData="form" fillType="detail" />
               <div class="content-title">
@@ -64,7 +73,7 @@
             @pagination="getJjcgjList" /> -->
             </section>
 
-          </vue-html2pdf>
+          <!-- </vue-html2pdf> -->
         </div>
       </div>
     </div>
@@ -172,7 +181,6 @@ export default {
         pageNum: 1,
         formId: null,
         pageSize: 9999,
-        lang:this.$store.getters.language.split("_")[0]
       }
     }
   },
@@ -184,9 +192,9 @@ export default {
   created() {
   },
   methods: {
-    exportExcel() {
+    exportExcel(jcgjlx) {
       this.$modal.loading()
-      studyFormFill_exportDetail(this.queryParamsJcgj).then(response => {
+      studyFormFill_exportDetail(_.merge({}, this.queryParamsJcgj, { jcgjlx: jcgjlx ,lang: this.$store.getters.language.split("_")[0]})).then(response => {
         window.open(this.baseUrl + response.msg)
         this.$modal.closeLoading()
       }).finally(() => {

src/views/business/study/comp/ytbd/Bj.vue

@@ -198,7 +198,7 @@ export default {
       console.log("data:" + JSON.stringify(data))
       console.log("formdata:" + JSON.stringify(this.$refs.templateTable.getFilledFormData()))
       if (data.type == 'fieldChanged') {
-        studyFormFill_updateBdnr(
+        studyFormPre_updateBdnr(
           {
             id: this.form.id,
             bdnr: JSON.stringify(this.$refs.templateTable.getFilledFormData()),

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

@@ -187,8 +187,7 @@
 
 <script>
 import { studySubject_isMatchSubject } from "@/api/business/study/studySubject"
-import { studyFormPre_list, studyFormPre_info } from '@/api/business/study/studyFormPre'
-import { public_studyList, public_studyFormPreList } from '@/api/business/public/public'
+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";
@@ -290,7 +289,7 @@ export default {
     },
     copy() {
       this.$modal.loading()
-      public_studyList().then(response => {
+      studyFormPre_studyList().then(response => {
         this.studyList = response.data
         this.formXz.studyId = null
         this.formXz.formPreId = null
@@ -324,6 +323,8 @@ export default {
             this.$refs.Bj.edit({
               templateId: tmp.templateId,
               templateMc: tmp.templateMc,
+              templateMcEn: tmp.templateMcEn,
+              templateShowSn: tmp.templateShowSn,
               templateSn: tmp.templateSn,
               bdmc: tmp.bdmc,
               bdnr: tmp.bdnr,
@@ -341,7 +342,7 @@ export default {
     },
     studyChange() {
       this.$modal.loading()
-      public_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
+      studyFormPre_studyFormPreList({ studyId: this.formXz.studyId }).then(response => {
         this.formXz.formPre = null
         this.formPreList = response.data
         this.$modal.closeLoading()