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

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

@@ -106,7 +106,7 @@
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:drugFormApply:xq']">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 6 || scope.row.bdzt === 7"
+              <el-button type="text" v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 6 || scope.row.bdzt === 7) && id==scope.row.userId"
                 @click="edit(scope.row)" v-hasPermi="['business:drugFormApply:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
@@ -119,11 +119,11 @@
                   $t('page.business.study.studyFormApply.jq') }}</el-button>
               <!-- 更换归属人 -->
               <el-button type="text"
-                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 6 || scope.row.bdzt === 7) && checkRole(['bz'])"
                 @click="ghgsr(scope.row)" v-hasPermi="['business:drugFormApply:ghgsr']">{{
                   $t('page.business.study.studyFormApply.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" v-if="scope.row.bdzt === 7" @click="sy(scope.row)"
+              <el-button type="text" v-if="(scope.row.bdzt === 6 || scope.row.bdzt === 7) && (isQa || checkRole(['bz']))" @click="sy(scope.row)"
                 v-hasPermi="['business:drugFormApply:sy']">{{
                   $t('page.business.study.studyFormApply.sy') }}</el-button>
               <!-- 审核 -->
@@ -131,11 +131,11 @@
                 v-hasPermi="['business:drugFormApply:sh']">{{
                   $t('page.business.study.studyFormApply.sh') }}</el-button>
               <!-- 废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="fz(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 1 && id==scope.row.userId" @click="fz(scope.row)"
                 v-hasPermi="['business:drugFormApply:fz']">{{
                   $t('page.business.study.studyFormApply.fz') }}</el-button>
               <!-- 确认废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 9" @click="qrfz(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 9 && checkRole(['bz'])" @click="qrfz(scope.row)"
                 v-hasPermi="['business:drugFormApply:qrfz']">{{
                   $t('page.business.study.studyFormApply.qrfz') }}</el-button>
             </template>
@@ -170,6 +170,8 @@
 </template>
 
 <script>
+import { studySubject_isQa } from "@/api/business/study/studySubject"
+import { checkPermi, checkRole } from "@/utils/permission";
 import { studyFormApply_list } from '@/api/business/study/studyFormApply'
 import Bj from "@/views/business/study/comp/sqbd/Bj";
 import Xq from "@/views/business/study/comp/sqbd/Xq";
@@ -215,6 +217,7 @@ export default {
   components: { Ghgsr, Fh, Sh,Fz, Bj, Xq, Qrfz, Sy, Jq, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isQa:false,
       leader: null,
       showFh: false,
       showSh: false,
@@ -245,8 +248,15 @@ export default {
       currentRow: null
     }
   },
-  created() { },
+  created() { this.getIsQa()},
   methods: {
+    checkPermi,
+    checkRole,
+    getIsQa() {
+      studySubject_isQa().then(response => {
+        this.isQa=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -118,19 +118,19 @@
                   $t('page.business.study.studyFormFill.jq') }}</el-button>
               <!-- 更换归属人 -->
               <el-button type="text"
-                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7) && checkRole(['bz'])"
                 @click="ghgsr(scope.row)" v-hasPermi="['business:drugFormFill:ghgsr']">{{
                   $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sy(scope.row)"
+              <el-button type="text" v-if="(scope.row.bdzt === 5 || scope.row.bdzt === 7) && (isQa || checkRole(['bz']))" @click="sy(scope.row)"
                 v-hasPermi="['business:drugFormFill:sy']">{{
                   $t('page.business.study.studyFormFill.sy') }}</el-button>
               <!-- 废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1" @click="fz(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 1 && id==scope.row.userId" @click="fz(scope.row)"
                 v-hasPermi="['business:drugFormFill:fz']">{{
                   $t('page.business.study.studyFormFill.fz') }}</el-button>
               <!-- 确认废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 9" @click="qrfz(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 9 && checkRole(['bz'])" @click="qrfz(scope.row)"
                 v-hasPermi="['business:drugFormFill:qrfz']">{{
                   $t('page.business.study.studyFormFill.qrfz') }}</el-button>
               <!-- 观察 -->
@@ -169,6 +169,8 @@
 </template>
 
 <script>
+import { studySubject_isQa } from "@/api/business/study/studySubject"
+import { checkPermi, checkRole } from "@/utils/permission";
 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";
@@ -214,6 +216,7 @@ export default {
   components: { Ghgsr, Fh, Fz, Bj, Xq, Qrfz, Sy, Jq, Gc, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isQa:false,
       leader: null,
       showFh: false,
       showAudit: false,
@@ -243,8 +246,15 @@ export default {
       currentRow: null
     }
   },
-  created() { },
+  created() {this.getIsQa() },
   methods: {
+    checkPermi,
+    checkRole,
+    getIsQa() {
+      studySubject_isQa().then(response => {
+        this.isQa=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -172,6 +172,7 @@
 </template>
 
 <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'
@@ -205,6 +206,7 @@ export default {
         this.searchForm.studyMc = newVal.name
         this.searchForm.studyId = newVal.id
         this.leader = newVal.leader
+        this.studyStatus = newVal.status
         this.search()
       },
       immediate: true,
@@ -221,6 +223,7 @@ export default {
       openXz: false,
       open: false,
       leader: null,
+      studyStatus: null,
       showAudit: false,
       showEdit: false,
       showDetail: false,
@@ -264,6 +267,8 @@ export default {
   },
   created() { },
   methods: {
+    checkPermi,
+    checkRole,
     copy() {
       this.$modal.loading()
       public_studyList().then(response => {
@@ -385,7 +390,7 @@ export default {
 
     sdsy() {
       this.$modal.loading()
-      nonTrial_checkSd({
+      drug_checkSd({
         study:{id:this.study.id},
       }).then(() => {
         this.$refs.fsySignRef.show(this.$t('page.business.study.drug.sdsy'),this.$t('page.business.study.drug.sdsy'))
@@ -398,12 +403,12 @@ export default {
     },
     doSd(sign){
       this.$modal.loading()
-      nonTrial_sd({
+      drug_sd({
         study:{id:this.study.id},
         sign:sign
       }).then(() => {
         this.$refs.fsySignRef.cancel()
-        this.getStudyInfo()
+        this.studyStatus = 5
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -407,7 +407,7 @@ export default {
         sign:sign
       }).then(() => {
         this.$refs.fsySignRef.cancel()
-        this.getStudyInfo()
+        this.studyStatus = 5
       }).finally(() => {
         this.$modal.closeLoading()
       })

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

@@ -42,7 +42,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:studyFormPlan:xz']">{{
+            <el-button type="primary" icon="el-icon-plus" @click="add()" v-hasPermi="['business:studyFormPlan:xz']" v-if="id==leader">{{
               $t('page.business.study.studyFormPlan.xzpzjhb') }}</el-button>
           </el-col>
         </el-row>
@@ -57,18 +57,17 @@
             <template slot-scope="scope">
               <span v-if="scope.row.bdzt === 1">{{ $t('page.business.study.studyFormPlan.tbz') }}</span>
               <span v-if="scope.row.bdzt === 3">{{ $t('page.business.study.studyFormPlan.ytj') }}</span>
-              <span v-if="scope.row.bdzt === 7">{{ $t('page.business.study.studyFormPlan.ywc') }}</span>
               <span v-if="scope.row.bdzt === 5">{{ $t('page.business.study.studyFormPlan.ywcfh') }}</span>
             </template>
           </el-table-column>
           <el-table-column :label="$t('form.operate')" align="left" fixed="right" width="200">
             <template slot-scope="scope">
-              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）;7：已完成 -->
+              <!-- 表单状态：1：填报中；3：已提交；5：已完成（经复核）; -->
               <!-- 详情 -->
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:studyFormPlan:xq']">{{
                 $t('form.detail') }}</el-button>
               <!-- 编辑 -->
-              <el-button type="text" v-if="scope.row.bdzt === 1 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+              <el-button type="text" v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 5) && id==scope.row.userId"
                 @click="edit(scope.row)" v-hasPermi="['business:studyFormPlan:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
@@ -77,11 +76,11 @@
                   $t('page.business.study.studyFormPlan.fh') }}</el-button>
               <!-- 更换归属人 -->
               <el-button type="text"
-                v-if="scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5 || scope.row.bdzt === 7"
+                v-if="(scope.row.bdzt === 1 || scope.row.bdzt === 3 || scope.row.bdzt === 5) && id==scope.row.subjectLeader"
                 @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormPlan:ghgsr']">{{
                   $t('page.business.study.studyFormPlan.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" v-if="scope.row.bdzt === 5 || scope.row.bdzt === 7" @click="sy(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 5 && (isQa || id==leader)" @click="sy(scope.row)"
                 v-hasPermi="['business:studyFormPlan:sy']">{{
                   $t('page.business.study.studyFormPlan.sy') }}</el-button>
             </template>
@@ -108,6 +107,7 @@
 </template>
 
 <script>
+import { studySubject_isQa } from "@/api/business/study/studySubject"
 import { studyFormPlan_list } from '@/api/business/study/studyFormPlan'
 import Bj from "./jhbd/Bj";
 import Xq from "./jhbd/Xq";
@@ -149,6 +149,7 @@ export default {
   components: { Ghgsr, Fh, Bj, Xq, Sy, SelectDeptUser, SelectDeptUserDialog },
   data() {
     return {
+      isQa:false,
       leader: null,
       showFh: false,
       showAudit: false,
@@ -174,8 +175,13 @@ export default {
       currentRow: null
     }
   },
-  created() { },
+  created() {this.getIsQa()  },
   methods: {
+    getIsQa() {
+      studySubject_isQa().then(response => {
+        this.isQa=response.data
+      })
+    },
     ghgsr(row) {
       this.currentRow = row
       this.$refs.selectDeptUserDialog.show(null, null)

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

@@ -27,7 +27,7 @@ export default {
       immediate: true,
       deep:true,
       handler(v) {
-        this.studyInfo = v
+        this.studyInfo = _.merge({studySubjectId:''},v)
       },
     },
   },
@@ -37,7 +37,9 @@ export default {
   data() {
     return {
       showDetail:false,
-      studyInfo:{}
+      studyInfo:{
+        studySubjectId:''
+      }
     }
   },
   created() {},

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

@@ -28,7 +28,7 @@ export default {
       deep: true,
       immediate: true,
       handler(v) {
-        this.studyInfo = v
+        this.studyInfo = _.merge({studySubjectId:''},v)
       },
     },
   },
@@ -38,7 +38,9 @@ export default {
   data() {
     return {
       showDetail: false,
-      studyInfo: {}
+      studyInfo:{
+        studySubjectId:''
+      }
     }
   },
   created() { },

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

@@ -27,7 +27,7 @@ export default {
       immediate: true,
       deep:true,
       handler(v) {
-        this.studyInfo = v
+        this.studyInfo = _.merge({studySubjectId:''},v)
       },
     },
   },
@@ -37,7 +37,9 @@ export default {
   data() {
     return {
       showDetail:false,
-      studyInfo:{}
+      studyInfo:{
+        studySubjectId:''
+      }
     }
   },
   created() {},

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

@@ -122,7 +122,7 @@
                 @click="ghgsr(scope.row)" v-hasPermi="['business:studyFormFill:ghgsr']">{{
                   $t('page.business.study.studyFormFill.ghgsr') }}</el-button>
               <!-- 审阅 -->
-              <el-button type="text" v-if="(scope.row.bdzt === 5 || scope.row.bdzt === 7) && (isQa || id==scope.row.studyLeader)" @click="sy(scope.row)"
+              <el-button type="text" v-if="(scope.row.bdzt === 5 || scope.row.bdzt === 7) && (isQa || id==leader)" @click="sy(scope.row)"
                 v-hasPermi="['business:studyFormFill:sy']">{{
                   $t('page.business.study.studyFormFill.sy') }}</el-button>
               <!-- 废止 -->
@@ -130,7 +130,7 @@
                 v-hasPermi="['business:studyFormFill:fz']">{{
                   $t('page.business.study.studyFormFill.fz') }}</el-button>
               <!-- 确认废止 -->
-              <el-button type="text" v-if="scope.row.bdzt === 9 && id==scope.row.studyLeader" @click="qrfz(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 9 && id==leader" @click="qrfz(scope.row)"
                 v-hasPermi="['business:studyFormFill:qrfz']">{{
                   $t('page.business.study.studyFormFill.qrfz') }}</el-button>
               <!-- 观察 todo 观察按钮只在系统模板为细胞复苏记录表才展示) -->