merge uat、受试者终止状态管理

src/views/trials/trials-panel/reading/dicoms/components/IVUS/QuestionList.vue

@@ -443,8 +443,8 @@ export default {
       if (item.Type === 'number') {
         this.limitBlur(item.Id, item.ValueType)
       }
-      if (question.Childrens.length > 0) {
-        this.resetChild(question.Childrens)
+      if (item.Childrens && item.Childrens.length > 0) {
+        this.resetChild(item.Childrens)
       }
     },
     resetChild(obj) {

src/views/trials/trials-panel/reading/dicoms/components/OCT/QuestionList.vue

@@ -436,10 +436,10 @@ export default {
     },
     formItemChange(val, question) {
       this.formChanged = true
-      if (item.Type === 'number') {
-        this.limitBlur(item.Id, item.ValueType)
+      if (question.Type === 'number') {
+        this.limitBlur(question.Id, question.ValueType)
       }
-      if (question.Childrens.length > 0) {
+      if (question.Childrens && question.Childrens.length > 0) {
         this.resetChild(question.Childrens)
       }
     },

src/views/trials/trials-panel/reading/reading-tracking/index.vue

@@ -205,6 +205,10 @@
               {{ `${scope.row.SubjectCode}/${scope.row.BlindSubjectCode}` }}
             </span>
             <span v-else>{{ scope.row.SubjectCode }}</span>
+            <!-- 终止 -->
+            <span v-if="scope.row.IsSubjectQuit" class="status-primary-circle">
+              {{ $t('trials:crcUpload:label:ISQ') }}
+            </span>
           </template>
         </el-table-column>
         <!-- 任务名称 -->
@@ -336,27 +340,29 @@
         <el-table-column fixed="right" :label="$t('common:action:action')" width="220">
           <template slot-scope="scope">
             <!-- 查看阅片结果 -->
-            <el-button :disabled="scope.row.ReadingTaskState !== 2" icon="el-icon-view" circle
-              :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
+            <el-button :disabled="scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit" icon="el-icon-view"
+              circle :title="$t('trials:reviewTrack:action:viewResults')" @click="lookReadingResults(scope.row)" />
             <!-- 申请重阅 -->
             <el-button :disabled="scope.row.ReadingCategory !== 1 ||
               (scope.row.TaskState !== 0 && scope.row.TaskState !== 5) ||
               scope.row.ReadingTaskState !== 2 ||
               scope.row.ReReadingApplyState === 2 ||
               scope.row.ReReadingApplyState === 4 ||
-              scope.row.ReReadingApplyState === 5
+              scope.row.ReReadingApplyState === 5 || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-collection" circle :title="$t('trials:reviewTrack:action:applyReread')"
               @click="openApplyReReading(scope.row)" />
             <!-- 退回重阅历史 -->
-            <el-button :disabled="!scope.row.ReReadingApplyState" icon="el-icon-toilet-paper" v-if="!isDoc" circle
+            <el-button
+              :disabled="!scope.row.ReReadingApplyState || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)"
+              icon="el-icon-toilet-paper" v-if="!isDoc" circle
               :title="$t('trials:reviewTrack:action:backToRereadHistory')" @click="reReadingHistory(scope.row, 1)" />
             <!-- 退回 -->
             <el-button :disabled="scope.row.ReadingTaskState === 2 ||
               scope.row.ReadingCategory !== 1 ||
               scope.row.TaskState !== 0 ||
-              scope.row.IsManualGeneration
+              scope.row.IsManualGeneration || (scope.row.ReadingTaskState !== 2 && scope.row.IsSubjectQuit)
               " v-if="
                 hasPermi(['trials:trials-panel:readingTracking:edit']) && !isDoc
               " icon="el-icon-back" circle :title="$t('trials:reviewTrack:action:back')"
@@ -375,6 +381,12 @@
       <!-- 分页组件 -->
       <pagination class="page" :total="total" :page.sync="searchData.PageIndex" :limit.sync="searchData.PageSize"
         @pagination="getList" />
+      <div class="remark">
+        <span class="status-primary-circle">
+          {{ $t('trials:crcUpload:label:ISQ') }}
+        </span>
+        <span>: {{ $t('trials:crcUpload:label:IsSubjectQuit') }}</span>
+      </div>
       <!-- 阅片任务规则 -->
       <el-dialog title="阅片任务规则" :visible.sync="ReadingRulesVisible" width="500px" :close-on-click-modal="false"
         custom-class="base-dialog-wrapper">
@@ -1373,6 +1385,25 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
+.remark {
+  position: absolute;
+  left: 5px;
+  bottom: 7px;
+  font-size: 12px;
+}
+
+.status-primary-circle {
+  display: inline-block;
+  width: 20px;
+  height: 20px;
+  text-align: center;
+  line-height: 18px;
+  border-radius: 50%;
+  border: 1px solid #f56c6c;
+  color: #f56c6c;
+  font-size: 10px;
+}
+
 .title {
   line-height: 40px;
   font-weight: bold;

src/views/trials/trials-panel/visit/crc-upload/components/visitForm.vue

@@ -53,25 +53,25 @@
       <el-form-item v-if="!form.IsBaseLine && otherInfo.IsPDProgressView" :label="$t('trials:crcUpload:form:pd')">
         <el-radio-group v-model="form.PDState" :disabled="data.SubmitState * 1 === 2" @change="handlePdStateChange">
           <el-radio v-for="item of $d.YesOrNoForInt" :key="`PDState${item.value}`" :label="item.value">{{ item.label
-            }}</el-radio>
+          }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- 是否末次评估 -->
       <el-form-item v-if="!form.IsBaseLine" :label="$t('trials:crcUpload:form:isFinalAssessment')">
         <el-radio-group v-model="form.IsFinalVisit" style="width:100%" @change="handleIsFinalVisitChange">
           <el-radio v-for="item of $d.YesOrNo" :key="`IsFinalVisit${item.value}`" :label="item.value">{{ item.label
-            }}</el-radio>
+          }}</el-radio>
         </el-radio-group>
         <span v-if="showFinalVisitWarning" style="color:red">
           *{{ $t('trials:crcUpload:form:setFinalAssessment') }}
         </span>
       </el-form-item>
-      <!-- 是否失访v-if="!form.IsBaseLine" -->
-      <el-form-item :label="$t('trials:crcUpload:form:isLostFollowUp')">
+      <!-- 是否失访 -->
+      <el-form-item :label="$t('trials:crcUpload:form:isLostFollowUp')" v-if="!form.IsBaseLine">
         <el-radio-group v-model="form.IsLostVisit"
           :disabled="form.IsFinalVisit || data.SubmitState * 1 === 2 || isUploadedData || form.PDState === 1">
           <el-radio v-for="item of $d.YesOrNo" :key="`IsLostVisit${item.value}`" :label="item.value">{{ item.label
-            }}</el-radio>
+          }}</el-radio>
         </el-radio-group>
       </el-form-item>
     </div>