自定义阅片页添加上传下载按钮

src/api/trials/reading.js

@@ -436,9 +436,9 @@ export function addSubjectCancelDoctorNote(params) {
   })
 }
 
-export function getSubjectCancelDoctorHistoryList(SubjectId) {
+export function getSubjectCancelDoctorHistoryList(SubjectId, TrialReadingCriterionId) {
   return request({
-    url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}`,
+    url: `/TaskAllocationRule/getSubjectCancelDoctorHistoryList?SubjectId=${SubjectId}&&TrialReadingCriterionId=${TrialReadingCriterionId}`,
     method: 'get'
   })
 }

src/components/uploadImage/index.vue

@@ -5,6 +5,7 @@
     :close-on-click-modal="false"
     custom-class="upload-dialog"
     :before-close="beforeClose"
+    class="uploadImage"
   >
     <span slot="title">{{ title }}</span>
     <el-divider content-position="left">{{
@@ -263,4 +264,7 @@ export default {
     padding-top: 15px;
   }
 }
+.uploadImage {
+  background-color: #fff;
+}
 </style>

src/main.js

@@ -232,7 +232,6 @@ async function VueInit() {
     try {
       let data = arr || d;
       type = type || 'value';
-      console.log(data,type,key,code)
       // code === 'YesOrNo' ? console.log(d) : ''
       return data[code].find(i => {
         return i[type] === v

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

@@ -35,6 +35,7 @@
           <CustomizeReadPage
             v-if="tabs.includes('read')"
             :trial-id="trialId"
+            :trial-reading-criterion-id="TrialReadingCriterionId"
             :visit-task-id="visitTaskId"
             :subject-id="subjectId"
             :subject-code="subjectCode"

src/views/trials/trials-panel/reading/read-task-allocation/index.vue

@@ -626,7 +626,7 @@ export default {
       }).catch(() => {})
     },
     openSubjectCancelDoctorHistoryList(row) {
-      getSubjectCancelDoctorHistoryList(row.SubjectId).then((res) => {
+      getSubjectCancelDoctorHistoryList(row.SubjectId,this.TrialReadingCriterionId).then((res) => {
         this.SubjectCancelDoctorHistoryVisible = true
         this.SubjectCancelDoctorHistoryList = res.Result
       })

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

@@ -121,27 +121,6 @@
                   >
                 </template>
               </el-table-column>
-              <!--              &lt;!&ndash; 未读任务数量 &ndash;&gt;-->
-              <!--              <el-table-column-->
-              <!--                prop="UnReadTaskCount"-->
-              <!--                min-width="100"-->
-              <!--                label="未读任务数量"-->
-              <!--                show-overflow-tooltip-->
-              <!--              />-->
-              <!--              &lt;!&ndash; 可读任务量 &ndash;&gt;-->
-              <!--              <el-table-column-->
-              <!--                prop="UnReadCanReadTaskCount"-->
-              <!--                min-width="100"-->
-              <!--                label="可读任务量"-->
-              <!--                show-overflow-tooltip-->
-              <!--              />-->
-              <!--              &lt;!&ndash; 已签名任务量 &ndash;&gt;-->
-              <!--              <el-table-column-->
-              <!--                prop="HaveReadTaskCount"-->
-              <!--                min-width="100"-->
-              <!--                label="已签名任务量"-->
-              <!--                show-overflow-tooltip-->
-              <!--              />-->
               <!-- 建议完成时间 -->
               <el-table-column
                 prop="SuggesteFinishedTime"
@@ -179,7 +158,11 @@
                   <!-- 上传 -->
                   <el-button
                     v-hasPermi="['role:ir']"
-                    v-if="item.CriterionType === 0 && item.ImageUploadEnum > 0"
+                    v-if="
+                      item.CriterionType === 0 &&
+                      item.ImageUploadEnum > 0 &&
+                      item.IsReadingTaskViewInOrder > 0
+                    "
                     circle
                     icon="el-icon-upload2"
                     :title="$t('trials:pendingReadingTasks:button:upload')"
@@ -189,7 +172,9 @@
                   <el-button
                     v-hasPermi="['role:ir']"
                     v-if="
-                      item.CriterionType === 0 && item.ImageDownloadEnum > 0
+                      item.CriterionType === 0 &&
+                      item.ImageDownloadEnum === 1 &&
+                      item.IsReadingTaskViewInOrder > 0
                     "
                     circle
                     icon="el-icon-download"
@@ -274,36 +259,6 @@
             </el-descriptions-item>
           </el-descriptions>
         </div>
-        <!-- <template v-else-if="!isReadingTaskViewInOrder && isRender">
-          <el-tabs v-model="TrialReadingCriterionId" type="border-card">
-            <el-tab-pane v-for="i of trialCriterionList" :key="i.TrialReadingCriterionName" :label="i.TrialReadingCriterionName" :name="i.TrialReadingCriterionId">
-              <el-descriptions :column="2" border style="width:800px">
-                <el-descriptions-item label="剩余任务量" :label-style="{'width':'200px'}">
-                  <el-tag size="small" type="danger">{{ randomReadInfo.UnReadTaskCount }}</el-tag>
-                </el-descriptions-item>
-                <el-descriptions-item label="剩余裁判量" :label-style="{'width':'200px'}">
-                  <el-tag size="small" type="danger">{{ randomReadInfo.UnReadJudgeTaskCount }}</el-tag>
-                </el-descriptions-item>
-                <el-descriptions-item label="已完成任务量" :label-style="{'width':'200px'}">
-                  <el-tag size="small">{{ randomReadInfo.FinishTaskCount }}</el-tag>
-                </el-descriptions-item>
-                <el-descriptions-item label="已完成裁判量" :label-style="{'width':'200px'}">
-                  <el-tag size="small">{{ randomReadInfo.FinishJudgeTaskCount }}</el-tag>
-                </el-descriptions-item>
-                <el-descriptions-item>
-                  <el-button
-                    type="primary"
-                    size="small"
-                    :disabled="randomReadInfo.UnReadTaskCount+randomReadInfo.UnReadJudgeTaskCount ===0"
-                    @click="handleOutOfOrderReading"
-                  >
-                    开始随机阅片
-                  </el-button>
-                </el-descriptions-item>
-              </el-descriptions>
-            </el-tab-pane>
-          </el-tabs>
-        </template> -->
       </el-tab-pane>
     </el-tabs>
     <upload-image