阅片单元新增配置是否预设

src/views/dictionary/checkConfig/index.vue

@@ -191,6 +191,17 @@
               </el-radio-group>
             </el-form-item>
           </el-col>
+          <el-col :span="24">
+            <el-form-item>
+              <span slot="label">
+                适用的标准
+              </span>
+              <el-select v-model="form.ApplyCriterionList" placeholder="" clearable multiple>
+                <el-option v-for="item in $d.CriterionType" :key="item.id" :label="item.label" :value="item.value">
+                </el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
           <el-col v-show="form.ConfigType === 'C' && title !== '复制'" :span="12">
             <el-form-item>
               <span slot="label">
@@ -1008,6 +1019,7 @@ export default {
         ValueCN: null,
         EnumType: '',
         IsShowByTrialConfig: false,
+        ApplyCriterionList: [],
         TrialConfigRelyFieldName: null,
         Identification: null,
         IsForwardPosition: false,

src/views/login/index.vue

@@ -94,6 +94,10 @@
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
+          <div class="PrivacyPolicy">
+            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
+            <span style="cursor: pointer;color:#428bca">《{{ $t('login:message:PrivacyPolicyName') }}》</span>
+          </div>
         </el-form>
       </div>
     </div>

src/views/reviewers/curriculumVitae/components/info/clinicalTrials.vue

@@ -79,10 +79,7 @@
       <el-table-column prop="date" :label="$t('common:action:action')">
         <template
           slot-scope="scope"
-          v-if="
+          v-if="scope.row.ExperienceDataType != 3"
-            scope.row.ExperienceDataType != 2 &&
-            scope.row.ExperienceDataType != 3
-          "
         >
           <el-button
             type="text"

src/views/reviewers/curriculumVitae/index.vue

@@ -2,14 +2,8 @@
   <div class="curriculumVitae" v-loading="loading">
     <div class="leftMenu">
       <div class="title">{{ $t('curriculumVitae:menu:title') }}</div>
-      <el-menu
+      <el-menu :default-active="activeIndex" class="el-menu-demo" mode="vertical" @select="handleSelect"
-        :default-active="activeIndex"
+        background-color="#eee" active-text-color="#000">
-        class="el-menu-demo"
-        mode="vertical"
-        @select="handleSelect"
-        background-color="#eee"
-        active-text-color="#000"
-      >
         <el-menu-item index="info">
           {{ $t('curriculumVitae:menu:info') }}
         </el-menu-item>
@@ -70,94 +64,58 @@
             </el-button>
           </div>
         </div>
+        <!--个人信息-->
         <div class="box" id="info">
-          <info
+          <info :DATA="{
-            :DATA="{
             ...reviewerData.BasicInfoView,
             ...reviewerData.EmploymentView,
-            }"
+          }" :reviewerId.sync="reviewerId" :isEN="isEN" @getInfo="getDetail" />
-            :reviewerId.sync="reviewerId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--概述-->
         <div class="box" id="summarize">
-          <summarize
+          <summarize :DATA="{
-            :DATA="{
             ...reviewerData.SummarizeInfo,
-            }"
+          }" :reviewerId.sync="reviewerId" :trialId="trialId" :isEN="isEN" @getInfo="getDetail" />
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            :isEN="isEN"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--专业-->
         <div class="box" id="specialty">
-          <specialty
+          <specialty :DATA="{
-            :DATA="{
             ...reviewerData.SpecialtyView,
-            }"
+          }" :isEN="isEN" :reviewerId.sync="reviewerId" @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--教育经历-->
         <div class="box" id="educationalExperience">
-          <educationalExperience
+          <educationalExperience :DATA="reviewerData.EducationList" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="reviewerData.EducationList"
+            @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--进修培训-->
         <div class="box" id="continuingTraining">
-          <continuingTraining
+          <continuingTraining :DATA="reviewerData.PostgraduateList" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="reviewerData.PostgraduateList"
+            @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--科研课题-->
         <div class="box" id="scientificResearchProject">
-          <scientificResearchProject
+          <scientificResearchProject :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            :reviewerId.sync="reviewerId" @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--临床试验-->
         <div class="box" id="clinicalTrials">
-          <clinicalTrials
+          <clinicalTrials :DATA="{ ...reviewerData.TrialExperienceView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.TrialExperienceView }"
+            :trialId="trialId" @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            :trialId="trialId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--gcp证书-->
         <div class="box" id="treatise">
-          <treatise
+          <treatise :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
+        <!--其他相关经历-->
         <div class="box" id="other">
-          <other
+          <other :DATA="{ ...reviewerData.ResearchPublicationView }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.ResearchPublicationView }"
+            @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
         <div class="box" id="pay">
-          <pay
+          <pay :DATA="{ ...reviewerData.PaymentModeInfo }" :isEN="isEN" :reviewerId.sync="reviewerId"
-            :DATA="{ ...reviewerData.PaymentModeInfo }"
+            @getInfo="getDetail" />
-            :isEN="isEN"
-            :reviewerId.sync="reviewerId"
-            @getInfo="getDetail"
-          />
         </div>
         <div class="box" id="setting" v-if="isPM">
           <setting :isEN="isEN" :reviewerId.sync="reviewerId" />
@@ -167,38 +125,19 @@
         <!--简历附件-->
         <curriculum :isEN="isEN" :reviewerId.sync="reviewerId" />
         <!--资历证书-->
-        <certificate
+        <certificate :DATA="reviewerData.AttachmentList" :isEN="isEN" :reviewerId.sync="reviewerId"
-          :DATA="reviewerData.AttachmentList"
+          @getInfo="getDetail" />
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
         <!--协议-->
-        <agreement
+        <agreement :DATA="reviewerData.AttachmentList" :isEN="isEN" :isPM="isPM" :reviewerId.sync="reviewerId"
-          :DATA="reviewerData.AttachmentList"
+          @getInfo="getDetail" />
-          :isEN="isEN"
-          :isPM="isPM"
-          :reviewerId.sync="reviewerId"
-          @getInfo="getDetail"
-        />
       </div>
     </div>
     <el-dialog :visible.sync="visible" fullscreen append-to-body>
       <div style="height: 100%; overflow: auto">
-        <preview
+        <preview :isEN="isEN" :reviewerId.sync="reviewerId" :trialId="trialId" :isAll="isAll" v-if="visible" />
-          :isEN="isEN"
-          :reviewerId.sync="reviewerId"
-          :trialId="trialId"
-          :isAll="isAll"
-          v-if="visible"
-        />
       </div>
     </el-dialog>
-    <holiday
+    <holiday v-if="holidayVisible" :reviewerId.sync="reviewerId" :visible.sync="holidayVisible" />
-      v-if="holidayVisible"
-      :reviewerId.sync="reviewerId"
-      :visible.sync="holidayVisible"
-    />
     <!-- <setting
       v-if="settingVisible"
       :reviewerId.sync="reviewerId"
@@ -383,12 +322,14 @@ export default {
   position: relative;
   height: 100%;
 }
+
 .title {
   line-height: 50px;
   background-color: #fff;
   text-align: center;
   font-weight: bold;
 }
+
 .leftMenu {
   position: absolute;
   left: 0;
@@ -397,12 +338,15 @@ export default {
   height: 100%;
   background-color: #eee;
   border-right: 1px solid #eee;
+
   ::v-deep .el-menu {
     padding: 5px 5px 0;
   }
+
   ::v-deep .is-active {
     background-color: #fff !important;
     position: relative;
+
     &::before {
       display: block;
       content: '';
@@ -415,6 +359,7 @@ export default {
     }
   }
 }
+
 .main {
   width: calc(100% - 300px);
   height: 100%;
@@ -423,9 +368,11 @@ export default {
   display: flex;
   align-items: flex-start;
 }
+
 .content {
   width: calc(100% - 300px);
   padding: 0 50px 0 20px;
+
   .title {
     line-height: 50px;
     background-color: #fff;
@@ -434,35 +381,42 @@ export default {
     justify-content: space-between;
   }
 }
+
 .box {
   border: 1px solid #ddd;
   border-radius: 3px;
   padding: 15px;
   margin-bottom: 20px;
 }
+
 ::v-deep .noData {
   color: #909399;
   text-align: center;
 }
+
 .rightFile {
   width: 300px;
   padding-right: 10px;
+
   ::v-deep .title {
     line-height: 50px;
     background-color: #fff;
     text-align: left;
     font-weight: bold;
   }
+
   ::v-deep .fileBox {
     background-color: #eee;
     padding: 10px;
     font-size: 14px;
     border-radius: 3px;
   }
+
   ::v-deep .file_title {
     line-height: 40px;
     font-weight: bold;
   }
+
   ::v-deep .btnBox {
     display: flex;
     align-items: center;
@@ -474,17 +428,23 @@ export default {
     width: 100%;
     display: flex;
     margin-bottom: 10px;
+
     .name {
       width: 70%;
-      white-space: nowrap; /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
+      white-space: nowrap;
-      text-overflow: ellipsis; /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      /* 文本不会换行，会在同一行内继续，直到遇到<br>标签为止 */
-      overflow: hidden; /* 隐藏溢出容器的文本 */
+      text-overflow: ellipsis;
+      /* 当文本溢出包含它的容器时，显示省略号(...)来表示被截断的文本 */
+      overflow: hidden;
+      /* 隐藏溢出容器的文本 */
     }
+
     i {
       cursor: pointer;
       margin: 3px;
       color: #409eff;
     }
+
     .disable {
       cursor: not-allowed;
       color: #909399;

src/views/trials/trials-panel/reading/dicoms/components/AdditionalAssessment.vue

@@ -1,10 +1,5 @@
 <template>
-  <el-form
+  <el-form v-if="isRender" ref="assessmentForm" :model="form" size="small">
-    v-if="isRender"
-    ref="assessmentForm"
-    :model="form"
-    size="small"
-  >
     <div class="base-dialog-body">
       <!-- <div v-for="qs in questions" :key="qs.Id">
         <h4 v-if="qs.Type === 'group'">{{ qs.GroupName }}</h4>
@@ -42,14 +37,9 @@
           </el-select>
         </el-form-item>
       </div> -->
-      <AssessmentFormItem
+      <AssessmentFormItem v-for="question of questions" :key="question.Id" :question="question" :question-form="form"
-        v-for="question of questions"
+        :readingTaskState="readingTaskState" @setFormItemData="setFormItemData"
-        :key="question.Id"
+        @resetFormItemData="resetFormItemData" />
-        :question="question"
-        :question-form="form"
-        @setFormItemData="setFormItemData"
-        @resetFormItemData="resetFormItemData"
-      />
 
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
@@ -57,11 +47,7 @@
         <el-button size="small" @click="handleCancel">
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
+        <el-button size="small" type="primary" @click="handleSave">
-          size="small"
-          type="primary"
-          @click="handleSave"
-        >
           {{ $t('common:button:save') }}
         </el-button>
       </el-form-item>
@@ -85,6 +71,10 @@ export default {
       default() {
         return []
       }
+    },
+    readingTaskState: {
+      type: Number,
+      default: 0
     }
   },
   data() {

src/views/trials/trials-panel/reading/dicoms/components/AssessmentFormItem.vue

@@ -1,67 +1,39 @@
 <template>
   <div>
-    <div
+    <div v-if="!!question.GroupName && question.Type === 'group'">
-      v-if="!!question.GroupName && question.Type==='group'"
-    >
       <h4 style="color: #ddd;padding: 5px 0px;margin: 0;font-size: 15px;">
-        {{ language==='en'?question.GroupEnName:question.GroupName }}
+        {{ language === 'en' ? question.GroupEnName : question.GroupName }}
       </h4>
     </div>
     <template v-else>
-      <el-form-item
+      <el-form-item :label="`${language === 'en' ? question.QuestionEnName : question.QuestionName}`"
-        :label="`${language==='en'?question.QuestionEnName:question.QuestionName}`"
+        :prop="question.Id" :rules="[
-        :prop="question.Id"
+          {
-        :rules="[
+            required: true,
-          { required: true,
+            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']
-            message: $t('common:ruleMessage:select'), trigger: ['blur', 'change']},
+          },
-        ]"
+        ]" :class="[question.Type === 'group' ? 'mb' : '']">
-        :class="[question.Type==='group'?'mb':'']"
-      >
         <!-- 下拉框 -->
-        <el-select
+        <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-          v-if="question.Type==='select'"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
-          v-model="questionForm[question.Id]"
-          clearable
-          @change="((val)=>{formItemChange(val, question)})"
-        >
           <template v-if="question.DictionaryCode">
-            <el-option
+            <el-option v-for="item of $d[question.DictionaryCode]" :key="item.id" :value="String(item.value)"
-              v-for="item of $d[question.DictionaryCode]"
+              :label="item.label" />
-              :key="item.id"
-              :value="String(item.value)"
-              :label="item.label"
-            />
           </template>
           <template v-else>
-            <el-option
+            <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val" :value="val" />
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-              :value="val"
-            />
           </template>
         </el-select>
         <!-- 单选 -->
-        <el-radio-group
+        <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-          v-if="question.Type==='radio'"
+          @change="((val) => { formItemChange(val, question) })" :disabled="readingTaskState > 2">
-          v-model="questionForm[question.Id]"
-          @change="((val)=>{formItemChange(val, question)})"
-        >
           <template v-if="question.DictionaryCode">
-            <el-radio
+            <el-radio v-for="item of $d[question.DictionaryCode]" :key="item.id" :label="String(item.value)">
-              v-for="item of $d[question.DictionaryCode]"
-              :key="item.id"
-              :label="String(item.value)"
-            >
               {{ item.label }}
             </el-radio>
           </template>
           <template v-else-if="question.TypeValue">
-            <el-radio
+            <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
-              v-for="val in question.TypeValue.split('|')"
-              :key="val"
-              :label="val"
-            >
               {{ val }}
             </el-radio>
           </template>
@@ -69,14 +41,8 @@
       </el-form-item>
     </template>
 
-    <AssessmentFormItem
+    <AssessmentFormItem v-for="(item) in question.Childrens" :key="item.Id" :question="item"
-      v-for="(item) in question.Childrens"
+      :question-form="questionForm" @setFormItemData="setFormItemData" @resetFormItemData="resetFormItemData" />
-      :key="item.Id"
-      :question="item"
-      :question-form="questionForm"
-      @setFormItemData="setFormItemData"
-      @resetFormItemData="resetFormItemData"
-    />
   </div>
 </template>
 <script>
@@ -95,6 +61,10 @@ export default {
       default() {
         return []
       }
+    },
+    readingTaskState: {
+      type: Number,
+      default: 0
     }
   },
   data() {
@@ -139,7 +109,7 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.mb{
+.mb {
   margin-bottom: 0px;
 }
 </style>

src/views/trials/trials-panel/reading/dicoms/components/ReportPage.vue

@@ -5,87 +5,49 @@
         <!-- 电子影像病例报告表（eICRF） -->
         <h3 style="margin:0;padding:0;">{{ $t('trials:readingReport:title:eicrf') }}</h3>
         <div style="margin-left:auto">
-          <el-switch
+          <el-switch v-model="isShowDetail" :active-text="$t('trials:readingReport:title:expandDetails')"
-            v-model="isShowDetail"
+            :inactive-text="$t('trials:readingReport:title:collapseDetails')" style="margin-right:5px;"
-            :active-text="$t('trials:readingReport:title:expandDetails')"
+            @change="handleShowDetail" />
-            :inactive-text="$t('trials:readingReport:title:collapseDetails')"
+          <el-button type="primary" size="small" v-if="isBaseline && assessmentQuestions.length > 0"
-            style="margin-right:5px;"
+            @click="openAssessment">
-            @change="handleShowDetail"
+            <!-- 附加评估 -->
-          />
+            {{ $t('trials:readingReport:button:assessment') }}
-          <el-button
+          </el-button>
-            v-if="readingTaskState<2"
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="skipTask">
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
             <!-- 跳过 -->
             {{ $t('trials:readingReport:button:skip') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="getReportInfo(false)">
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="getReportInfo(false)"
-          >
             <!-- 刷新 -->
             {{ $t('trials:readingReport:button:refresh') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2 && CriterionType !== 10" type="primary" size="small"
-            v-if="readingTaskState<2 && CriterionType !== 10"
+            @click="handleSave(true)">
-            type="primary"
-            size="small"
-            @click="handleSave(true)"
-          >
             <!-- 保存 -->
             {{ $t('common:button:save') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="beforeLeave">
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="beforeLeave"
-          >
             <!-- 提交 -->
             {{ $t('common:button:submit') }}
           </el-button>
         </div>
       </div>
       <div ref="tableWrapper" style="height:100%;overflow-y: auto;">
-        <el-table
+        <el-table v-if="height" ref="reportList" :data="taskQuestions" row-key="Id" border
-          v-if="height"
+          :expand-row-keys="expandedRows" :height="height"
-          ref="reportList"
+          :tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }" size="mini">
-          :data="taskQuestions"
+          <el-table-column prop="" label="" show-overflow-tooltip width="350px">
-          row-key="Id"
-          border
-          :expand-row-keys="expandedRows"
-          :height="height"
-          :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
-          size="mini"
-        >
-          <el-table-column
-            prop=""
-            label=""
-            show-overflow-tooltip
-            width="350px"
-          >
             <template slot-scope="scope">
-              <span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}</span>
+              <span v-if="scope.row.QuestionName"
-              <span
+                :style="{ color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff' }">{{
-                v-else
+                  scope.row.QuestionName }}</span>
-                style="font-weight: bold;font-size: 16px;color: #f44336;"
+              <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
-              >
+                {{ language === 'en' ? scope.row.GroupEnName : scope.row.GroupName }}
-                {{ language==='en'?scope.row.GroupEnName:scope.row.GroupName }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column v-for="task in visitTaskList" :key="task.VisitTaskId" prop="date" show-overflow-tooltip
-            v-for="task in visitTaskList"
+            width="150px">
-            :key="task.VisitTaskId"
-            prop="date"
-
-            show-overflow-tooltip
-            width="150px"
-          >
             <template slot="header">
               <div v-if="task.IsCurrentTask">
                 <div>
@@ -102,58 +64,37 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff'}">
+              <span
-                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
+                :style="{ color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff' }">
+                <template
+                  v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13, 14, 15, 42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
-                  <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
+                  <template v-if="task.IsBaseLine && scope.row.QuestionType === 15">
-                    <el-select
+                    <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
-                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                      v-model="currentExistDisease" size="mini" @change="handleExistDiseaseChange">
-                      v-model="currentExistDisease"
+                      <el-option v-for="item of $d[scope.row.DictionaryCode]" :key="item.id" :value="item.value"
-                      size="mini"
+                        :label="item.label" />
-                      @change="handleExistDiseaseChange"
-                    >
-                      <el-option
-                        v-for="item of $d[ scope.row.DictionaryCode]"
-                        :key="item.id"
-                        :value="item.value"
-                        :label="item.label"
-                      />
                     </el-select>
                   </template>
                   <!-- 整体肿瘤评估（非基线可修改） -->
-                  <template v-else-if="!task.IsBaseLine && (scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42)">
+                  <template
-                    <el-select
+                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42)">
-                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                    <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
-                      v-model="currentEvaluateResult"
+                      v-model="currentEvaluateResult" size="mini" @change="handleEvaluateResultChange">
-                      size="mini"
-                      @change="handleEvaluateResultChange"
-                    >
                       <template v-if="CriterionType === 1 && tLesionCount">
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1 && item.value !== 3)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                       <template v-else-if="CriterionType === 1 && ntLesionCount">
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                       <template v-else>
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                     </el-select>
                   </template>
@@ -162,27 +103,23 @@
                   </template> -->
                   <!-- 访视点备注（是否存在疾病与系统不一致或者整体肿瘤评估与系统不一致时，必填） -->
                   <!-- tumorEvaluate && task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease) -->
-                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 ">
+                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType === 14">
                     <!-- v-if="tumorEvaluate && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease)" -->
                     <template>
                       <!-- 输入框 -->
-                      <el-input
+                      <el-input v-if="scope.row.Type === 'input'" v-model="currentTaskReason" size="mini"
-                        v-if="scope.row.Type==='input'"
+                        @change="evaluateReasonChange" />
-                        v-model="currentTaskReason"
+                      <el-input v-else-if="scope.row.Type === 'textarea'" v-model="currentTaskReason"
-                        size="mini"
+                        :autosize="{ minRows: 2, maxRows: 4 }" size="mini" maxlength="500"
-                        @change="evaluateReasonChange"
+                        @change="evaluateReasonChange" />
-                      />
-                      <el-input
-                        v-else-if="scope.row.Type==='textarea'"
-                        v-model="currentTaskReason"
-                        :autosize="{ minRows: 2, maxRows: 4}"
-                        size="mini"
-                        maxlength="500"
-                        @change="evaluateReasonChange"
-                      />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
+                      <p v-if="currentEvaluateResult !== tumorEvaluate"
-                      <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
+                        style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;"
+                        v-html="getWarningText()" />
+                      <p v-else-if="currentExistDisease !== isExistDisease"
+                        style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">
+                        {{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{
+                          $fd('ExistDisease', isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
                       </p>
                     </template>
                     <!-- <template v-else>
@@ -198,35 +135,50 @@
                   </template>
                 </template>
 
-                <template v-else-if="scope.row.QuestionType=== 15">
+                <template v-else-if="scope.row.QuestionType === 15">
-                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'IsGlobalChange')"
-                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                    :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'GlobalChangeAnswer'))}`"
+                    placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId])
+                    }}</span>
                   </el-tooltip>
                   <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
                 </template>
 
-                <template v-else-if="scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42">
+                <template v-else-if="scope.row.QuestionType === 13 || scope.row.QuestionType === 42">
-                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'IsGlobalChange')"
-                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                    :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'GlobalChangeAnswer'))}`"
+                    placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId])
+                    }}</span>
                   </el-tooltip>
                   <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
                 </template>
-                <template v-else-if="scope.row.QuestionType=== 22">
+                <template v-else-if="scope.row.QuestionType === 22">
-                  {{ scope.row.Answers[task.VisitTaskId] === '-1' ? $t('trials:readingReport:title:unknow') : scope.row.Answers[task.VisitTaskId] }}
+                  {{ scope.row.Answers[task.VisitTaskId] === '-1' ? $t('trials:readingReport:title:unknow') :
+                    scope.row.Answers[task.VisitTaskId] }}
                 </template>
 
                 <template v-else-if="scope.row.DictionaryCode">
                   {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
                 </template>
                 <template v-else-if="CriterionType === 10">
-                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}` }}
+                  {{
+                    isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                      `${scope.row.Answers[task.VisitTaskId]}`
+                  }}
                 </template>
                 <template v-else-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
                   {{ `${scope.row.Answers[task.VisitTaskId]}` }}
-                  <span v-if="scope.row.Answers[task.VisitTaskId] !== 'NA' && !isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))">{{ `${$fd('ValueUnit',scope.row.Unit)}` }}</span>
+                  <span
+                    v-if="scope.row.Answers[task.VisitTaskId] !== 'NA' && !isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))">{{
+                      `${$fd('ValueUnit', scope.row.Unit)}` }}</span>
                 </template>
                 <template v-else-if="scope.row.ValueType === 2">
-                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}%` }}
+                  {{
+                    isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                      `${scope.row.Answers[task.VisitTaskId]}%`
+                  }}
                 </template>
                 <template v-else-if="scope.row.Answers && scope.row.Answers.hasOwnProperty(task.VisitTaskId)">
                   {{ scope.row.Answers[task.VisitTaskId] }}
@@ -238,31 +190,17 @@
       </div>
     </el-card>
     <!-- 附加评估 -->
-    <el-dialog
+    <el-dialog v-if="additionalAssessmentsDig.visible" :visible.sync="additionalAssessmentsDig.visible"
-      v-if="additionalAssessmentsDig.visible"
+      :close-on-click-modal="false" :title="additionalAssessmentsDig.title" width="600px">
-      :visible.sync="additionalAssessmentsDig.visible"
+      <AdditionalAssessment :questions="assessmentQuestions" :visit-task-id="visitTaskId"
-      :close-on-click-modal="false"
+        @close="additionalAssessmentsDig.visible = false" @sign="sign" />
-      :title="additionalAssessmentsDig.title"
-      width="600px"
-    >
-      <AdditionalAssessment
-        :questions="assessmentQuestions"
-        :visit-task-id="visitTaskId"
-        @close="additionalAssessmentsDig.visible = false"
-        @sign="sign"
-      />
     </el-dialog>
     <!-- 签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -324,7 +262,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['language'])
+    ...mapGetters(['language']),
+    isBaseline() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false
+    }
   },
   watch: {
     taskQuestions() {
@@ -440,6 +382,7 @@ export default {
           this.setScrollTop()
         }
         this.loading = false
+        await this.getTaskAdditionalQuestion()
       } catch (e) {
         this.loading = false
         console.log(e)
@@ -651,6 +594,25 @@ export default {
         this.answerArr[idx].answer = val
       }
     },
+    async getTaskAdditionalQuestion() {
+      try {
+        const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+        this.assessmentQuestions = res.Result
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async openAssessment() {
+      try {
+        await this.getTaskAdditionalQuestion()
+        if (this.assessmentQuestions.length > 0) {
+          // 打开附加评估框
+          this.additionalAssessmentsDig.visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     async handleConfirm() {
       this.loading = true
       try {
@@ -776,7 +738,7 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
@@ -800,7 +762,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -810,7 +772,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -820,7 +782,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg3'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           reject()
           return
@@ -882,29 +844,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.report-wrapper{
+.report-wrapper {
 
   height: 100%;
   padding: 10px 0px;
   // background-color: #fff;
   background-color: #000;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .report-header{
+
+  .report-header {
     display: flex;
   }
-  .el-card{
+
-    display:flex;flex-direction: column;height: 100%;
+  .el-card {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
     background-color: #000;
     color: #ffffff;
-    border:none;
+    border: none;
-    ::v-deep .el-card__body{
+
+    ::v-deep .el-card__body {
       flex: 1;
     }
   }
@@ -922,42 +891,51 @@ export default {
   //   color: #ffffff;
   // }
 
-  ::v-deep .el-table, .el-table__expanded-cell {
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
 
-  ::v-deep .el-table th, .el-table tr {
+  ::v-deep .el-table th,
+  .el-table tr {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr > td{
+
-    background-color:#000 !important;
+  ::v-deep .el-table__body tr>td {
+    background-color: #000 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr:hover > td{
+
-    background-color:#858282 !important;
+  ::v-deep .el-table__body tr:hover>td {
+    background-color: #858282 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table--border th.gutter:last-of-type{
+
+  ::v-deep .el-table--border th.gutter:last-of-type {
     border: none;
   }
-  ::v-deep .el-card__header{
+
+  ::v-deep .el-card__header {
     border: none;
     padding: 10px;
   }
 }
-::v-deep .el-switch__label{
+
-  color:#fff;
+::v-deep .el-switch__label {
+  color: #fff;
 }
-::v-deep .el-switch__label.is-active{
+
+::v-deep .el-switch__label.is-active {
   color: #428bca;
 }
-.colorOfRed{
+
+.colorOfRed {
   color: #f66;
 }
 </style>

src/views/trials/trials-panel/reading/dicoms3D/components/PetCtViewport.vue

@@ -260,9 +260,9 @@ export default {
           this.defaultWindowLevel.windowCenter = windowCenter
           this.imageInfo.wwwc = `${Math.round(windowWidth)}/${Math.round(windowCenter)}`
         }
-        // const toolGroupId = `viewport-${this.viewportIndex}`
+        const toolGroupId = this.viewportId
-        // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+        const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
-        // toolGroup.setToolEnabled('ScaleOverlay')
+        toolGroup.setToolEnabled('ScaleOverlay')
       }
 
     },

src/views/trials/trials-panel/reading/dicoms3D/components/ReportPage.vue

@@ -5,87 +5,49 @@
         <!-- 电子影像病例报告表（eICRF） -->
         <h3 style="margin:0;padding:0;">{{ $t('trials:readingReport:title:eicrf') }}</h3>
         <div style="margin-left:auto">
-          <el-switch
+          <el-switch v-model="isShowDetail" :active-text="$t('trials:readingReport:title:expandDetails')"
-            v-model="isShowDetail"
+            :inactive-text="$t('trials:readingReport:title:collapseDetails')" style="margin-right:5px;"
-            :active-text="$t('trials:readingReport:title:expandDetails')"
+            @change="handleShowDetail" />
-            :inactive-text="$t('trials:readingReport:title:collapseDetails')"
+          <el-button type="primary" size="small" v-if="isBaseline && assessmentQuestions.length > 0"
-            style="margin-right:5px;"
+            @click="openAssessment">
-            @change="handleShowDetail"
+            <!-- 附加评估 -->
-          />
+            {{ $t('trials:readingReport:button:assessment') }}
-          <el-button
+          </el-button>
-            v-if="readingTaskState<2"
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="skipTask">
-            type="primary"
-            size="small"
-            @click="skipTask"
-          >
             <!-- 跳过 -->
             {{ $t('trials:readingReport:button:skip') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="getReportInfo(false)">
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="getReportInfo(false)"
-          >
             <!-- 刷新 -->
             {{ $t('trials:readingReport:button:refresh') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2 && criterionType !== 10" type="primary" size="small"
-            v-if="readingTaskState<2 && criterionType !== 10"
+            @click="handleSave(true)">
-            type="primary"
-            size="small"
-            @click="handleSave(true)"
-          >
             <!-- 保存 -->
             {{ $t('common:button:save') }}
           </el-button>
-          <el-button
+          <el-button v-if="readingTaskState < 2" type="primary" size="small" @click="beforeLeave">
-            v-if="readingTaskState<2"
-            type="primary"
-            size="small"
-            @click="beforeLeave"
-          >
             <!-- 提交 -->
             {{ $t('common:button:submit') }}
           </el-button>
         </div>
       </div>
       <div ref="tableWrapper" style="height:100%;overflow-y: auto;">
-        <el-table
+        <el-table v-if="height" ref="reportList" :data="taskQuestions" row-key="Id" border
-          v-if="height"
+          :expand-row-keys="expandedRows" :height="height"
-          ref="reportList"
+          :tree-props="{ children: 'Childrens', hasChildren: 'hasChildren' }" size="mini">
-          :data="taskQuestions"
+          <el-table-column prop="" label="" show-overflow-tooltip width="350px">
-          row-key="Id"
-          border
-          :expand-row-keys="expandedRows"
-          :height="height"
-          :tree-props="{children: 'Childrens', hasChildren: 'hasChildren'}"
-          size="mini"
-        >
-          <el-table-column
-            prop=""
-            label=""
-            show-overflow-tooltip
-            width="350px"
-          >
             <template slot-scope="scope">
-              <span v-if="scope.row.QuestionName" :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff'}">{{ scope.row.QuestionName }}</span>
+              <span v-if="scope.row.QuestionName"
-              <span
+                :style="{ color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) ? '#f66' : '#fff' }">{{
-                v-else
+                  scope.row.QuestionName }}</span>
-                style="font-weight: bold;font-size: 16px;color: #f44336;"
+              <span v-else style="font-weight: bold;font-size: 16px;color: #f44336;">
-              >
+                {{ language === 'en' ? scope.row.GroupEnName : scope.row.GroupName }}
-                {{ language==='en'?scope.row.GroupEnName:scope.row.GroupName }}
               </span>
             </template>
           </el-table-column>
-          <el-table-column
+          <el-table-column v-for="task in visitTaskList" :key="task.VisitTaskId" prop="date" show-overflow-tooltip
-            v-for="task in visitTaskList"
+            width="150px">
-            :key="task.VisitTaskId"
-            prop="date"
-
-            show-overflow-tooltip
-            width="150px"
-          >
             <template slot="header">
               <div v-if="task.IsCurrentTask">
                 <div>
@@ -102,58 +64,37 @@
               </div>
             </template>
             <template slot-scope="scope">
-              <span :style="{color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff'}">
+              <span
-                <template v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13,14,15,42].includes(scope.row.QuestionType)">
+                :style="{ color: ((scope.row.isLymphNodes === 1 && scope.row.QuestionMark === 1) || (scope.row.isLymphNodes === 0 && scope.row.QuestionMark === 0)) && (scope.row.LesionType === 0 || scope.row.LesionType === 5) || (scope.row.QuestionMark === 12) || scope.row.HighlightAnswerList.includes(`${scope.row.Answers[task.VisitTaskId]}`) ? '#f66' : '#fff' }">
+                <template
+                  v-if="task.VisitTaskId === visitTaskId && readingTaskState < 2 && [13, 14, 15, 42].includes(scope.row.QuestionType)">
                   <!-- 是否存在疾病（基线时可修改） -->
-                  <template v-if="task.IsBaseLine && scope.row.QuestionType=== 15">
+                  <template v-if="task.IsBaseLine && scope.row.QuestionType === 15">
-                    <el-select
+                    <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
-                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                      v-model="currentExistDisease" size="mini" @change="handleExistDiseaseChange">
-                      v-model="currentExistDisease"
+                      <el-option v-for="item of $d[scope.row.DictionaryCode]" :key="item.id" :value="item.value"
-                      size="mini"
+                        :label="item.label" />
-                      @change="handleExistDiseaseChange"
-                    >
-                      <el-option
-                        v-for="item of $d[ scope.row.DictionaryCode]"
-                        :key="item.id"
-                        :value="item.value"
-                        :label="item.label"
-                      />
                     </el-select>
                   </template>
                   <!-- 整体肿瘤评估（非基线可修改） -->
-                  <template v-else-if="!task.IsBaseLine && (scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42)">
+                  <template
-                    <el-select
+                    v-else-if="!task.IsBaseLine && (scope.row.QuestionType === 13 || scope.row.QuestionType === 42)">
-                      v-if="scope.row.Type==='select' && scope.row.DictionaryCode"
+                    <el-select v-if="scope.row.Type === 'select' && scope.row.DictionaryCode"
-                      v-model="currentEvaluateResult"
+                      v-model="currentEvaluateResult" size="mini" @change="handleEvaluateResultChange">
-                      size="mini"
-                      @change="handleEvaluateResultChange"
-                    >
                       <template v-if="criterionType === 1 && tLesionCount">
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1 && item.value !== 3)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                       <template v-else-if="criterionType === 1 && ntLesionCount">
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1) && (item.value !== 1)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                       <template v-else>
-                        <el-option
+                        <el-option v-for="item of $d[scope.row.DictionaryCode]"
-                          v-for="item of $d[ scope.row.DictionaryCode]"
                           v-show="(!task.IsBaseLine && item.value > -1) && (task.CrterionDictionaryGroup.indexOf(item.raw.CrterionDictionaryGroup) > -1)"
-                          :key="item.id"
+                          :key="item.id" :value="item.value" :label="item.label" />
-                          :value="item.value"
-                          :label="item.label"
-                        />
                       </template>
                     </el-select>
                   </template>
@@ -162,27 +103,23 @@
                   </template> -->
                   <!-- 访视点备注（是否存在疾病与系统不一致或者整体肿瘤评估与系统不一致时，必填） -->
                   <!-- tumorEvaluate && task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease) -->
-                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType=== 14 ">
+                  <template v-else-if="task.VisitTaskId === visitTaskId && scope.row.QuestionType === 14">
                     <!-- v-if="tumorEvaluate && (currentEvaluateResult !== tumorEvaluate || currentExistDisease !== isExistDisease)" -->
                     <template>
                       <!-- 输入框 -->
-                      <el-input
+                      <el-input v-if="scope.row.Type === 'input'" v-model="currentTaskReason" size="mini"
-                        v-if="scope.row.Type==='input'"
+                        @change="evaluateReasonChange" />
-                        v-model="currentTaskReason"
+                      <el-input v-else-if="scope.row.Type === 'textarea'" v-model="currentTaskReason"
-                        size="mini"
+                        :autosize="{ minRows: 2, maxRows: 4 }" size="mini" maxlength="500"
-                        @change="evaluateReasonChange"
+                        @change="evaluateReasonChange" />
-                      />
-                      <el-input
-                        v-else-if="scope.row.Type==='textarea'"
-                        v-model="currentTaskReason"
-                        :autosize="{ minRows: 2, maxRows: 4}"
-                        size="mini"
-                        maxlength="500"
-                        @change="evaluateReasonChange"
-                      />
                       <!-- 系统评估结果为：xxx,与当前调整的结果不一致，请填写调整原因 -->
-                      <p v-if="currentEvaluateResult !== tumorEvaluate" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;" v-html="getWarningText()" />
+                      <p v-if="currentEvaluateResult !== tumorEvaluate"
-                      <p v-else-if="currentExistDisease !== isExistDisease" style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">{{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{ $fd('ExistDisease',isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
+                        style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;"
+                        v-html="getWarningText()" />
+                      <p v-else-if="currentExistDisease !== isExistDisease"
+                        style="width: 140px;padding:0 2px;white-space: normal;word-break: break-all;word-wrap: break-word;">
+                        {{ $t('trials:readingReport:title:sysEvaluationRes') }}<span style="color:red">{{
+                          $fd('ExistDisease', isExistDisease) }}</span>{{ $t('trials:readingReport:message:msg1') }}
                       </p>
                     </template>
                     <!-- <template v-else>
@@ -198,35 +135,50 @@
                   </template>
                 </template>
 
-                <template v-else-if="scope.row.QuestionType=== 15">
+                <template v-else-if="scope.row.QuestionType === 15">
-                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'IsGlobalChange')"
-                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                    :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'GlobalChangeAnswer'))}`"
+                    placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId])
+                    }}</span>
                   </el-tooltip>
                   <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
                 </template>
 
-                <template v-else-if="scope.row.QuestionType=== 13 || scope.row.QuestionType=== 42">
+                <template v-else-if="scope.row.QuestionType === 13 || scope.row.QuestionType === 42">
-                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer,task.VisitTaskId,'IsGlobalChange')" :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer,task.VisitTaskId,'GlobalChangeAnswer'))}`" placement="top" effect="light">
+                  <el-tooltip v-if="getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'IsGlobalChange')"
-                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
+                    :content="`${$t('trials:reading:warnning:msg55')}${$fd(scope.row.DictionaryCode, getAnswerInfo(scope.row.Answer, task.VisitTaskId, 'GlobalChangeAnswer'))}`"
+                    placement="top" effect="light">
+                    <span style="color:red;"> {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId])
+                    }}</span>
                   </el-tooltip>
                   <span v-else>{{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}</span>
                 </template>
-                <template v-else-if="scope.row.QuestionType=== 22">
+                <template v-else-if="scope.row.QuestionType === 22">
-                  {{ scope.row.Answers[task.VisitTaskId] === '-1' ? $t('trials:readingReport:title:unknow') : scope.row.Answers[task.VisitTaskId] }}
+                  {{ scope.row.Answers[task.VisitTaskId] === '-1' ? $t('trials:readingReport:title:unknow') :
+                    scope.row.Answers[task.VisitTaskId] }}
                 </template>
 
                 <template v-else-if="scope.row.DictionaryCode">
                   {{ $fd(scope.row.DictionaryCode, scope.row.Answers[task.VisitTaskId]) }}
                 </template>
                 <template v-else-if="criterionType === 10">
-                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}` }}
+                  {{
+                    isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                      `${scope.row.Answers[task.VisitTaskId]}`
+                  }}
                 </template>
                 <template v-else-if="(scope.row.ValueType === 0 || scope.row.ValueType === 1) && scope.row.Unit">
                   {{ `${scope.row.Answers[task.VisitTaskId]}` }}
-                  <span v-if="scope.row.Answers[task.VisitTaskId] !== 'NA' && !isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))">{{ `${$fd('ValueUnit',scope.row.Unit)}` }}</span>
+                  <span
+                    v-if="scope.row.Answers[task.VisitTaskId] !== 'NA' && !isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))">{{
+                      `${$fd('ValueUnit', scope.row.Unit)}` }}</span>
                 </template>
                 <template v-else-if="scope.row.ValueType === 2">
-                  {{ isNaN(parseInt(scope.row.Answers[task.VisitTaskId]))?scope.row.Answers[task.VisitTaskId]:`${scope.row.Answers[task.VisitTaskId]}%` }}
+                  {{
+                    isNaN(parseInt(scope.row.Answers[task.VisitTaskId])) ? scope.row.Answers[task.VisitTaskId] :
+                      `${scope.row.Answers[task.VisitTaskId]}%`
+                  }}
                 </template>
                 <template v-else-if="scope.row.Answers && scope.row.Answers.hasOwnProperty(task.VisitTaskId)">
                   {{ scope.row.Answers[task.VisitTaskId] }}
@@ -238,31 +190,17 @@
       </div>
     </el-card>
     <!-- 附加评估 -->
-    <el-dialog
+    <el-dialog v-if="additionalAssessmentsDig.visible" :visible.sync="additionalAssessmentsDig.visible"
-      v-if="additionalAssessmentsDig.visible"
+      :close-on-click-modal="false" :title="additionalAssessmentsDig.title" width="600px">
-      :visible.sync="additionalAssessmentsDig.visible"
+      <additional-assessment :questions="assessmentQuestions" :visit-task-id="visitTaskId"
-      :close-on-click-modal="false"
+        :readingTaskState="readingTaskState" @close="additionalAssessmentsDig.visible = false" @sign="sign" />
-      :title="additionalAssessmentsDig.title"
-      width="600px"
-    >
-      <additional-assessment
-        :questions="assessmentQuestions"
-        :visit-task-id="visitTaskId"
-        @close="additionalAssessmentsDig.visible = false"
-        @sign="sign"
-      />
     </el-dialog>
     <!-- 签名框 -->
-    <el-dialog
+    <el-dialog v-if="signVisible" :visible.sync="signVisible" :close-on-click-modal="false" width="600px"
-      v-if="signVisible"
+      custom-class="base-dialog-wrapper">
-      :visible.sync="signVisible"
-      :close-on-click-modal="false"
-      width="600px"
-      custom-class="base-dialog-wrapper"
-    >
       <div slot="title">
         <span style="font-size:18px;">{{ $t('common:dialogTitle:sign') }}</span>
-        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${ currentUser })` }}</span>
+        <span style="font-size:12px;margin-left:5px">{{ `(${$t('common:label:sign')}${currentUser})` }}</span>
       </div>
       <SignForm ref="signForm" :sign-code-enum="signCode" @closeDialog="closeSignDialog" />
     </el-dialog>
@@ -314,7 +252,11 @@ export default {
     }
   },
   computed: {
-    ...mapGetters(['language'])
+    ...mapGetters(['language']),
+    isBaseline() {
+      var i = this.visitTaskList.findIndex(i => i.VisitTaskId === this.visitTaskId)
+      return this.visitTaskList[i] ? this.visitTaskList[i].IsBaseLine : false
+    }
   },
   watch: {
     taskQuestions() {
@@ -395,6 +337,7 @@ export default {
           this.setScrollTop()
         }
         this.loading = false
+        await this.getTaskAdditionalQuestion()
       } catch (e) {
         this.loading = false
         console.log(e)
@@ -605,6 +548,25 @@ export default {
         this.answerArr[idx].answer = val
       }
     },
+    async getTaskAdditionalQuestion() {
+      try {
+        const res = await getTaskAdditionalQuestion({ visitTaskId: this.visitTaskId })
+        this.assessmentQuestions = res.Result
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    async openAssessment() {
+      try {
+        await this.getTaskAdditionalQuestion()
+        if (this.assessmentQuestions.length > 0) {
+          // 打开附加评估框
+          this.additionalAssessmentsDig.visible = true
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
     async handleConfirm() {
       this.loading = true
       try {
@@ -724,7 +686,7 @@ export default {
       this.openWindow = window.open(routeData.href, '_blank')
     },
     handleSave(isPrompt) {
-      return new Promise(async(resolve, reject) => {
+      return new Promise(async (resolve, reject) => {
         var isBeill
         var evaluateResult = ''
         var evaluateAjustReason = ''
@@ -748,7 +710,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -758,7 +720,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg2'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -768,7 +730,7 @@ export default {
           this.$confirm(this.$t('trials:readingReport:message:msg3'), {
             type: 'warning',
             showCancelButton: false,
-            callback: action => {}
+            callback: action => { }
           })
           resolve()
           return
@@ -833,29 +795,36 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-.report-wrapper{
+.report-wrapper {
 
   height: 100%;
   padding: 10px 0px;
   // background-color: #fff;
   background-color: #000;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  .report-header{
+
+  .report-header {
     display: flex;
   }
-  .el-card{
+
-    display:flex;flex-direction: column;height: 100%;
+  .el-card {
+    display: flex;
+    flex-direction: column;
+    height: 100%;
     background-color: #000;
     color: #ffffff;
-    border:none;
+    border: none;
-    ::v-deep .el-card__body{
+
+    ::v-deep .el-card__body {
       flex: 1;
     }
   }
@@ -873,42 +842,51 @@ export default {
   //   color: #ffffff;
   // }
 
-  ::v-deep .el-table, .el-table__expanded-cell {
+  ::v-deep .el-table,
+  .el-table__expanded-cell {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
 
-  ::v-deep .el-table th, .el-table tr {
+  ::v-deep .el-table th,
+  .el-table tr {
     background-color: #000;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr > td{
+
-    background-color:#000 !important;
+  ::v-deep .el-table__body tr>td {
+    background-color: #000 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table__body tr:hover > td{
+
-    background-color:#858282 !important;
+  ::v-deep .el-table__body tr:hover>td {
+    background-color: #858282 !important;
     color: #fff;
-    border-color:#444444;
+    border-color: #444444;
   }
-  ::v-deep .el-table--border th.gutter:last-of-type{
+
+  ::v-deep .el-table--border th.gutter:last-of-type {
     border: none;
   }
-  ::v-deep .el-card__header{
+
+  ::v-deep .el-card__header {
     border: none;
     padding: 10px;
   }
 }
-::v-deep .el-switch__label{
+
-  color:#fff;
+::v-deep .el-switch__label {
+  color: #fff;
 }
-::v-deep .el-switch__label.is-active{
+
+::v-deep .el-switch__label.is-active {
   color: #428bca;
 }
-.colorOfRed{
+
+.colorOfRed {
   color: #f66;
 }
 </style>

src/views/trials/trials-panel/reading/dicoms3D/components/Viewport.vue

@@ -1,59 +1,34 @@
 <template>
-  <div
+  <div ref="viewport" class="viewport-wrapper" v-loading="loading" :element-loading-text="NSTip"
-    ref="viewport"
+    element-loading-background="rgba(0, 0, 0, 0.8)" @mouseup="sliderMouseup" @mousemove="sliderMousemove"
-    class="viewport-wrapper"
+    @mouseleave="sliderMouseleave">
-    v-loading="loading"
-    :element-loading-text="NSTip"
-    element-loading-background="rgba(0, 0, 0, 0.8)"
-    @mouseup="sliderMouseup"
-    @mousemove="sliderMousemove"
-    @mouseleave="sliderMouseleave"
-  >
     <div v-if="series && taskInfo" class="left-top-text">
-      <div
+      <div v-if="taskInfo.IsExistsClinicalData" class="cd-info" :title="$t('trials:reading:button:clinicalData')">
-        v-if="taskInfo.IsExistsClinicalData"
+        <svg-icon style="cursor: pointer;" icon-class="documentation" class="svg-icon"
-        class="cd-info"
+          @click.stop="viewCD(series.TaskInfo.VisitTaskId)" />
-        :title="$t('trials:reading:button:clinicalData')"
-      >
-        <svg-icon
-          style="cursor: pointer;"
-          icon-class="documentation"
-          class="svg-icon"
-          @click.stop="viewCD(series.TaskInfo.VisitTaskId)"
-        />
       </div>
-      <h2
+      <h2 v-if="taskInfo.IsReadingShowSubjectInfo" class="subject-info">
-        v-if="taskInfo.IsReadingShowSubjectInfo"
-        class="subject-info"
-      >
         {{ `${series.TaskInfo.SubjectCode} ${series.TaskInfo.TaskBlindName} ` }}
       </h2>
       <div>Series: #{{ series.SeriesNumber }}</div>
       <div v-if="series.Stack">Image: #{{ `${series.SliceIndex + 1}/${series.Stack.length}` }}</div>
       <div>{{ series.Modality }}</div>
     </div>
-    <div
+    <div v-if="series && taskInfo && taskInfo.IsReadingTaskViewInOrder === 1" class="top-center-tool">
-      v-if="series && taskInfo && taskInfo.IsReadingTaskViewInOrder === 1"
-      class="top-center-tool"
-    >
       <div class="toggle-visit-container">
-        <div
+        <div class="arrw_icon"
-          class="arrw_icon"
+          :style="{ cursor: series.TaskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum !== 0 ? '#fff' : '#6b6b6b' }"
-          :style="{ cursor: series.TaskInfo.VisitTaskNum !== 0 ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum !== 0 ? '#fff': '#6b6b6b' }"
           @click.stop.prevent="toggleTask($event, series.TaskInfo.VisitTaskNum, -1)"
-          @dblclick.stop="preventDefault($event)"
+          @dblclick.stop="preventDefault($event)">
-        >
           <i class="el-icon-caret-left" />
         </div>
         <div class="arrow_text">
           {{ series.TaskInfo.TaskBlindName }}
         </div>
-        <div
+        <div class="arrw_icon"
-          class="arrw_icon"
+          :style="{ cursor: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff' : '#6b6b6b' }"
-          :style="{ cursor: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? 'pointer' : 'not-allowed', color: series.TaskInfo.VisitTaskNum < taskInfo.VisitNum ? '#fff': '#6b6b6b' }"
           @click.stop.prevent="toggleTask($event, series.TaskInfo.VisitTaskNum, 1)"
-          @dblclick.stop="preventDefault($event)"
+          @dblclick.stop="preventDefault($event)">
-        >
           <i class="el-icon-caret-right" />
         </div>
       </div>
@@ -65,11 +40,13 @@
       <div v-show="mousePosition.index.length > 0">
         Pos: {{ mousePosition.index[0] }}, {{ mousePosition.index[1] }}
       </div>
-      <div v-if="(series.Modality === 'CT' || series.Modality === 'DR' || series.Modality === 'CR') && mousePosition.value">
+      <div
+        v-if="(series.Modality === 'CT' || series.Modality === 'DR' || series.Modality === 'CR') && mousePosition.value">
         HU: {{ mousePosition.value }}
       </div>
       <div v-else-if="(series.Modality === 'PT' && mousePosition.value)">
-        {{mousePosition.modalityUnit}}: {{ digitPlaces === -1 ?mousePosition.value.toFixed(3) :mousePosition.value.toFixed(digitPlaces) }}
+        {{ mousePosition.modalityUnit }}: {{ digitPlaces === -1 ? mousePosition.value.toFixed(3)
+          : mousePosition.value.toFixed(digitPlaces) }}
       </div>
       <div v-else-if="mousePosition.value">
         Density: {{ mousePosition.value }}
@@ -83,8 +60,9 @@
     </div>
     <div v-if="series" class="right-bottom-text">
       <div v-show="imageInfo.location">Location: {{ `${Number(imageInfo.location).toFixed(digitPlaces)} mm` }}</div>
-      <div v-show="series.SliceThickness">Slice Thickness: {{ `${Number(series.SliceThickness).toFixed(digitPlaces)} mm` }}</div>
+      <div v-show="series.SliceThickness">Slice Thickness: {{ `${Number(series.SliceThickness).toFixed(digitPlaces)} mm`
-      <div v-show="imageInfo.wwwc ">WW/WL: {{ imageInfo.wwwc }}</div>
+      }}</div>
+      <div v-show="imageInfo.wwwc">WW/WL: {{ imageInfo.wwwc }}</div>
     </div>
     <div class="orientation-top">
       {{ markers.top }}
@@ -100,7 +78,8 @@
       {{ markers.left }}
     </div>
     <div ref="sliderBox" class="right-slider-box" @click.stop="clickSlider($event)">
-      <div :style="{top: sliderInfo.height + '%'}" class="slider" @click.stop.prevent="() => {return}" @mousedown.stop="sliderMousedown($event)" />
+      <div :style="{ top: sliderInfo.height + '%' }" class="slider" @click.stop.prevent="() => { return }"
+        @mousedown.stop="sliderMousedown($event)" />
     </div>
   </div>
 </template>
@@ -219,9 +198,9 @@ export default {
       // this.imageInfo.wwwc = `${Math.round(detail.image.windowWidth)}/${Math.round(detail.image.windowCenter)}`
       this.getOrientationMarker()
       this.$emit('renderAnnotations', this.series)
-      // const toolGroupId = `viewport-${this.viewportIndex}`
+      const toolGroupId = this.viewportId
-      // const toolGroup = ToolGroupManager.getToolGroup(toolGroupId)
+      const toolGroup = cornerstoneTools.ToolGroupManager.getToolGroup(toolGroupId)
-      // toolGroup.setToolEnabled('ScaleOverlay')
+      toolGroup.setToolEnabled('ScaleOverlay')
     },
     imageRendered(e) {
       const renderingEngine = getRenderingEngine(this.renderingEngineId)
@@ -385,7 +364,7 @@ export default {
       }
     },
     cachePTMetadata(images) {
-      images.map(i=>{
+      images.map(i => {
         const instanceMetadata = getPTImageIdInstanceMetadata(i.imageId)
         if (typeof instanceMetadata.CorrectedImage === 'string') {
           instanceMetadata.CorrectedImage = instanceMetadata.CorrectedImage.split('\\')
@@ -549,10 +528,11 @@ export default {
 </script>
 <style lang="scss" scoped>
 .viewport-wrapper {
-  width:100%;
+  width: 100%;
-  height:100%;
+  height: 100%;
   position: relative;
   cursor: default !important;
+
   .left-top-text {
     position: absolute;
     left: 5px;
@@ -560,26 +540,31 @@ export default {
     color: #ddd;
     z-index: 1;
     font-size: 12px;
+
     .cd-info {
       color: #ddd;
       font-size: 18px;
     }
+
     .subject-info {
-      color:#f44336;
+      color: #f44336;
       padding: 5px 0px;
       margin: 0;
     }
   }
+
   .top-center-tool {
     position: absolute;
-    left:50%;
+    left: 50%;
     top: 5px;
     transform: translateX(-50%);
     z-index: 1;
+
     .toggle-visit-container {
       display: flex;
     }
-    .arrw_icon{
+
+    .arrw_icon {
       width: 20px;
       height: 20px;
       background-color: #3f3f3f;
@@ -587,15 +572,17 @@ export default {
       line-height: 20px;
       border-radius: 10%;
     }
-    .arrow_text{
+
+    .arrow_text {
       height: 20px;
       line-height: 20px;
       background-color: #00000057;
       color: #fff;
-      padding:0 10px;
+      padding: 0 10px;
       font-size: 14px;
     }
   }
+
   .right-top-text {
     position: absolute;
     right: 5px;
@@ -604,6 +591,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .left-bottom-text {
     position: absolute;
     left: 5px;
@@ -612,6 +600,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .right-bottom-text {
     position: absolute;
     right: 5px;
@@ -620,6 +609,7 @@ export default {
     z-index: 1;
     font-size: 12px;
   }
+
   .right-slider-box {
     position: absolute;
     right: 1px;
@@ -631,7 +621,8 @@ export default {
     z-index: 1;
     cursor: pointer;
   }
-  .right-slider-box:after{
+
+  .right-slider-box:after {
     content: '';
     position: absolute;
     bottom: -20px;
@@ -640,15 +631,17 @@ export default {
     width: 100%;
     background: #333;
   }
+
   .slider {
     height: 20px;
     width: 100%;
     position: absolute;
     top: 0;
-    z-index:10;
+    z-index: 10;
     background: #9e9e9e;
     cursor: move
   }
+
   .orientation-top {
     position: absolute;
     left: 50%;
@@ -657,6 +650,7 @@ export default {
     transform: translateX(-50%);
     z-index: 1;
   }
+
   .orientation-bottom {
     position: absolute;
     left: 50%;
@@ -665,6 +659,7 @@ export default {
     transform: translateX(-50%);
     z-index: 1;
   }
+
   .orientation-left {
     position: absolute;
     top: 50%;
@@ -673,6 +668,7 @@ export default {
     transform: translateY(-50%);
     z-index: 1;
   }
+
   .orientation-right {
     position: absolute;
     top: 50%;

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionFormItem.vue

@@ -8,7 +8,7 @@
       style="font-weight: bold;font-size: 14px;margin: 5px 0px;">
       <div style="display: flex;justify-content: space-between;align-items: center;color:#fff;margin: 10px 0 5px">
         <span :title="question.Remark">{{ question.QuestionName }}</span>
-        <el-button size="mini" v-if="readingTaskState < 2" @click="openAddTableCol(question)">
+        <el-button size="mini" v-if="readingTaskState < 2 && !question.IsPreinstall" @click="openAddTableCol(question)">
           {{ $t('common:button:add') }}
         </el-button>
       </div>
@@ -39,7 +39,7 @@
               {{ $t('common:button:edit') }}
             </el-button>
             <el-button type="text" size="mini" :disabled="addOrEdit.visible"
-              v-if="scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || isBaseline"
+              v-if="(scope.row.IsCurrentTaskAdd === 'True' || !question.IsCopyLesions || isBaseline) && !question.IsPreinstall"
               @click="deleteTableCol(question, scope.$index)">
               {{ $t('common:button:delete') }}
             </el-button>

src/views/trials/trials-panel/reading/dicoms3D/components/customize/QuestionTableFormItem.vue

@@ -15,14 +15,14 @@
       :class="[question.Type === 'group' ? 'mb' : question.Type === 'upload' || question.Type === 'screenshot' ? 'uploadWrapper' : '']">
       <!-- 输入框 -->
       <el-input v-if="question.Type === 'input'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')" />
+        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall" />
       <!-- 多行文本输入框 -->
       <el-input v-if="question.Type === 'textarea'" v-model="questionForm[question.Id]" type="textarea"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
         :autosize="{ minRows: 2, maxRows: 4 }" />
       <!-- 下拉框 -->
       <el-select v-if="question.Type === 'select'" v-model="questionForm[question.Id]" clearable
-        :disabled="(question.TableQuestionType === 2 || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="(question.TableQuestionType === 2 || question.IsPreinstall || question.QuestionGenre === 2) || (question.IsCopy && type === 'edit' && !IsBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @change="((val) => { formItemChange(val, question) })">
         <template v-if="question.TableQuestionType === 1">
           <el-option v-for="item in organList" :key="item.Id" :label="item[question.DataTableColumn]"
@@ -44,7 +44,7 @@
       </el-select>
       <!-- 单选 -->
       <el-radio-group v-if="question.Type === 'radio'" v-model="questionForm[question.Id]"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         @change="((val) => { formItemChange(val, question) })">
         <el-radio v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
@@ -52,7 +52,7 @@
       </el-radio-group>
       <!-- 复选框 -->
       <el-checkbox-group v-if="question.Type === 'checkbox'"
-        :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+        :disabled="question.TableQuestionType === 2 || question.IsPreinstall || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
         v-model="questionForm[question.Id]">
         <el-checkbox v-for="val in question.TypeValue.split('|')" :key="val" :label="val">
           {{ val }}
@@ -62,11 +62,11 @@
       <el-input v-if="question.Type === 'class' && question.ClassifyShowType === 1"
         v-model="questionForm[question.Id]" />
       <el-select v-if="question.Type === 'class' && question.ClassifyShowType === 2" v-model="questionForm[question.Id]"
-        :disabled="!question.ClassifyEditType" @change="(val) => { formItemChange(val, question) }">
+        :disabled="!question.ClassifyEditType || question.IsPreinstall" @change="(val) => { formItemChange(val, question) }">
         <el-option v-for="val in question.TypeValue.split('|')" :key="val" :label="val.trim()" :value="val.trim()" />
       </el-select>
       <el-radio-group v-if="question.Type === 'class' && question.ClassifyShowType === 3"
-        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType"
+        v-model="questionForm[question.Id]" :disabled="!question.ClassifyEditType || question.IsPreinstall"
         @change="(val) => { formItemChange(val, question) }">
         <el-radio v-for="item of question.TypeValue.split('|')" :key="item.trim()" :label="item.trim()">
           {{ item.trim() }}
@@ -86,7 +86,7 @@
             @blur="questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked ? () => { } : handleMarkedQsBlur(questionForm[question.Id], questionForm, question.Id, question)"
             v-model="questionForm[question.Id]"
             :title="questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id] ? questionsMarkStatus[rowId ? `${rowId}_${question.Id}` : question.Id].OrderMarkName : question.Remark"
-            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1"
+            :disabled="(questionsMarkStatus[question.Id] && questionsMarkStatus[question.Id].isMarked && question.ImageMarkEnum === 2) || question.ImageMarkEnum === 1 || question.IsPreinstall"
             style="width: 150px;margin-right: 5px;">
             <template v-if="question.Unit !== 0" slot="append">
               {{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) : question.CustomUnit }}
@@ -144,21 +144,21 @@
           <template v-else-if="question.ValueType === 2" slot="prefix">%</template>
         </el-select>
         <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource !== 1"
-          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False')"
+          :disabled="question.TableQuestionType === 2 || (question.IsCopy && type === 'edit' && !isBaseline && questionForm.IsCurrentTaskAdd === 'False') || question.IsPreinstall"
           @change="((val) => { formItemNumberChange(val, question) })" @input="numberInput(question.Id)"
           @blur="handleBlur(questionForm[question.Id], questionForm, question.Id)" v-model="questionForm[question.Id]">
           <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
         </el-input>
         <el-input type="text" v-else-if="question.Type === 'number' && question.DataSource === 1"
-          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true)"
+          :disabled="question.DataSource === 1" @input="numberInput(question.Id, true) || question.IsPreinstall"
           @blur="handleCalculationBlur(calculationValue)" v-model="calculationValue">
           <template slot="append" v-if="question.Unit !== 0">{{ question.Unit !== 4 ? $fd('ValueUnit', question.Unit) :
             question.CustomUnit }}</template>
         </el-input>
       </template>
       <!-- 上传图像 -->
-      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2"
+      <el-upload v-if="question.Type === 'upload' || question.Type === 'screenshot'" :disabled="readingTaskState === 2 || question.IsPreinstall"
         action :accept="question.FileType" :limit="question.ImageCount === 0 ? 100 : question.ImageCount"
         :on-preview="handlePictureCardPreview"
         :before-upload="(file) => { return handleBeforeUpload(file, question.FileType, question.Type) }"

src/views/trials/trials-panel/trial-summary/audit-record/index.vue

@@ -856,6 +856,7 @@ export default {
 
         var item
         if (!v.IsEnable) return
+        if (v.ApplyCriterionList && Array.isArray(v.ApplyCriterionList) && v.ApplyCriterionList.length > 0 && !v.ApplyCriterionList.includes(this.currentRow.CriterionType)) return false
         if (v.IsShowByTrialConfig) {
           if (!parentRow[v.TrialConfigRelyFieldName]) return
         }

src/views/trials/trials-panel/visit/crc-upload/index.vue

@@ -37,6 +37,12 @@
             <el-option v-for="item of $d.SubmitState" :value="item.value" :label="item.label" :key="item.label" />
           </el-select>
         </el-form-item>
+        <!-- 受试者中止状态 -->
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:crcUpload:table:IsSubjectQuit')">
+          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 审核状态 -->
         <el-form-item style="margin-bottom: 10px" v-if="otherInfo.QCProcessEnum !== 0"
           :label="$t('trials:crcUpload:table:auditState')">
@@ -868,6 +874,7 @@ const searchDataDefault = () => {
     AuditStateArray: [],
     SubmitState: null,
     ChallengeState: null,
+    IsSubjectQuit: "",
     // SortField: '',
     // Asc: false
   }

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

@@ -31,7 +31,12 @@
             <el-option key="Other" label="Out of Plan" value="1.11" />
           </el-select>
         </el-form-item>
-
+        <!-- 受试者中止状态 -->
+        <el-form-item style="margin-bottom: 10px" :label="$t('trials:qcCheck:table:IsSubjectQuit')">
+          <el-select v-model="searchData.IsSubjectQuit" clearable style="width: 120px">
+            <el-option v-for="item of $d.YesOrNo" :value="item.value" :label="item.label" :key="item.label" />
+          </el-select>
+        </el-form-item>
         <!-- 审核状态 -->
         <el-form-item v-if="OtherInfo.QCProcessEnum !== 0" :label="$t('trials:qcCheck:table:auditState')"
           class="my_multiple">
@@ -652,6 +657,7 @@ const searchDataDefault = () => {
     EndAuditTime: null,
     PageIndex: 1,
     PageSize: 20,
+    IsSubjectQuit: ''
     // SortField: '',
     // Asc: false
   }