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

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

@@ -110,7 +110,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:drugFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3&&id!=scope.row.userId" @click="fh(scope.row)"
                 v-hasPermi="['business:drugFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

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

@@ -96,13 +96,13 @@
                 <template>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:drugFormPre:sh']"
-                    v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
+                    v-if="scope.row.bdzt === 3&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:drugFormPre:sh']"
-                  v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
+                  v-if="scope.row.bdzt === 3&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
               </template>
                <template v-if="scope.row.bdzt === 5&&id==scope.row.userId">
                  <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi') }}</el-button>

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

@@ -111,7 +111,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:nonTrialFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3&&id!=scope.row.userId" @click="fh(scope.row)"
                 v-hasPermi="['business:nonTrialFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

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

@@ -97,13 +97,13 @@
                 <template>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:nonTrialFormPre:sh']"
-                    v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
+                    v-if="scope.row.bdzt === 3&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:nonTrialFormPre:sh']"
-                  v-if="scope.row.bdzt === 3">{{ $t('page.business.form.audit') }}</el-button>
+                  v-if="scope.row.bdzt === 3&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
               </template>
               <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
                 <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')

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

@@ -72,7 +72,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:studyFormPlan:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3&&id!=scope.row.userId" @click="fh(scope.row)"
                 v-hasPermi="['business:studyFormPlan:fh']">{{
                   $t('page.business.study.studyFormPlan.fh') }}</el-button>
               <!-- 更换归属人 -->

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

@@ -93,7 +93,7 @@ export default {
     reset() {
       this.form = {
         id: null,
-        qmyy: $t('page.business.study.studyFormFill.ghgsr'),
+        qmyy: this.$t('page.business.study.studyFormFill.ghgsr'),
         userId: null,
         UserMc: null,
         remark: null,

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

@@ -111,7 +111,7 @@
                 @click="edit(scope.row)" v-hasPermi="['business:studyFormFill:bj']">{{
                   $t('form.edit') }}</el-button>
               <!-- 复核 -->
-              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject" @click="fh(scope.row)"
+              <el-button type="text" v-if="scope.row.bdzt === 3 && isMatchSubject&&id!=scope.row.userId" @click="fh(scope.row)"
                 v-hasPermi="['business:studyFormFill:fh']">{{
                   $t('page.business.study.studyFormFill.fh') }}</el-button>
               <!-- 加签 -->

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

@@ -94,13 +94,13 @@
                 <template>
                   <!-- 有权限审核 -->
                   <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                    v-if="scope.row.bdzt === 3 && isMatchSubject">{{ $t('page.business.form.audit') }}</el-button>
+                    v-if="scope.row.bdzt === 3 && isMatchSubjectt&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
                 </template>
               </template>
               <template v-else>
                 <!-- 有权限审核 -->
                 <el-button type="text" @click="audit(scope.row)" v-hasPermi="['business:studyFormPre:sh']"
-                  v-if="scope.row.bdzt === 3 && isMatchSubject">{{ $t('page.business.form.audit') }}</el-button>
+                  v-if="scope.row.bdzt === 3 && isMatchSubject&&id!=scope.row.userId">{{ $t('page.business.form.audit') }}</el-button>
               </template>
               <template v-if="scope.row.bdzt === 5 && id == scope.row.userId">
                 <el-button type="text" @click="gb(scope.row)">{{ $t('page.business.study.studyFormPre.guanbi')