Merge branch 'uat'

src/views/trials/trials-panel/visit/qc-check/components/qualityAssurance.vue

@@ -822,8 +822,7 @@
         {{ $t('trials:audit:button:reviewTask') }}
       </el-button>
       <!-- 指派 -->
-      <el-button :disabled="isAudit" v-if="SecondReviewState <= 0" size="small" type="primary" round
+      <el-button :disabled="isAudit" size="small" type="primary" round @click="handleAssign">
-        @click="handleAssign">
         {{ $t('trials:audit:button:assign') }}
       </el-button>
       <!-- 保存 -->

src/views/trials/trials-panel/visit/qc-check/index.vue

@@ -348,8 +348,9 @@
               <!--复核 -->
               <el-button v-if="scope.row.SecondReviewState === 1 && scope.row.AuditState * 1 === 8"
                 v-hasPermi="['trials:trials-panel:visit:qc-check:reviewTask']"
-                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit-outline"
+                :title="$t('trials:qcCheck:button:reviewTask')" circle icon="el-icon-edit"
-                :disabled="scope.row.IsImageBackApplying" @click="reviewTask(scope.row)" />
+                :disabled="(scope.row.CurrentActionUserId && scope.row.CurrentActionUserId !== userId) || scope.row.IsImageBackApplying"
+                @click="reviewTask(scope.row)" />
               <!-- 领取 -->
               <!-- ((scope.row.AuditState*1 === 3 || scope.row.AuditState*1 === 5)) ||(!scope.row.IsTake && (scope.row.AuditState*1 === 4 || scope.row.AuditState*1 === 6)) -->
               <el-button v-hasPermi="['trials:trials-panel:visit:qc-check:receive']"