fix：[试验管理]预填bug

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

@@ -50,11 +50,12 @@
       <div class="ytbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus"  @click="showAdd()"
-              v-hasPermi="['business:drugFormPre:xz']">{{
-                $t('page.business.study.studyFormPre.xzbd') }}</el-button>
+            <el-button type="primary" icon="el-icon-plus" @click="showAdd()" v-hasPermi="['business:drugFormPre:xz']">{{
+              $t('page.business.study.studyFormPre.xzbd') }}</el-button>
 
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.drug.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:drug:sd']"
+              v-if="(leader == id || checkRole(['bz'])) && studyStatus != 5 && formCount === formFinishCount">{{
+                $t('page.business.study.drug.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -81,7 +82,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:drugFormPre:bj']" @click="edit(scope.row)"
-                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 7) && id == scope.row.userId">{{
                   $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
@@ -173,7 +174,7 @@
 
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
-import { drug_checkSd,drug_sd } from "@/api/business/form/drug"
+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 TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -215,11 +216,11 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
+  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
   data() {
     return {
-      formCount:0,
-      formFinishCount:0,
+      formCount: 0,
+      formFinishCount: 0,
       formPreview: {
         templateSn: null
       },
@@ -306,7 +307,17 @@ export default {
             this.openPreview = false
             this.showEdit = true
             this.$emit('showDetail', this.showEdit)
-            this.$refs.Bj.edit({ templateId: tmp.templateId,templateMc: tmp.templateMc,templateSn:tmp.templateSn ,bdmc: tmp.bdmc, bdnr: tmp.bdnr })
+            this.$refs.Bj.edit({
+              studySn: this.searchForm.studySn,
+              studyMc: this.searchForm.studyMc,
+              studyId: this.searchForm.studyId,
+              templateId: tmp.templateId,
+              templateMc: tmp.templateMc,
+              templateSn: tmp.templateSn,
+              bdmc: tmp.bdmc,
+              bdnr: tmp.bdnr,
+              permitForSecectUser: 'business:drugFormPre:sh'
+            })
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -359,7 +370,12 @@ export default {
       this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId })
+      this.$refs.Bj.edit({
+        studySn: this.searchForm.studySn,
+        studyMc: this.searchForm.studyMc,
+        studyId: this.searchForm.studyId,
+        permitForSecectUser: 'business:drugFormPre:sh'
+      })
     },
     edit(row) {
       this.showEdit = true
@@ -384,7 +400,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row,true)
+      this.$refs.Xq.show(row, true)
     },
     audit(row) {
       this.showAudit = true
@@ -395,21 +411,21 @@ export default {
     sdsy() {
       this.$modal.loading()
       drug_checkSd({
-        study:{id:this.study.id},
+        study: { id: this.study.id },
       }).then(() => {
-        this.$refs.fsySignRef.show(this.$t('page.business.study.drug.sdsy'),this.$t('page.business.study.drug.sdsy'))
+        this.$refs.fsySignRef.show(this.$t('page.business.study.drug.sdsy'), this.$t('page.business.study.drug.sdsy'))
       }).finally(() => {
         this.$modal.closeLoading()
       })
     },
-    doSign(val){
+    doSign(val) {
       this.doSd(val)
     },
-    doSd(sign){
+    doSd(sign) {
       this.$modal.loading()
       drug_sd({
-        study:{id:this.study.id},
-        sign:sign
+        study: { id: this.study.id },
+        sign: sign
       }).then(() => {
         this.$refs.fsySignRef.cancel()
         this.studyStatus = 5

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

@@ -50,11 +50,13 @@
       <div class="ytbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus"  @click="showAdd()"
+            <el-button type="primary" icon="el-icon-plus" @click="showAdd()"
               v-hasPermi="['business:nonTrialFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
 
-            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']" v-if="(leader==id || checkRole(['bz'])) && studyStatus!=5 && formCount===formFinishCount">{{ $t('page.business.study.nonTrial.sdsy') }}</el-button>
+            <el-button type="primary" @click="sdsy" v-hasPermi="['business:form:nonTrial:sd']"
+              v-if="(leader == id || checkRole(['bz'])) && studyStatus != 5 && formCount === formFinishCount">{{
+                $t('page.business.study.nonTrial.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -81,7 +83,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:nonTrialFormPre:bj']" @click="edit(scope.row)"
-                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 7) && id == scope.row.userId">{{
                   $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
@@ -173,7 +175,7 @@
 
 <script>
 import { checkPermi, checkRole } from "@/utils/permission";
-import { nonTrial_checkSd,nonTrial_sd } from "@/api/business/form/nonTrial"
+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 TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -215,11 +217,11 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
+  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable, Sign },
   data() {
     return {
-      formCount:0,
-      formFinishCount:0,
+      formCount: 0,
+      formFinishCount: 0,
       formPreview: {
         templateSn: null
       },
@@ -306,7 +308,17 @@ export default {
             this.openPreview = false
             this.showEdit = true
             this.$emit('showDetail', this.showEdit)
-            this.$refs.Bj.edit({ templateId: tmp.templateId,templateMc: tmp.templateMc,templateSn:tmp.templateSn ,bdmc: tmp.bdmc, bdnr: tmp.bdnr })
+            this.$refs.Bj.edit({
+              templateId: tmp.templateId,
+              templateMc: tmp.templateMc,
+              templateSn: tmp.templateSn,
+              bdmc: tmp.bdmc,
+              bdnr: tmp.bdnr,
+              studySn: this.searchForm.studySn,
+              studyMc: this.searchForm.studyMc,
+              studyId: this.searchForm.studyId,
+              permitForSecectUser: 'business:nonTrialFormPre:sh'
+            })
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -359,7 +371,12 @@ export default {
       this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId})
+      this.$refs.Bj.edit({
+        studySn: this.searchForm.studySn,
+        studyMc: this.searchForm.studyMc,
+        studyId: this.searchForm.studyId,
+        permitForSecectUser: 'business:nonTrialFormPre:sh'
+      })
     },
     edit(row) {
       this.showEdit = true
@@ -384,7 +401,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row,true)
+      this.$refs.Xq.show(row, true)
     },
     audit(row) {
       this.showAudit = true
@@ -394,21 +411,21 @@ export default {
     sdsy() {
       this.$modal.loading()
       nonTrial_checkSd({
-        study:{id:this.study.id},
+        study: { id: this.study.id },
       }).then(() => {
-        this.$refs.fsySignRef.show(this.$t('page.business.study.nonTrial.sdsy'),this.$t('page.business.study.nonTrial.sdsy'))
+        this.$refs.fsySignRef.show(this.$t('page.business.study.nonTrial.sdsy'), this.$t('page.business.study.nonTrial.sdsy'))
       }).finally(() => {
         this.$modal.closeLoading()
       })
     },
-    doSign(val){
+    doSign(val) {
       this.doSd(val)
     },
-    doSd(sign){
+    doSd(sign) {
       this.$modal.loading()
       nonTrial_sd({
-        study:{id:this.study.id},
-        sign:sign
+        study: { id: this.study.id },
+        sign: sign
       }).then(() => {
         this.$refs.fsySignRef.cancel()
         this.studyStatus = 5

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

@@ -76,7 +76,11 @@
         <el-row>
           <el-col :span="24">
             <el-form-item :label="$t('page.business.study.studyFormPre.shryId')" prop="shryId">
-              <SelectDeptUser v-model="form.shryId" :name="form.shryMc" key="shryId" @change="selectDeptUserChange" />
+              <SelectStudyUser v-model="form.shryId" :query="{
+                studyId: form.studyId,
+                studySubject: form.studySubjectId,
+                permit: form.permitForSecectUser
+              }" key="shryId" @change="selectDeptUserChange" />
             </el-form-item>
           </el-col>
         </el-row>
@@ -136,13 +140,13 @@
 import { studyFormPre_bc, studyFormPre_tj, studyFormPre_info } from "@/api/business/study/studyFormPre"
 import { mapGetters } from 'vuex'
 import SelectTemplate from "@/views/business/comps/select/SelectTemplate";
-import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import SelectStudyUser from '@/views/business/comps/select/SelectStudyUser';
 import TemplateTable from '@/views/business/comps/template/TemplateTable';
 import { deepClone } from "@/utils/index";
 
 export default {
   name: "Bj",
-  components: { SelectTemplate, SelectDeptUser, TemplateTable },
+  components: { SelectTemplate, SelectStudyUser, TemplateTable },
   data() {
     return {
       showIndex: 1,
@@ -237,6 +241,7 @@ export default {
         studyFormPre_info({ id: row.id }).then(response => {
           this.form = response.data
           this.form.qmyy = this.$t('page.business.study.studyFormPre.zztjyzbd')
+          this.templateData = deepClone(this.form)
           this.$modal.closeLoading()
         }).finally(() => {
           this.$modal.closeLoading()
@@ -244,8 +249,8 @@ export default {
       } else {
         this.showIndex = 1
         this.form = _.merge({}, this.form, row)
+        this.templateData = deepClone(this.form)
       }
-      this.templateData = deepClone(this.form)
     },
     save() {
       this.$refs["form"].validate(valid => {

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

@@ -80,7 +80,7 @@
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
               <el-button type="text" v-hasPermi="['business:studyFormPre:bj']" @click="edit(scope.row)"
-                v-if="(scope.row.bdzt === 1||scope.row.bdzt === 7)&&id==scope.row.userId">{{
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 7) && id == scope.row.userId">{{
                   $t('form.edit') }}</el-button>
               <template v-if="scope.row.fzrsh == 10">
                 <template v-if="scope.row.fzrshzt == 5">
@@ -119,12 +119,13 @@
       <el-form ref="form" label-width="120px">
         <el-row>
           <el-col :span="24" style="text-align: center; margin-top: 50px;">
-            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain
-              icon="el-icon-circle-plus">{{ $t('page.business.study.studyFormPre.cjxbd') }}</el-button>
+            <el-button type="primary" style="width: 80%; height: 40px;" @click="add" plain icon="el-icon-circle-plus">{{
+              $t('page.business.study.studyFormPre.cjxbd') }}</el-button>
           </el-col>
           <el-col :span="24" style="text-align: center; margin: 50px 0px;">
             <el-button type="primary" style="width: 80%;height: 40px;" @click="copy" plain
-              icon="el-icon-document-copy">{{ $t('page.business.study.studyFormPre.fzyybd') }}</el-button>
+              icon="el-icon-document-copy">{{
+                $t('page.business.study.studyFormPre.fzyybd') }}</el-button>
           </el-col>
         </el-row>
       </el-form>
@@ -150,7 +151,8 @@
           </el-col>
           <el-col :span="24">
             <el-form-item>
-              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">{{ $t('page.business.study.studyFormPre.yulan') }}</el-button>
+              <el-button type="primary" @click="previewFzbd" :disabled="!(formXz.formPreId)">{{
+                $t('page.business.study.studyFormPre.yulan') }}</el-button>
             </el-form-item>
           </el-col>
         </el-row>
@@ -212,7 +214,7 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
   data() {
     return {
-      isMatchSubject:false,
+      isMatchSubject: false,
       formPreview: {
         templateSn: null
       },
@@ -264,9 +266,9 @@ export default {
   },
   created() { },
   methods: {
-     getIsMatchSubject() {
-      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
-        this.isMatchSubject=response.data
+    getIsMatchSubject() {
+      studySubject_isMatchSubject({ studySubjectId: this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject = response.data
       })
     },
     copy() {
@@ -302,7 +304,17 @@ export default {
             this.openPreview = false
             this.showEdit = true
             this.$emit('showDetail', this.showEdit)
-            this.$refs.Bj.edit({ templateId: tmp.templateId,templateMc: tmp.templateMc,templateSn:tmp.templateSn ,bdmc: tmp.bdmc, bdnr: tmp.bdnr })
+            this.$refs.Bj.edit({
+              templateId: tmp.templateId,
+              templateMc: tmp.templateMc,
+              templateSn: tmp.templateSn,
+              bdmc: tmp.bdmc,
+              bdnr: tmp.bdnr,
+              studySn: this.searchForm.studySn,
+              studyMc: this.searchForm.studyMc,
+              studyId: this.searchForm.studyId,
+              permitForSecectUser: 'business:studyFormPre:sh'
+            })
           }).finally(() => {
             this.$modal.closeLoading()
           })
@@ -355,7 +367,13 @@ export default {
       this.open = false
       this.showEdit = true
       this.$emit('showDetail', this.showEdit)
-      this.$refs.Bj.edit({ studySn:this.searchForm.studySn, studyMc:this.searchForm.studyMc,studyId: this.searchForm.studyId, studySubjectId: this.searchForm.studySubjectId })
+      this.$refs.Bj.edit({
+        studySn: this.searchForm.studySn,
+        studyMc: this.searchForm.studyMc,
+        studyId: this.searchForm.studyId,
+        studySubjectId: this.searchForm.studySubjectId,
+        permitForSecectUser: 'business:studyFormPre:sh'
+      })
     },
     edit(row) {
       this.showEdit = true
@@ -380,7 +398,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row,false)
+      this.$refs.Xq.show(row, false)
     },
     audit(row) {
       this.showAudit = true