fix：预填，填报，新增权限判断

src/api/business/study/studySubject.js

@@ -23,3 +23,10 @@ export function studySubject_save(data) {
     data: data
   })
 }
+export function studySubject_isMatchSubject(query) {
+  return request({
+    url: '/system/business/studySubject/isMatchSubject',
+    method: 'get',
+    params: query
+  })
+}

src/views/business/comps/select/SelectTemplate.vue

@@ -2,7 +2,6 @@
 
 <template>
   <div>
-    {{ readOnly }}
     <el-input v-model="selected.name" :placeholder="$t('form.placeholderSelect')" :disabled="disabled" @click.native="showSelectTemplate" />
     <SelectTemplateDialog ref="selectTemplateDialog" @callback="handleChange" />
   </div>

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

@@ -69,7 +69,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:drugFormFill:xz']">{{
+            <el-button type="primary" icon="el-icon-plus" v-if="isMatchSubject"  @click="add()" v-hasPermi="['business:drugFormFill:xz']">{{
               $t('page.business.study.studyFormFill.xzbd') }}</el-button>
           </el-col>
         </el-row>
@@ -169,6 +169,7 @@
 </template>
 
 <script>
+import { studySubject_isMatchSubject } from "@/api/business/study/studySubject"
 import { studyFormFill_list } from '@/api/business/study/studyFormFill'
 import Bj from "@/views/business/study/comp/tbbd/Bj";
 import Xq from "@/views/business/study/comp/tbbd/Xq";
@@ -206,6 +207,7 @@ export default {
         this.searchForm.studyId = newVal.studyId
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
+        // this.getIsMatchSubject()
         this.search()
       },
       immediate: true,
@@ -215,6 +217,7 @@ export default {
   components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isMatchSubject:false,
       leader: null,
       showFh: false,
       showAudit: false,
@@ -247,6 +250,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -50,7 +50,7 @@
       <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" v-if="isMatchSubject"  @click="showAdd()"
               v-hasPermi="['business:drugFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
           </el-col>
@@ -168,6 +168,7 @@
 </template>
 
 <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 TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -200,6 +201,7 @@ export default {
         this.searchForm.studyId = newVal.studyId
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
+        // this.getIsMatchSubject()
         this.search()
       },
       immediate: true,
@@ -209,6 +211,7 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
   data() {
     return {
+      isMatchSubject:false,
       formPreview: {
         templateSn: null
       },
@@ -260,6 +263,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     copy() {
       this.$modal.loading()
       public_studyList().then(response => {

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

@@ -69,7 +69,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:nonTrialFormFill:xz']">{{
+            <el-button type="primary" icon="el-icon-plus" v-if="isMatchSubject"  @click="add()" v-hasPermi="['business:nonTrialFormFill:xz']">{{
               $t('page.business.study.studyFormFill.xzbd') }}</el-button>
           </el-col>
         </el-row>
@@ -169,6 +169,7 @@
 </template>
 
 <script>
+import { studySubject_isMatchSubject } from "@/api/business/study/studySubject"
 import { studyFormFill_list } from '@/api/business/study/studyFormFill'
 import Bj from "@/views/business/study/comp/tbbd/Bj";
 import Xq from "@/views/business/study/comp/tbbd/Xq";
@@ -206,6 +207,7 @@ export default {
         this.searchForm.studyId = newVal.studyId
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
+        // this.getIsMatchSubject()
         this.search()
       },
       immediate: true,
@@ -215,6 +217,7 @@ export default {
   components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isMatchSubject:false,
       leader: null,
       showFh: false,
       showAudit: false,
@@ -247,6 +250,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -50,7 +50,7 @@
       <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" v-if="isMatchSubject"  @click="showAdd()"
               v-hasPermi="['business:nonTrialFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
           </el-col>
@@ -168,6 +168,7 @@
 </template>
 
 <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 TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -200,6 +201,7 @@ export default {
         this.searchForm.studyId = newVal.studyId
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
+        // this.getIsMatchSubject()
         this.search()
       },
       immediate: true,
@@ -209,6 +211,7 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
   data() {
     return {
+      isMatchSubject:false,
       formPreview: {
         templateSn: null
       },
@@ -260,6 +263,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     copy() {
       this.$modal.loading()
       public_studyList().then(response => {

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

@@ -16,7 +16,7 @@
       </div>
       <div class="edit-content">
         <div class="content-left">
-          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="actFill" :templateData="form"/>
+          <TemplateTable ref="templateTable" :sn="form.templateSn" fillType="actFill" :templateData="form" />
           <div class="content-title">
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.qmxx') }}</div>
@@ -43,7 +43,7 @@
             <div class="line"></div>
             <div class="subtitle"> {{ $t('page.business.study.studyFormPlan.jcgj') }}</div>
           </div>
-          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true"/>
+          <JcgjList ref="jcgjList" @handleQuery="getJjcgjList" :showXg="true" />
 
           <pagination v-show="jcgjTotal > 0" small layout="prev, pager, next" :total="jcgjTotal"
             @pagination="getJjcgjList" />
@@ -142,7 +142,7 @@ export default {
   created() {
   },
   methods: {
-   
+
     getJjcgjList(val) {
       this.$modal.loading()
       studyFormPlan_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
@@ -183,10 +183,13 @@ export default {
         this.$modal.closeLoading()
       })
     },
-    showApprove() {
-      this.resetApprove()
-      this.formApprove.id = this.form.id
-      this.openApprove = true
+   async showApprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      if (content) {
+        this.resetApprove()
+        this.formApprove.id = this.form.id
+        this.openApprove = true
+      }
     },
     resetApprove() {
       this.formApprove = {
@@ -200,16 +203,21 @@ export default {
     approve() {
       this.$refs["formApprove"].validate(valid => {
         if (valid) {
-          this.$modal.loading()
-          studyFormPlan_sy(this.formApprove).then(response => {
-            this.openApprove = false
-            this.$modal.closeLoading()
-            this.$emit('close')
-          }).finally(() => {
-            this.$modal.closeLoading()
-          })
+          this.doapprove()
         }
       })
+    },
+     async doapprove() {
+      let content = await this.$refs.templateTable.getFormData()
+      this.formApprove.bdnr = JSON.stringify(content)
+      this.$modal.loading()
+      studyFormPlan_sy(this.formApprove).then(response => {
+        this.$emit('close')
+        this.openSubmit = false
+        this.$modal.closeLoading()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
     }
   }
 }

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

@@ -69,7 +69,7 @@
       <div class="tbbd-content">
         <el-row class="add-box">
           <el-col>
-            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
+            <el-button type="primary" icon="el-icon-plus" v-if="isMatchSubject"  @click="add()" v-hasPermi="['business:studyFormFill:xz']">{{
               $t('page.business.study.studyFormFill.xzbd') }}</el-button>
           </el-col>
         </el-row>
@@ -206,6 +206,7 @@ export default {
         this.searchForm.studyId = newVal.studyId
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
+        this.getIsMatchSubject()
         this.search()
       },
       immediate: true,
@@ -215,6 +216,7 @@ export default {
   components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isMatchSubject:false,
       leader: null,
       showFh: false,
       showAudit: false,
@@ -247,6 +249,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -10,7 +10,7 @@
         </div>
         <div class="right-top">
           <el-button @click="cancel()">{{ $t('form.cancel') }}</el-button>
-          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1" @click="openApprove = true">{{
+          <el-button type="primary" v-if="form.bdzt === 5 && form.tbzt === 1&&form.userId==id" @click="openApprove = true">{{
             $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
@@ -159,22 +159,18 @@ export default {
   },
   computed: {
     ...mapGetters([
-      'nickName'
+      'nickName',
+      'id'
     ]),
   },
   created() {
   },
   methods: {
-   
     getJjcgjList(val) {
-      this.$modal.loading()
       studyFormPre_jcgj(_.merge({}, this.queryParamsJcgj, val)).then(response => {
         this.jcgjList = response.rows
         this.jcgjTotal = response.total
         this.$refs.jcgjList.init(this.jcgjList)
-        this.$modal.closeLoading()
-      }).finally(() => {
-        this.$modal.closeLoading()
       })
     },
     getQmxxList() {
@@ -212,7 +208,6 @@ export default {
         this.open = true
         this.getQmxxList()
         this.getJjcgjList()
-        this.$modal.closeLoading()
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -50,7 +50,7 @@
       <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" v-if="isMatchSubject" @click="showAdd()"
               v-hasPermi="['business:studyFormPre:xz']">{{
                 $t('page.business.study.studyFormPre.xzbd') }}</el-button>
           </el-col>
@@ -169,6 +169,7 @@
 </template>
 
 <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 TemplateTable from '@/views/business/comps/template/TemplateTable';
@@ -202,6 +203,7 @@ export default {
         this.searchForm.studySubjectId = newVal.studySubjectId
         this.leader = newVal.leader
         this.search()
+        this.getIsMatchSubject()
       },
       immediate: true,
       deep: true
@@ -210,6 +212,7 @@ export default {
   components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
   data() {
     return {
+      isMatchSubject:false,
       formPreview: {
         templateSn: null
       },
@@ -261,6 +264,11 @@ export default {
   },
   created() { },
   methods: {
+     getIsMatchSubject() {
+      studySubject_isMatchSubject({studySubjectId:this.searchForm.studySubjectId }).then(response => {
+        this.isMatchSubject=response.data
+      })
+    },
     copy() {
       this.$modal.loading()
       public_studyList().then(response => {