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

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

@@ -105,7 +105,7 @@
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:drugFormFill: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 || scope.row.bdzt === 7) && id==scope.row.userId"
                 @click="edit(scope.row)" v-hasPermi="['business:drugFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->

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

@@ -53,6 +53,8 @@
             <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">{{ $t('page.business.study.drug.sdsy') }}</el-button>
           </el-col>
         </el-row>
 
@@ -163,11 +165,14 @@
       append-to-body :close-on-click-modal="false">
       <TemplateTable ref="templateTable" :sn="formPreview.templateSn" fillType="preFill" />
     </el-dialog>
+
+    <Sign ref="fsySignRef" @callback="doSign" />
   </div>
 
 </template>
 
 <script>
+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';
@@ -175,6 +180,7 @@ import Bj from "@/views/business/study/comp/ytbd/Bj";
 import Xq from "@/views/business/study/comp/ytbd/Xq";
 import Sh from "@/views/business/study/comp/ytbd/Sh";
 import SelectDeptUser from '@/views/business/comps/select/SelectDeptUser';
+import Sign from './sign.vue'
 import moment from "moment";
 import { mapGetters } from 'vuex'
 export default {
@@ -205,7 +211,7 @@ export default {
       deep: true
     }
   },
-  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable },
+  components: { Bj, Xq, Sh, SelectDeptUser, TemplateTable,Sign },
   data() {
     return {
       formPreview: {
@@ -369,13 +375,39 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row)
+      this.$refs.Xq.show(row,true)
     },
     audit(row) {
       this.showAudit = true
       this.$emit('showDetail', this.showAudit)
       this.$refs.Sh.show(row)
     },
+
+    sdsy() {
+      this.$modal.loading()
+      nonTrial_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'))
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
+    doSign(val){
+      this.doSd(val)
+    },
+    doSd(sign){
+      this.$modal.loading()
+      nonTrial_sd({
+        study:{id:this.study.id},
+        sign:sign
+      }).then(() => {
+        this.$refs.fsySignRef.cancel()
+        this.getStudyInfo()
+      }).finally(() => {
+        this.$modal.closeLoading()
+      })
+    },
   }
 }
 </script>

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

@@ -105,7 +105,7 @@
               <el-button type="text" @click="detail(scope.row)" v-hasPermi="['business:nonTrialFormFill: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 || scope.row.bdzt === 7) && id==scope.row.userId"
                 @click="edit(scope.row)" v-hasPermi="['business:nonTrialFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
@@ -118,22 +118,22 @@
                   $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:nonTrialFormFill: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:nonTrialFormFill: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:nonTrialFormFill: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:nonTrialFormFill:qrfz']">{{
                   $t('page.business.study.studyFormFill.qrfz') }}</el-button>
-              <!-- 观察 -->
+              <!-- 观察 todo 观察按钮只在系统模板为细胞复苏记录表才展示) -->
               <el-button type="text" v-if="scope.row.bdzt === 1" @click="gc(scope.row)"
                 v-hasPermi="['business:nonTrialFormFill:gc']">{{
                   $t('page.business.study.studyFormFill.gc') }}</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/nonTrial/comp/ytbdList.vue

@@ -380,7 +380,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row)
+      this.$refs.Xq.show(row,true)
     },
     audit(row) {
       this.showAudit = true

src/views/business/study/comp/ytbd.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/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 && isMatchSubject" @click="openApprove = true">{{
+          <el-button type="primary" v-if="form.bdzt === 5 && (fromNon || isMatchSubject)" @click="openApprove = true">{{
             $t('page.business.study.studyFormPre.tb') }}</el-button>
         </div>
       </div>
@@ -156,7 +156,9 @@ export default {
         pageNum: 1,
         formId: null,
         pageSize: 10,
-      }
+      },
+
+      fromNon:false//是否是从非试验+麻精药
     }
   },
   computed: {
@@ -204,7 +206,8 @@ export default {
       }
       this.resetForm("form")
     },
-    show(row) {
+    show(row,fromNon) {
+      this.fromNon = fromNon
       this.reset()
       this.$modal.loading()
       this.formApprove.id = row.id

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

@@ -380,7 +380,7 @@ export default {
     detail(row) {
       this.showDetail = true
       this.$emit('showDetail', this.showDetail)
-      this.$refs.Xq.show(row)
+      this.$refs.Xq.show(row,false)
     },
     audit(row) {
       this.showAudit = true