fix：[试验管理][预填表单]复制

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/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/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()