检查部位未显示问题修改

src/api/trials.js

@@ -3044,7 +3044,13 @@ export function readClinicalData(param) {
     data: param
   })
 }
-
+export function viewstudyPart(param) {
+  return request({
+    url: `/ReadingImageTask/viewstudyPart`,
+    method: 'post',
+    data: param
+  })
+}
 export function getCustomQuestionPreview(param) {
   return request({
     url: `/ReadingQuestion/getCustomQuestionPreview`,

src/components/downloadDicomAndNonedicom/index.vue

@@ -149,13 +149,13 @@ export default {
       open: null,
       downloadId: null,
       IsReadingTaskViewInOrder: 0, // 阅片规则
-      bodyPart: [],
+      bodyPart: {},
       modelTaskId: null,
     }
   },
   async mounted() {
+    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
-    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
     this.title = `Download Images：${this.SubjectCode}（${this.Criterion.TrialReadingCriterionName}）`
   },
   beforeDestroy() {

src/components/feedBack/index.vue

@@ -283,6 +283,7 @@ export default {
         }
         if (this.visitTaskId) {
           this.form.VisitTaskId = this.visitTaskId
+          this.form.QuestionType = 6
         }
         if (this.SubjectVisitId) {
           this.form.SubjectVisitId = this.SubjectVisitId

src/components/uploadDicomAndNonedicom/dicomFile.vue

@@ -406,17 +406,15 @@ export default {
       subjectVisitId: null,
       errStudyUidList: [],
       open: null,
-      bodyPart: [],
+      bodyPart: {},
       openIsUpload: false,
       TrialModality: [],
     }
   },
-  created() {
-    this.getList()
-  },
   async mounted() {
     this.trialId = this.$route.query.trialId
-    this.bodyPart = await this.$getBodyPart(this.$route.query.trialId)
+    this.bodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+    this.getList()
     this.uploadQueues = []
     this.OSSclient.close()
   },
@@ -896,7 +894,7 @@ export default {
                 imageColumns: data.uint16('x00280011') || 0,
                 sliceLocation: data.intString('x00201041') || 0,
                 sliceThickness: data.string('x00180050') || '',
-                numberOfFrames: data.intString('x00280008') || 0,
+                numberOfFrames: data.intString('x00280008') || 1,
                 pixelSpacing: data.string('x00280030') || '',
                 imagerPixelSpacing: data.string('x00181164') || '',
                 frameOfReferenceUID: data.string('x00200052') || '',
@@ -1125,7 +1123,7 @@ export default {
                               seriesInstanceUid: v.seriesUid,
                               SOPClassUID: o.SOPClassUID,
                               TransferSytaxUID: o.TransferSytaxUID,
-                              MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                              MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
                               MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                               sopInstanceUid: o.instanceUid,
                               instanceNumber: o.instanceNumber,
@@ -1210,7 +1208,7 @@ export default {
                                 sopInstanceUid: o.instanceUid,
                                 SOPClassUID: o.SOPClassUID,
                                 TransferSytaxUID: o.TransferSytaxUID,
-                                MediaStorageSOPInstanceUID:o.MediaStorageSOPInstanceUID,
+                                MediaStorageSOPInstanceUID: o.MediaStorageSOPInstanceUID,
                                 MediaStorageSOPClassUID: o.MediaStorageSOPClassUID,
                                 instanceNumber: o.instanceNumber,
                                 instanceTime: o.instanceTime,

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -18,7 +18,11 @@
       <el-table-column prop="Modality" :label="$t('upload:nonedicom:table:molityType')" sortable="custom">
       </el-table-column>
       <!--检查部位-->
-      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom" />
+      <el-table-column prop="BodyPart" :label="$t('upload:nonedicom:table:bodyPart')" sortable="custom">
+        <template slot-scope="scope">
+          <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+        </template>
+      </el-table-column>
       <!--原文件数-->
       <el-table-column prop="FileCount" :label="$t('upload:nonedicom:table:fileCount')">
         <template slot-scope="scope">
@@ -262,6 +266,7 @@ export default {
       currentRow: {},
       studyMonitorId: null,
       open: null,
+      BodyPart: {}
     }
   },
   watch: {
@@ -289,7 +294,8 @@ export default {
       store.dispatch('trials/setUnLock', this.btnLoading)
     },
   },
-  created() {
+  async created() {
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
   },
   beforeDestroy() {
@@ -674,6 +680,26 @@ export default {
       let blob = new Blob(['\ufeff', text], { type: 'text/plain' })
       return blob
     },
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
   },
 }
 </script>

src/components/uploadDicomAndNonedicom/study-view.vue

@@ -4,118 +4,49 @@
       <div slot="dialog-body">
         <el-table :data="modelList" style="width: 100%" height="300">
           <!--检查编号-->
-          <el-table-column
+          <el-table-column prop="StudyCode" :label="$t('trials:uploadImage:table:StudyCode')" />
-            prop="StudyCode"
-            :label="$t('trials:uploadImage:table:StudyCode')"
-          />
           <!--检查类型-->
-          <el-table-column
+          <el-table-column prop="ModalityForEdit" :label="$t('trials:uploadImage:table:ModalityForEdit')"
-            prop="ModalityForEdit"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:ModalityForEdit')"
-            v-if="IsDicom"
-          />
           <!--检查模态-->
-          <el-table-column
+          <el-table-column prop="Modalities" :label="$t('trials:uploadImage:table:Modalities')" v-if="IsDicom" />
-            prop="Modalities"
-            :label="$t('trials:uploadImage:table:Modalities')"
-            v-if="IsDicom"
-          />
           <!--检查部位-->
-          <el-table-column
+          <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            prop="BodyPartForEdit"
+            v-if="IsDicom">
-            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            v-if="IsDicom"
-          >
             <template slot-scope="scope">
-              <span>{{
+              <span>{{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}</span>
-                $fd(
-                  'Bodypart',
-                  scope.row.BodyPartForEdit,
-                  'Code',
-                  { Bodypart: bodyPart },
-                  'Name'
-                )
-              }}</span>
             </template>
           </el-table-column>
           <!--序列数量-->
-          <el-table-column
+          <el-table-column prop="ReadingSeriesCount" :label="$t('trials:uploadImage:table:SeriesCount')"
-            prop="ReadingSeriesCount"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:SeriesCount')"
-            v-if="IsDicom"
-          />
           <!--图像数量-->
-          <el-table-column
+          <el-table-column prop="ReadingInstanceCount" :label="$t('trials:uploadImage:table:InstanceCount')"
-            prop="ReadingInstanceCount"
+            v-if="IsDicom" />
-            :label="$t('trials:uploadImage:table:InstanceCount')"
-            v-if="IsDicom"
-          />
           <!--检查时间-->
-          <el-table-column
+          <el-table-column prop="StudyTime" :label="$t('trials:uploadImage:table:StudyTime')" v-if="IsDicom"
-            prop="StudyTime"
+            min-width="130" />
-            :label="$t('trials:uploadImage:table:StudyTime')"
-            v-if="IsDicom"
-            min-width="130"
-          />
           <!--检查模态-->
-          <el-table-column
+          <el-table-column prop="Modality" :label="$t('trials:uploadImage:table:Modalities')" v-if="!IsDicom" />
-            prop="Modality"
-            :label="$t('trials:uploadImage:table:Modalities')"
-            v-if="!IsDicom"
-          />
           <!--检查部位-->
-          <el-table-column
+          <el-table-column prop="BodyPart" :label="$t('trials:uploadImage:table:BodyPartForEdit')" v-if="!IsDicom">
-            prop="BodyPart"
-            :label="$t('trials:uploadImage:table:BodyPartForEdit')"
-            v-if="!IsDicom"
-          >
             <template slot-scope="scope">
-              <span>{{
+              <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
-                $fd(
-                  'Bodypart',
-                  scope.row.BodyPart,
-                  'Code',
-                  { Bodypart: bodyPart },
-                  'Name'
-                )
-              }}</span>
             </template>
           </el-table-column>
           <!--文件数量-->
-          <el-table-column
+          <el-table-column prop="ReadingFileCount" :label="$t('trials:uploadImage:table:FileCount')" v-if="!IsDicom" />
-            prop="ReadingFileCount"
-            :label="$t('trials:uploadImage:table:FileCount')"
-            v-if="!IsDicom"
-          />
           <!--检查时间-->
-          <el-table-column
+          <el-table-column prop="ImageDate" :label="$t('trials:uploadImage:table:StudyTime')" v-if="!IsDicom"
-            prop="ImageDate"
+            min-width="130" />
-            :label="$t('trials:uploadImage:table:StudyTime')"
+          <el-table-column :label="$t('common:action:action')" fixed="right" width="80">
-            v-if="!IsDicom"
-            min-width="130"
-          />
-          <el-table-column
-            :label="$t('common:action:action')"
-            fixed="right"
-            width="80"
-          >
             <template slot-scope="scope">
               <!--预览--->
-              <el-button
+              <el-button circle icon="el-icon-view" :title="$t('trials:uploadImage:button:preview')" v-if="!isUpload"
-                circle
+                @click.stop="preview(scope.row)" />
-                icon="el-icon-view"
-                :title="$t('trials:uploadImage:button:preview')"
-                v-if="!isUpload"
-                @click.stop="preview(scope.row)"
-              />
               <!--编辑--->
-              <el-button
+              <el-button circle icon="el-icon-edit-outline" :title="$t('trials:uploadImage:button:edit')" v-else
-                circle
+                @click.stop="openEdit(scope.row)" />
-                icon="el-icon-edit-outline"
-                :title="$t('trials:uploadImage:button:edit')"
-                v-else
-                @click.stop="openEdit(scope.row)"
-              />
             </template>
           </el-table-column>
         </el-table>
@@ -124,42 +55,20 @@
     <!--新增检查部位-->
     <base-model v-if="editModality_model.visible" :config="editModality_model">
       <template slot="dialog-body">
-        <el-form
+        <el-form ref="editModalityform" :inline="true" :model="form" class="demo-form-inline" :rules="rules">
-          ref="editModalityform"
+          <el-form-item :label="$t('trials:uploadImage:form:ModalityForEdit')" prop="Modality" label-width="150px">
-          :inline="true"
-          :model="form"
-          class="demo-form-inline"
-          :rules="rules"
-        >
-          <el-form-item
-            :label="$t('trials:uploadImage:form:ModalityForEdit')"
-            prop="Modality"
-            label-width="150px"
-          >
             <el-select v-model="form.Modality" placeholder="">
-              <el-option
+              <el-option v-for="item in TrialModality" :key="item" :label="item" :value="item">
-                v-for="item in TrialModality"
-                :key="item"
-                :label="item"
-                :value="item"
-              >
               </el-option>
             </el-select>
           </el-form-item>
         </el-form>
       </template>
       <template slot="dialog-footer">
-        <el-button
+        <el-button type="primary" @click="updateTaskStudyModality" :loading="loading">
-          type="primary"
-          @click="updateTaskStudyModality"
-          :loading="loading"
-        >
           {{ $t('common:button:confirm') }}
         </el-button>
-        <el-button
+        <el-button @click="editModality_model.visible = false" :loading="loading">
-          @click="editModality_model.visible = false"
-          :loading="loading"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
       </template>
@@ -180,9 +89,9 @@ export default {
       },
     },
     bodyPart: {
-      type: Array,
+      type: Object,
       default: () => {
-        return []
+        return {}
       },
     },
     modelList: {
@@ -235,6 +144,7 @@ export default {
         ],
       },
       loading: false,
+      BodyPart: {}
     }
   },
   methods: {
@@ -283,8 +193,28 @@ export default {
         console.log(err)
       }
     },
+    getBodyPart(bodyPart, other) {
+      if (!bodyPart && !other) return ''
+      var separator = ','
+      if (bodyPart.indexOf('|') > -1) {
+        separator = '|'
+      } else if (bodyPart.indexOf(',') > -1) {
+        separator = ','
+      } else if (bodyPart.indexOf('，') > -1) {
+        separator = '，'
+      }
+      var arr = bodyPart.split(separator)
+      console.log(this.bodyPart)
+      var newArr = arr.map((i) => {
+        return this.$fd('Bodypart', i.trim(), 'Code', this.bodyPart, 'Name')
+      })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
+      return newArr.join(' | ')
+    },
   },
 }
 </script>
-<style lang="scss" scoped>
+<style lang="scss" scoped></style>
-</style>

src/store/modules/reading.js

@@ -172,6 +172,22 @@ function getQuestionAnswer(questions, questionMark, answers) {
     return ''
   }
 }
+function getQuerys(e) {
+  if (!e) return "";
+  var t = {},
+    r = [],
+    n = "",
+    a = "";
+  try {
+    var i = [];
+    if (e.indexOf("?") >= 0 && (i = e.substring(e.indexOf("?") + 1, e.length).split("&")), i.length > 0) for (var o in i) n = (r = i[o].split("="))[0],
+      a = r[1],
+      t[n] = a
+  } catch (s) {
+    t = {}
+  }
+  return t
+}
 async function getBodyPart(bodyPart, other) {
   if (!bodyPart && !other) return ''
   var separator = ','
@@ -183,7 +199,8 @@ async function getBodyPart(bodyPart, other) {
     separator = '，'
   }
   let BodyPart = {}
-  BodyPart.Bodypart = await Vue.prototype.$getBodyPart(Vue.prototype.$route.query.trialId)
+  let query = getQuerys(window.location.href)
+  BodyPart.Bodypart = await Vue.prototype.$getBodyPart(query.trialId)
   var arr = bodyPart.split(separator)
   var newArr = arr.map((i) => {
     return Vue.prototype.$fd('Bodypart', i.trim(), 'Code', BodyPart, 'Name')
@@ -874,9 +891,15 @@ const actions = {
         var keyImages = []
         getReadingVisitStudyList(obj.trialId, obj.subjectVisitId, obj.visitTaskId).then(res => {
           try {
+            state.BodyPart = []
             res.Result.forEach(async item => {
               let arr = await getBodyPart(item.BodyPartForEdit, item.BodyPartForEditOther)
-              state.BodyPart[item.StudyId] = arr
+              state.BodyPart.push({
+                StudyId: item.StudyId,
+                StudyCode: item.StudyCode,
+                BodyPart: arr,
+                Modalities: item.Modalities
+              })
             })
           } catch (err) {
             console.log(err)

src/views/none-dicom-show/index.vue

@@ -7,78 +7,47 @@
       <div class="left-content">
         <!-- 检查层级 -->
         <el-collapse v-model="activeNames" @change="handleChange">
-          <el-collapse-item
+          <el-collapse-item v-for="(study, i) in studyList" :key="study.CodeView" :name="study.CodeView"><template
-            v-for="(study, i) in studyList"
+              slot="title">
-            :key="study.CodeView"
-            :name="study.CodeView"
-            ><template slot="title">
               <div class="study-desc">
                 <span>{{ study.CodeView }}</span>
                 <span v-if="OtherInfo.IsShowStudyName" style="margin-left: 5px">
                   {{ study.StudyName }}
                 </span>
                 <span style="margin: 0 5px">{{ study.Modality }}</span>
-                <span>{{ getBodyPart(study.BodyPart) }}</span>
+                <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
               </div>
             </template>
             <!-- 文件层级 -->
-            <div
+            <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
-              v-if="study.NoneDicomStudyFileList.length === 0"
-              class="empty-text"
-            >
               <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
             </div>
             <div v-else id="imgList" style="height: 100%; overflow: hidden">
               <template v-for="(item, j) in study.NoneDicomStudyFileList">
-                <div
+                <div :id="`img${item.Id}`" :key="item.Id" :class="{
-                  :id="`img${item.Id}`"
+                  'is-boxActive': item.Id === currentFileId,
-                  :key="item.Id"
+                }" class="img-box" @click="selected(item, i, j, true)">
-                  :class="{
-                    'is-boxActive': item.Id === currentFileId,
-                  }"
-                  class="img-box"
-                  @click="selected(item, i, j, true)"
-                >
                   <div class="file-image">
-                    <el-image
+                    <el-image v-if="
-                      v-if="
+                      [
-                        [
+                        'image/jpeg',
-                          'image/jpeg',
+                        'image/jpg',
-                          'image/jpg',
+                        'image/png',
-                          'image/png',
+                        'image/bmp',
-                          'image/bmp',
+                      ].includes(item.FileType)
-                        ].includes(item.FileType)
+                    " style="width: 100%; height: 100%"
-                      "
-                      style="width: 100%; height: 100%"
                       :src="`${OSSclientConfig.basePath}${item.Path}?x-oss-process=image/resize,w_50,h_50/format,png`"
-                      fit="contain"
+                      fit="contain" crossorigin="anonymous" />
-                      crossorigin="anonymous"
+                    <el-image v-else-if="item.FileType === 'application/pdf'" style="width: 100%; height: 100%"
-                    />
+                      :src="pdf" fit="contain" crossorigin="anonymous" />
-                    <el-image
+                    <el-image v-else-if="
-                      v-else-if="item.FileType === 'application/pdf'"
+                      item.FileType === 'application/x-zip-compressed'
-                      style="width: 100%; height: 100%"
+                    " style="width: 100%; height: 100%" :src="zip" fit="contain" crossorigin="anonymous" />
-                      :src="pdf"
-                      fit="contain"
-                      crossorigin="anonymous"
-                    />
-                    <el-image
-                      v-else-if="
-                        item.FileType === 'application/x-zip-compressed'
-                      "
-                      style="width: 100%; height: 100%"
-                      :src="zip"
-                      fit="contain"
-                      crossorigin="anonymous"
-                    />
                   </div>
                   <div v-if="item.FileName.length < 15" class="img-text">
                     {{ `${j + 1}. ${item.FileName}` }}
                   </div>
-                  <el-tooltip
+                  <el-tooltip v-else :content="item.FileName" placement="bottom">
-                    v-else
-                    :content="item.FileName"
-                    placement="bottom"
-                  >
                     <div class="img-text">
                       {{ `${j + 1}. ${item.FileName}` }}
                     </div>
@@ -86,23 +55,15 @@
                   <div v-if="isQcCheck" class="switchBox">
                     <div class="item">
                       <span>{{ $t('trials:audit:table:isReading') }}</span>
-                      <el-switch
+                      <el-switch v-model="item.IsReading" :disabled="item.IsDeleted || isAudit"
-                        v-model="item.IsReading"
+                        @change="changeReadingStatus($event, study, item)" :active-text="$fd('YesOrNo', true)"
-                        :disabled="item.IsDeleted || isAudit"
+                        :inactive-text="$fd('YesOrNo', false)" />
-                        @change="changeReadingStatus($event, study, item)"
-                        :active-text="$fd('YesOrNo', true)"
-                        :inactive-text="$fd('YesOrNo', false)"
-                      />
                     </div>
                     <div class="item">
                       <span>{{ $t('trials:audit:table:isDelete') }}</span>
-                      <el-switch
+                      <el-switch v-model="item.IsDeleted" :disabled="isAudit"
-                        v-model="item.IsDeleted"
+                        @change="changeDeleteStatus($event, study, item)" :active-text="$fd('YesOrNo', true)"
-                        :disabled="isAudit"
+                        :inactive-text="$fd('YesOrNo', false)" />
-                        @change="changeDeleteStatus($event, study, item)"
-                        :active-text="$fd('YesOrNo', true)"
-                        :inactive-text="$fd('YesOrNo', false)"
-                      />
                     </div>
                   </div>
                 </div>
@@ -115,14 +76,8 @@
     <!-- 预览图像 -->
     <el-card class="box-card right">
       <div style="width: 100%; height: 100%" v-if="!showPDF">
-        <Preview
+        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width: 100%"
-          v-if="previewImage.imgList.length > 0"
+          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
-          ref="previewImage"
-          style="width: 100%"
-          :preview-image="previewImage"
-          :value="currentStudyFileIndex"
-          @selectedImg="selectedImg"
-        />
       </div>
       <div style="width: 100%; height: 100%" v-else>
         <PreviewFile :file-path="pdfFile.path" :file-type="pdfFile.type" />
@@ -174,7 +129,7 @@ export default {
       subjectVisitId: '',
       sudyId: '',
       loading: false,
-      bp: [],
+      BodyPart: {},
       OtherInfo: {},
       showPDF: false,
       pdfFile: {
@@ -188,7 +143,7 @@ export default {
     }
   },
   async created() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.isQcCheck = !!this.$route.query.isQcCheck
   },
   async mounted() {
@@ -202,7 +157,7 @@ export default {
     // 默认选择第一个文件
   },
   methods: {
-    handleChange() {},
+    handleChange() { },
     changeReadingStatus(callback, row, file) {
       let statusStr = ''
       if (callback) {
@@ -245,7 +200,7 @@ export default {
               this.loading = false
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     changeDeleteStatus(callback, row, file) {
       let statusStr = ''
@@ -295,8 +250,8 @@ export default {
           // file.IsDeleted = !file.IsDeleted
         })
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -307,14 +262,12 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
-        return this.$fd(
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
-          'Bodypart',
-          i.trim(),
-          'Code',
-          { Bodypart: this.bp },
-          'Name'
-        )
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
     },
     // 获取非Dicom检查信息
@@ -406,24 +359,29 @@ export default {
   height: 100%;
   padding: 10px;
   display: flex;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
+
   ::v-deep .el-card__body {
     padding: 0px;
   }
 }
+
 .study-desc {
   padding: 10px 5px;
   line-height: 20px;
   background-color: #d5d5d5;
   font-weight: 500;
 }
+
 .left {
   width: 220px;
   height: 100%;
@@ -434,6 +392,7 @@ export default {
     display: flex;
     flex-direction: column;
   }
+
   .title {
     height: 40px;
     line-height: 40px;
@@ -443,6 +402,7 @@ export default {
     background-color: #4e4e4e;
     color: #ffffff;
   }
+
   .left-content {
     flex: 1;
     overflow-y: auto;
@@ -474,6 +434,7 @@ export default {
     // margin-bottom: 5px;
     padding-left: 5px;
   }
+
   .img-text {
     display: inline-block;
     width: calc(100% - 60px);
@@ -481,33 +442,41 @@ export default {
     height: 50px;
     line-height: 50px;
     overflow: hidden;
-    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    text-overflow: ellipsis;
+    /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
+
   .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
+
   .is-boxActive {
     // border-color: #409eff;
     color: #409eff;
   }
+
   .is-boxActiv:after {
     opacity: 0;
   }
 }
+
 .right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
+
   ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
+
 .switchBox {
   width: 100%;
   margin: 5px 0;
   color: #4e4e4e;
+
   .item {
     display: flex;
     align-items: center;
@@ -515,17 +484,21 @@ export default {
     margin-bottom: 5px;
   }
 }
+
 .file-image {
   width: 50px;
   height: 50px;
 }
+
 ::v-deep .el-collapse-item__header {
   background-color: #d5d5d5;
 }
+
 ::v-deep .el-collapse-item__header {
   min-height: 48px;
   height: auto;
 }
+
 ::v-deep .el-collapse-item__content {
   padding-bottom: 0;
 }

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

@@ -9,9 +9,11 @@
       </el-tooltip>
     </div>
     <!-- 检查部位 -->
-    <div v-else-if="CriterionType == 19 || CriterionType == 20" class="info-cd" @click.stop="handleViewBP($event)">
+    <div v-if="CriterionType == 19 || CriterionType == 20"
+      :class="{ 'info-cd': true, 'info-cd2': stack.isExistsClinicalData }" @click.stop="handleViewBP($event)">
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:BodyPart')" placement="bottom">
-        <svg-icon icon-class="documentation" class="svg-icon" />
+        <!-- <svg-icon icon-class="documentation" class="svg-icon" /> -->
+        <i class="el-icon-tickets"></i>
       </el-tooltip>
     </div>
     <!-- 切换访视 -->
@@ -2012,7 +2014,7 @@ export default {
       e.preventDefault()
     },
     handleViewBP(e) {
-      DicomEvent.$emit('previewBP', this.series.studyId)
+      DicomEvent.$emit('previewBP', this.stack.visitTaskId)
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
@@ -2127,6 +2129,10 @@ export default {
   cursor: pointer;
 }
 
+.info-cd2 {
+  left: 35px;
+}
+
 .info-series {
   position: absolute;
   left: 10px;

src/views/trials/trials-panel/reading/dicoms/components/PCWG/QuestionForm.vue

@@ -364,6 +364,15 @@ export default {
       this.lesionName = this.getLesionInfo(this.orderMark, this.rowIndex)
       this.isCurrentTaskAdd = this.answers.IsCurrentTaskAdd ? this.answers.IsCurrentTaskAdd : 'True'
       this.lesionMark = this.getLesionName(this.orderMark, this.questionForm.RowIndex)
+
+      var isLymphLesion = this.getQuestionVal(2)
+      isLymphLesion = isLymphLesion ? parseInt(isLymphLesion) : null
+      var lesionOrgan = this.getQuestionVal(6)
+      const lesionPart = this.getQuestionVal(8)
+
+      this.$emit('resetQuestions', { isLymphLesion, lesionPart, lesionOrgan, saveTypeEnum: this.questionForm.saveTypeEnum, lesionState, lesionNum, rowIndex: this.rowIndex, questionId: this.parentQsId, anwsers: this.questionForm })
+
+
       this.isRender = true
     },
     getLesionName(orderMark, rowIndex) {

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

@@ -134,10 +134,20 @@
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <span>{{ Array.isArray(this.BodyPartForEdit) ? this.BodyPartForEdit.join("|") : '' }}</span>
+        <el-table :data="BodyPart" style="width: 100%">
-        <div style="text-align:right">
+          <el-table-column prop="StudyCode" :label="$t('trials:reading:table:StudyCode')">
+          </el-table-column>
+          <el-table-column prop="Modalities" :label="$t('trials:reading:table:Modalities')">
+          </el-table-column>
+          <el-table-column prop="BodyPart" :label="$t('trials:reading:table:BodyPart')">
+            <template slot-scope="scope">
+              <span>{{ Array.isArray(scope.row.BodyPart) ? scope.row.BodyPart.join(" | ") : '' }}</span>
+            </template>
+          </el-table-column>
+        </el-table>
+        <div style="text-align:right;margin-top: 10px;">
           <!-- 确认 -->
-          <el-button type="primary" @click="dialogBodyPartVisible = false">{{ $t('trials:reading:button:confirm')
+          <el-button type="primary" @click="handleConfirmBP">{{ $t('trials:reading:button:confirm')
           }}</el-button>
         </div>
       </div>
@@ -145,7 +155,7 @@
   </div>
 </template>
 <script>
-import { getNextTask, readClinicalData, verifyDefaultQuestionBeAnswer } from '@/api/trials'
+import { getNextTask, readClinicalData, verifyDefaultQuestionBeAnswer, viewstudyPart } from '@/api/trials'
 import VisitReview from './../dicoms3D/components/VisitReview'
 import ReadPage from './components/ReadPage'
 import CustomizeReadPage from './customize/CustomizeReadPage'
@@ -209,8 +219,7 @@ export default {
       closeCDVisible: false,
       cdVisitTaskId: '',
       readingVersionEnum: null,
-      dialogBodyPartVisible: false,
+      dialogBodyPartVisible: false
-      BodyPartForEdit: []
     }
   },
   computed: {
@@ -242,9 +251,7 @@ export default {
       this.dialogVisible = true
       this.cdVisitTaskId = taskId
     })
-    DicomEvent.$on('previewBP', (studyId) => {
+    DicomEvent.$on('previewBP', (taskId) => {
-      console.log(this.BodyPart, 'this.BodyPart')
-      this.BodyPartForEdit = this.BodyPart[studyId]
       this.isFullscreen = false
       this.dialogBodyPartVisible = true
     })
@@ -278,6 +285,7 @@ export default {
   beforeDestroy() {
     DicomEvent.$off('getNextTask')
     DicomEvent.$off('previewCD')
+    DicomEvent.$off('previewBP')
     DicomEvent.$emit('resetOpenWindow')
     window.removeEventListener('beforeunload', this.handleWindowClose)
   },
@@ -320,6 +328,7 @@ export default {
         this.isExistsClinicalData = res.Result.IsExistsClinicalData
         this.isExistsManual = res.Result.ExistsManual
         this.isReadClinicalData = res.Result.IsReadClinicalData
+        this.IsViewStudyPart = res.Result.IsViewStudyPart
         this.isNeedReadClinicalData = res.Result.IsNeedReadClinicalData
         this.CriterionType = res.Result.CriterionType
         this.digitPlaces = res.Result.DigitPlaces
@@ -340,6 +349,10 @@ export default {
           this.dialogVisible = true
           this.cdVisitTaskId = this.visitTaskId
         }
+        if ((this.CriterionType === 19 || this.CriterionType === 20) && !this.IsViewStudyPart) {
+          this.isFullscreen = false
+          this.dialogBodyPartVisible = true
+        }
         if (res.Result.ReadingCategory === 1) {
           this.activeName = 'read'
           this.tabs = [this.activeName]
@@ -485,6 +498,18 @@ export default {
         this.loading = false
       }
     },
+    async handleConfirmBP() {
+      this.loading = true
+      var visitTaskId = this.visitTaskId
+      try {
+        await viewstudyPart({ visitTaskId })
+        this.loading = false
+        this.dialogBodyPartVisible = false
+        this.IsViewStudyPart = true
+      } catch (e) {
+        this.loading = false
+      }
+    },
     previewCD() {
       this.closeCDVisible = true
       this.isFullscreen = false

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

@@ -7,33 +7,26 @@
       </div>
       <div style="height: 100%;" class="left-content">
         <!-- 检查层级 -->
-        <div v-for="(study,i) in studyList" :key="study.CodeView">
+        <div v-for="(study, i) in studyList" :key="study.CodeView">
           <div class="study-desc">
             <span>{{ study.CodeView }}</span>
             <span style="margin:0 5px">{{ study.Modality }}</span>
-            <span>{{ getBodyPart(study.BodyPart) }}</span>
+            <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
           </div>
           <!-- 文件层级 -->
           <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
             <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
           </div>
           <div v-else id="imgList" style="height:100%;">
-            <div
+            <div v-for="(item, j) in study.NoneDicomStudyFileList" :id="`img${item.Id}`" :key="item.Id" :class="{
-              v-for="(item,j) in study.NoneDicomStudyFileList"
+              'is-boxActive': item.Id === currentFileId
-              :id="`img${item.Id}`"
+            }" class="img-box" @click="selected(item, i, j, true)">
-              :key="item.Id"
-              :class="{
-                'is-boxActive': item.Id === currentFileId
-              }"
-              class="img-box"
-              @click="selected(item,i,j,true)"
-            >
               <div v-if="item.FileName.length < 15" class="img-text">
-                {{ `${j+1}. ${item.FileName}` }}
+                {{ `${j + 1}. ${item.FileName}` }}
               </div>
               <el-tooltip v-else :content="item.FileName" placement="bottom">
                 <div class="img-text">
-                  {{ `${j+1}. ${item.FileName}` }}
+                  {{ `${j + 1}. ${item.FileName}` }}
                 </div>
               </el-tooltip>
             </div>
@@ -46,15 +39,9 @@
     <!-- 预览图像 -->
     <el-card class="box-card right">
       <div style="width:100%;height: 100%;">
-        <NoneDicomsViewer
+        <NoneDicomsViewer v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;"
-          v-if="previewImage.imgList.length > 0"
+          :preview-image="previewImage" :value="currentStudyFileIndex" :reading-task-state="readingTaskState"
-          ref="previewImage"
+          @selectedImg="selectedImg" />
-          style="width:100%;"
-          :preview-image="previewImage"
-          :value="currentStudyFileIndex"
-          :reading-task-state="readingTaskState"
-          @selectedImg="selectedImg"
-        />
       </div>
 
     </el-card>
@@ -103,11 +90,11 @@ export default {
       visistTaskId: '',
       taskBlindName: '',
       readingTaskState: 2,
-      bp: []
+      BodyPart: {}
     }
   },
   async mounted() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     if (this.$router.currentRoute.query.TokenKey) {
       store.dispatch('user/setToken', this.$router.currentRoute.query.TokenKey)
       changeURLStatic('TokenKey', '')
@@ -183,8 +170,8 @@ export default {
     preview() {
       this.previewVisible = true
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -194,51 +181,61 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
+      var newArr = arr.map((i) => {
-        return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
-    }
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.img-container{
+.img-container {
   flex: 1;
   width: 100%;
   height: 100%;
   padding: 10px;
   display: flex;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
     padding: 0px;
   }
 }
-.study-desc{
+
+.study-desc {
   padding: 10px 5px;
   line-height: 1;
   background-color: #ebebeb;
   font-weight: 500;
 }
-.left{
+
-  width:240px;
+.left {
+  width: 240px;
   height: 100%;
 
-  ::v-deep .el-card__body{
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
     flex-direction: column;
   }
-  .title{
+
+  .title {
     height: 40px;
     line-height: 40px;
     border: 1ppx solid;
@@ -247,27 +244,32 @@ export default {
     background-color: #4e4e4e;
     color: #ffffff;
   }
-  .left-content{
+
+  .left-content {
     flex: 1;
     overflow-y: auto;
   }
-::v-deep .el-tabs{
+
+  ::v-deep .el-tabs {
     height: 100%;
-    display:flex;
+    display: flex;
 
     flex-direction: column;
   }
-  ::v-deep .el-tabs__header{
+
+  ::v-deep .el-tabs__header {
     height: 40px;
     padding: 0 5px;
     margin-bottom: 5px;
   }
-  ::v-deep .el-tabs__content{
+
+  ::v-deep .el-tabs__content {
     flex: 1;
     overflow-y: auto;
     padding: 0 5px;
   }
-  .img-box{
+
+  .img-box {
     // position: relative;
     display: inline-block;
     box-sizing: border-box;
@@ -276,34 +278,40 @@ export default {
     // margin-bottom: 5px;
     padding-left: 5px;
   }
-  .img-text{
+
+  .img-text {
     display: inline-block;
     width: 200px;
     height: 50px;
     line-height: 50px;
     overflow: hidden;
-    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    text-overflow: ellipsis;
+    /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
-  .img-box:nth-last-child(1){
+
+  .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
+
   .is-boxActive {
     // border-color: #409eff;
     color: #409eff;
   }
+
   .is-boxActiv:after {
     opacity: 0;
   }
 }
-.right{
+
+.right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
-
 </style>

src/views/trials/trials-panel/reading/dicoms3D/components/Recist/QuestionList.vue

@@ -98,11 +98,11 @@
                           <div
                             style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
                             <template
-                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                              v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
                             </template>
                             <template
-                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                              v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
                             </template>
                           </div>

src/views/trials/trials-panel/reading/dicoms3D/components/mRecist/QuestionList.vue

@@ -123,10 +123,10 @@
                             </span>
                           </div>
                           <div style="display: inline-block;margin-left:5px;white-space: nowrap;overflow: hidden;text-overflow: ellipsis;max-width:60px">
-                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
+                            <template v-if="innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionShort }}mm
                             </template>
-                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphLesion && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
+                            <template v-else-if="!innerFormData[`${table.Id}_${answer.RowIndex}`].IsLymphNodes && !isNaN(parseInt(innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength))">
                               {{ innerFormData[`${table.Id}_${answer.RowIndex}`].LesionLength }}mm
                             </template>
                           </div>
@@ -536,7 +536,7 @@ export default {
             this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
           }
 
-          if (!(innerForm.IsCurrentTaskAdd === 'True')) {
+          if (!(innerForm.IsCurrentTaskAdd === 'True') && lesionType !== 2) {
             // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
             if (!this.isBaseLineTask && ((obj.toolName === 'Length' && length >= 10) || (obj.toolName === 'Bidirectional' && short >= 10))) {
               this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
@@ -624,9 +624,10 @@ export default {
         this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)
         this.$set(this.innerFormData[`${tableId}_${rowIndex}`], stateId, 0)
       }
+      const intrahepaticLesion = this.innerFormData[`${tableId}_${rowIndex}`].IntrahepaticLesion
       const isCurrentTaskAdd = this.innerFormData[`${tableId}_${rowIndex}`].IsCurrentTaskAdd
       const isLymphNodes = this.innerFormData[`${tableId}_${rowIndex}`].IsLymphNodes
-      if (!(isCurrentTaskAdd === 'True')) {
+      if (!(isCurrentTaskAdd === 'True') && lesionType !== 2) {
         // 非基线时，非淋巴结病灶长径>=10mm，自动给“存在”状态，如果淋巴结病灶短径>=10mm，自动给“存在”状态。
         if (!this.isBaseLineTask && ((toolName === 'Length' && length >= 10) || (toolName === 'Bidirectional' && short >= 10))) {
           this.$set(this.innerFormData[`${tableId}_${rowIndex}`], 'LesionState', 0)

src/views/trials/trials-panel/reading/none-dicoms/components/VisitReview.vue

@@ -9,33 +9,26 @@
         <el-tab-pane :label="$t('trials:clinicaldara:title:currentTask')" name="first" class="left-content">
           <div>
             <!-- 检查层级 -->
-            <div v-for="(study,i) in studyList" :key="study.CodeView">
+            <div v-for="(study, i) in studyList" :key="study.CodeView">
               <div class="study-desc">
                 <span>{{ study.CodeView }}</span>
                 <span style="margin:0 5px">{{ study.Modality }}</span>
-                <span>{{ getBodyPart(study.BodyPart) }}</span>
+                <span>{{ getBodyPart(study.BodyPart, study.BodyPartForEditOther) }}</span>
               </div>
               <!-- 文件层级 -->
               <div v-if="study.NoneDicomStudyFileList.length === 0" class="empty-text">
                 <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
               </div>
               <div v-else id="imgList" style="height:100%;">
-                <div
+                <div v-for="(item, j) in study.NoneDicomStudyFileList" :id="`img${item.Id}`" :key="item.Id" :class="{
-                  v-for="(item,j) in study.NoneDicomStudyFileList"
+                  'is-boxActive': item.Id === currentFileId
-                  :id="`img${item.Id}`"
+                }" class="img-box" @click="selected(item, i, j, true)">
-                  :key="item.Id"
-                  :class="{
-                    'is-boxActive': item.Id === currentFileId
-                  }"
-                  class="img-box"
-                  @click="selected(item,i,j,true)"
-                >
                   <div v-if="item.FileName.length < 15" class="img-text">
-                    {{ `${j+1}. ${item.FileName}` }}
+                    {{ `${j + 1}. ${item.FileName}` }}
                   </div>
                   <el-tooltip v-else :content="item.FileName" placement="bottom">
                     <div class="img-text">
-                      {{ `${j+1}. ${item.FileName}` }}
+                      {{ `${j + 1}. ${item.FileName}` }}
                     </div>
                   </el-tooltip>
                 </div>
@@ -51,21 +44,15 @@
               <slot name="empty">{{ $t('trials:audit:message:noData') }}</slot>
             </div>
             <div v-else>
-              <div
+              <div v-for="(task, j) in associatedList" :key="task.VisitTaskId" :class="{
-                v-for="(task,j) in associatedList"
+                'is-boxActive': task.VisitTaskId === currentTaskId
-                :key="task.VisitTaskId"
+              }" class="img-box" @click="handleImageRead(task)">
-                :class="{
-                  'is-boxActive': task.VisitTaskId === currentTaskId
-                }"
-                class="img-box"
-                @click="handleImageRead(task)"
-              >
                 <div v-if="task.TaskBlindName.length < 15" class="img-text">
-                  {{ `${j+1}. ${task.TaskBlindName}` }}
+                  {{ `${j + 1}. ${task.TaskBlindName}` }}
                 </div>
                 <el-tooltip v-else :content="task.TaskBlindName" placement="bottom">
                   <div class="img-text">
-                    {{ `${j+1}. ${task.TaskBlindName}` }}
+                    {{ `${j + 1}. ${task.TaskBlindName}` }}
                   </div>
                 </el-tooltip>
               </div>
@@ -78,14 +65,8 @@
     <!-- 预览图像 -->
     <el-card v-loading="loading" class="box-card right">
       <div style="width:100%;height: 100%;">
-        <Preview
+        <Preview v-if="previewImage.imgList.length > 0" ref="previewImage" style="width:100%;"
-          v-if="previewImage.imgList.length > 0"
+          :preview-image="previewImage" :value="currentStudyFileIndex" @selectedImg="selectedImg" />
-          ref="previewImage"
-          style="width:100%;"
-          :preview-image="previewImage"
-          :value="currentStudyFileIndex"
-          @selectedImg="selectedImg"
-        />
       </div>
 
     </el-card>
@@ -101,18 +82,12 @@
         </el-button>
       </div> -->
       <Criterions
-        v-if="otherInfo && visitTaskId!== '' && subjectId!== '' && readingCategory!==null && readingCategory!==4"
+        v-if="otherInfo && visitTaskId !== '' && subjectId !== '' && readingCategory !== null && readingCategory !== 4"
-        :trial-id="trialId"
+        :trial-id="trialId" :subject-id="subjectId" :visit-task-id="visitTaskId"
-        :subject-id="subjectId"
+        :criterion-id="otherInfo.TrialCriterionId" :subject-code="subjectCode" :task-blind-name="taskBlindName"
-        :visit-task-id="visitTaskId"
-        :criterion-id="otherInfo.TrialCriterionId"
-        :subject-code="subjectCode"
-        :task-blind-name="taskBlindName"
         :is-reading-show-subject-info="isReadingShowSubjectInfo"
-        :ise-c-r-f-show-in-dicom-reading="iseCRFShowInDicomReading"
+        :ise-c-r-f-show-in-dicom-reading="iseCRFShowInDicomReading" :isExistsClinicalData="isExistsClinicalData"
-        :isExistsClinicalData="isExistsClinicalData"
+        @previewCD="previewCD" />
-        @previewCD="previewCD"
-      />
     </el-card>
   </div>
 
@@ -203,7 +178,7 @@ export default {
       currentTaskId: '',
       otherInfo: null,
       isReadingShowPreviousResults: false,
-      bp: [],
+      BodyPart: {},
       openWindow: null
     }
   },
@@ -213,7 +188,7 @@ export default {
     }
   },
   async mounted() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.isReadingShowPreviousResults = this.$router.currentRoute.query.isReadingShowPreviousResults !== undefined ? this.$router.currentRoute.query.isReadingShowPreviousResults : true
 
     this.getNoneDicomList(this.isReadingShowPreviousResults)
@@ -327,8 +302,8 @@ export default {
       // window.open(routeData.href, '_blank')
       this.$emit('previewCD', this.visitTaskId)
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -338,51 +313,61 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
+      var newArr = arr.map((i) => {
-        return this.$fd('Bodypart', i.trim(), 'Code', { Bodypart: this.bp }, 'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
-    }
+    },
   }
 }
 </script>
 
 <style lang="scss" scoped>
-.img-container{
+.img-container {
   flex: 1;
   width: 100%;
   height: 100%;
   padding-bottom: 10px;
   display: flex;
+
   ::-webkit-scrollbar {
     width: 7px;
     height: 7px;
   }
+
   ::-webkit-scrollbar-thumb {
     border-radius: 10px;
     background: #d0d0d0;
   }
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
     padding: 0px;
   }
 }
-.study-desc{
+
+.study-desc {
   padding: 10px 5px;
   line-height: 1;
   background-color: #ebebeb;
   font-weight: 500;
 }
-.left{
+
-  width:240px;
+.left {
+  width: 240px;
   height: 100%;
 
-  ::v-deep .el-card__body{
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
     display: flex;
     flex-direction: column;
   }
-  .title{
+
+  .title {
     // height: 40px;
     // line-height: 40px;
     border: 1ppx solid;
@@ -390,34 +375,40 @@ export default {
     // padding-left: 10px;
     background-color: #4e4e4e;
     color: #ffffff;
-    h4{
+
+    h4 {
       padding: 5px 0px;
       margin: 0;
       text-align: center;
       background-color: #4c4c4c;
     }
   }
-  .left-content{
+
+  .left-content {
     flex: 1;
     overflow-y: auto;
   }
-::v-deep .el-tabs{
+
+  ::v-deep .el-tabs {
     height: 100%;
-    display:flex;
+    display: flex;
 
     flex-direction: column;
   }
-  ::v-deep .el-tabs__header{
+
+  ::v-deep .el-tabs__header {
     height: 40px;
     padding: 0 5px;
     margin-bottom: 5px;
   }
-  ::v-deep .el-tabs__content{
+
+  ::v-deep .el-tabs__content {
     flex: 1;
     overflow-y: auto;
     padding: 0 5px;
   }
-  .img-box{
+
+  .img-box {
     // position: relative;
     display: inline-block;
     box-sizing: border-box;
@@ -426,34 +417,40 @@ export default {
     // margin-bottom: 5px;
     padding-left: 5px;
   }
-  .img-text{
+
+  .img-text {
     display: inline-block;
     width: 200px;
     height: 50px;
     line-height: 50px;
     overflow: hidden;
-    text-overflow: ellipsis; /* 用省略号表示溢出的文本 */
+    text-overflow: ellipsis;
+    /* 用省略号表示溢出的文本 */
     white-space: nowrap;
   }
-  .img-box:nth-last-child(1){
+
+  .img-box:nth-last-child(1) {
     margin-bottom: 0px;
   }
+
   .is-boxActive {
     // border-color: #409eff;
     color: #409eff;
   }
+
   .is-boxActiv:after {
     opacity: 0;
   }
 }
-.right{
+
+.right {
   flex: 1;
   height: 100%;
   margin-left: 10px;
-  ::v-deep .el-card__body{
+
+  ::v-deep .el-card__body {
     height: 100%;
     width: 100%;
   }
 }
-
 </style>

src/views/trials/trials-panel/subject/brain-metastasis/components/subjectStudy.vue

@@ -1,164 +1,85 @@
 <template>
   <div>
     <el-divider content-position="left">{{ $t('trials:readingPeriod:title:study') }}</el-divider>
-    <el-table
+    <el-table v-loading="btnLoading" :data="studyList" style="width: 100%" :row-class-name="tableRowClassName"
-    v-loading="btnLoading"
+      max-height="250">
-    :data="studyList"
+      <!-- 检查编号 -->
-    style="width: 100%"
+      <el-table-column prop="StudyCode" :label="$t('trials:uploadedDicoms:table:studyId')" min-width="80"
-    :row-class-name="tableRowClassName"
+        show-overflow-tooltip />
-    max-height="250"
+      <!-- 检查类型 -->
-    >
+      <el-table-column prop="ModalityForEdit" :label="$t('trials:audit:table:modality')" />
-    <!-- 检查编号 -->
+      <!-- 检查设备 -->
-    <el-table-column
+      <el-table-column prop="Modalities" :label="$t('trials:audit:table:modality1')" />
-      prop="StudyCode"
+      <!-- 检查部位 -->
-      :label="$t('trials:uploadedDicoms:table:studyId')"
+      <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadedDicoms:table:bodyPart')" min-width="100"
-      min-width="80"
+        show-overflow-tooltip>
-      show-overflow-tooltip
+        <template slot-scope="scope">
-    />
+          {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
-    <!-- 检查类型 -->
+        </template>
-    <el-table-column
+      </el-table-column>
-      prop="ModalityForEdit"
+      <!-- 序列数量 -->
-      :label="$t('trials:audit:table:modality')"
+      <el-table-column prop="SeriesCount" :label="$t('trials:uploadedDicoms:table:seriesCount')" min-width="100"
-    />
+        show-overflow-tooltip />
-    <!-- 检查设备 -->
+      <!-- 图像数量 -->
-    <el-table-column
+      <el-table-column prop="InstanceCount" :label="$t('trials:uploadedDicoms:table:instanceCount')" min-width="100"
-      prop="Modalities"
+        show-overflow-tooltip />
-      :label="$t('trials:audit:table:modality1')"
+      <!-- 检查日期 -->
-    />
+      <el-table-column prop="StudyTime" :label="$t('trials:uploadedDicoms:table:studyDate')" min-width="120"
-    <!-- 检查部位 -->
+        show-overflow-tooltip>
-    <el-table-column
+        <!--      <template slot-scope="scope">-->
-      prop="BodyPartForEdit"
+        <!--        {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD'):'' }}-->
-      :label="$t('trials:uploadedDicoms:table:bodyPart')"
+        <!--      </template>-->
-      min-width="100"
+      </el-table-column>
-      show-overflow-tooltip
+      <!-- 上传时间 -->
-    >
+      <el-table-column prop="UploadedTime" :label="$t('trials:uploadedDicoms:table:uploadedTime')" min-width="80"
-      <template slot-scope="scope">
+        show-overflow-tooltip />
-        {{ getBodyPart(scope.row.BodyPartForEdit)}}
+      <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
-      </template>
+        <template slot-scope="scope">
-    </el-table-column>
+          <!-- 预览 -->
-    <!-- 序列数量 -->
+          <el-button icon="el-icon-view" :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-    <el-table-column
+            :title="$t('trials:uploadedDicoms:action:preview')" circle @click="handleViewStudy(scope.row)" />
-      prop="SeriesCount"
+        </template>
-      :label="$t('trials:uploadedDicoms:table:seriesCount')"
+      </el-table-column>
-      min-width="100"
-      show-overflow-tooltip
-    />
-    <!-- 图像数量 -->
-    <el-table-column
-      prop="InstanceCount"
-      :label="$t('trials:uploadedDicoms:table:instanceCount')"
-      min-width="100"
-      show-overflow-tooltip
-    />
-    <!-- 检查日期 -->
-    <el-table-column
-      prop="StudyTime"
-      :label="$t('trials:uploadedDicoms:table:studyDate')"
-      min-width="120"
-      show-overflow-tooltip
-    >
-<!--      <template slot-scope="scope">-->
-<!--        {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD'):'' }}-->
-<!--      </template>-->
-    </el-table-column>
-    <!-- 上传时间 -->
-    <el-table-column
-      prop="UploadedTime"
-      :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-      min-width="80"
-      show-overflow-tooltip
-    />
-    <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
-      <template slot-scope="scope">
-        <!-- 预览 -->
-        <el-button
-          icon="el-icon-view"
-          :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-          :title="$t('trials:uploadedDicoms:action:preview')"
-          circle
-          @click="handleViewStudy(scope.row)"
-        />
-      </template>
-    </el-table-column>
     </el-table>
     <el-divider content-position="left">{{ $t('trials:readingPeriod:title:series') }}</el-divider>
-    <el-table
+    <el-table :data="seriesList" v-loading="btnLoading" :row-class-name="tableRowClassName">
-      :data="seriesList"
-      v-loading="btnLoading"
-      :row-class-name="tableRowClassName"
-    >
       <!-- 序列号 -->
-      <el-table-column
+      <el-table-column prop="SeriesNumber" :label="$t('trials:audit:table:seriesId')" />
-        prop="SeriesNumber"
-        :label="$t('trials:audit:table:seriesId')"
-      />
       <!-- 检查编号 -->
-      <el-table-column
+      <el-table-column prop="StudyCode" :label="$t('trials:audit:table:seriesOfStudyId')" />
-        prop="StudyCode"
-        :label="$t('trials:audit:table:seriesOfStudyId')"
-      />
       <!-- 检查类型 -->
-      <el-table-column
+      <el-table-column prop="Modality" :label="$t('trials:audit:table:seriesModality')" show-overflow-tooltip />
-        prop="Modality"
-        :label="$t('trials:audit:table:seriesModality')"
-
-        show-overflow-tooltip
-      />
       <!-- 检查部位 -->
-      <el-table-column
+      <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadedDicoms:table:bodyPart')" min-width="100"
-        prop="BodyPartForEdit"
+        show-overflow-tooltip>
-        :label="$t('trials:uploadedDicoms:table:bodyPart')"
-        min-width="100"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPartForEdit)}}
+          {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
         </template>
       </el-table-column>
       <!-- 图像数量 -->
-      <el-table-column
+      <el-table-column prop="InstanceCount" :label="$t('trials:audit:table:seriesOfInstanceCount')" />
-        prop="InstanceCount"
-        :label="$t('trials:audit:table:seriesOfInstanceCount')"
-      />
       <!-- 检查日期 -->
-      <el-table-column
+      <el-table-column prop="SeriesTime" :label="$t('trials:audit:table:seriesOfStudyDate')" show-overflow-tooltip>
-        prop="SeriesTime"
-        :label="$t('trials:audit:table:seriesOfStudyDate')"
-
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD') : '' }}
         </template>
       </el-table-column>
       <!-- 是否阅片 -->
-      <el-table-column
+      <el-table-column prop="IsReading" :label="$t('trials:audit:table:isReading')">
-        prop="IsReading"
-        :label="$t('trials:audit:table:isReading')"
-      >
         <template slot-scope="scope">
-          <el-switch
+          <el-switch :disabled="scope.row.IsConfirmed" v-model="scope.row.IsReading" />
-            :disabled="scope.row.IsConfirmed"
-            v-model="scope.row.IsReading"
-          />
         </template>
       </el-table-column>
-      <el-table-column
+      <el-table-column :label="$t('common:action:action')">
-        :label="$t('common:action:action')"
-      >
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button
+          <el-button icon="el-icon-view" :title="$t('trials:audit:action:seriesPreview')" circle
-            icon="el-icon-view"
+            :disabled="scope.row.IsDeleted" @click="handlePreviewInstance(scope.row)" />
-            :title="$t('trials:audit:action:seriesPreview')"
-            circle
-            :disabled="scope.row.IsDeleted"
-            @click="handlePreviewInstance(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
-    <div slot="footer" class="dialog-footer" v-if="!this.seriesList.find(v => v.IsConfirmed)" style="text-align: right;margin-top: 20px">
+    <div slot="footer" class="dialog-footer" v-if="!this.seriesList.find(v => v.IsConfirmed)"
+      style="text-align: right;margin-top: 20px">
       <el-button :disabled="btnLoading" size="small" type="primary" @click="save(false)">
         {{ $t('common:button:save') }}
       </el-button>
@@ -179,7 +100,7 @@ export default {
   props: {
     data: {
       type: Object,
-      default: () => {}
+      default: () => { }
     }
   },
   data() {
@@ -190,11 +111,11 @@ export default {
       seriesList: [],
       moment,
       trialId: this.$route.query.trialId,
-      bp:[]
+      BodyPart: {}
     }
   },
   async mounted() {
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getList()
   },
   methods: {
@@ -216,7 +137,7 @@ export default {
           this.$message.success(this.$t('common:message:savedSuccessfully'))
           this.getList()
           this.btnLoading = false
-        }).catch(() => {this.btnLoading = false})
+        }).catch(() => { this.btnLoading = false })
       } else {
         this.$confirm(this.$t('trials:readingPeriod:confirm:Images')).then(() => {
           this.btnLoading = true
@@ -226,7 +147,7 @@ export default {
             this.btnLoading = false
             this.$emit('getList')
             this.$emit('close')
-          }).catch(() => {this.btnLoading = false})
+          }).catch(() => { this.btnLoading = false })
         })
       }
     },
@@ -237,8 +158,8 @@ export default {
       })
       this.open = window.open(routeData.href, '_blank')
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -248,9 +169,13 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
+      var newArr = arr.map((i) => {
-        return this.$fd('Bodypart', i.trim(),'Code',{Bodypart:this.bp},'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
     },
     getList() {
@@ -265,7 +190,7 @@ export default {
         this.seriesList = res.Result.SeriesList
         this.btnLoading = false
         console.log(res.Result)
-      }).catch(() => {  this.btnLoading = false })
+      }).catch(() => { this.btnLoading = false })
     },
     // 设置已删除序列行样式
     tableRowClassName({ row, rowIndex }) {
@@ -295,6 +220,4 @@ export default {
 }
 </script>
 
-<style scoped>
+<style scoped></style>
-
-</style>

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

@@ -2,254 +2,125 @@
   <div class="study-info">
     <div class="functions" style="text-align: right">
       <!-- 删除 -->
-      <el-button
+      <el-button v-if="
-        v-if="
+        data.SubmitState * 1 < 2 ||
-          data.SubmitState * 1 < 2 ||
+        (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-          (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+      " v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" :disabled="deleteArr.length === 0"
-        "
+        type="primary" size="small" icon="el-icon-delete" @click="handleBatchDelete">
-        v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
-        :disabled="deleteArr.length === 0"
-        type="primary"
-        size="small"
-        icon="el-icon-delete"
-        @click="handleBatchDelete"
-      >
         {{ $t('trials:uploadedDicoms:action:delete') }}
       </el-button>
       <!-- 预览 -->
-      <el-button
+      <el-button type="primary" size="small" :disabled="studyList.length === 0" icon="el-icon-view"
-        type="primary"
+        @click="handlePreviewAllFiles">
-        size="small"
-        :disabled="studyList.length === 0"
-        icon="el-icon-view"
-        @click="handlePreviewAllFiles"
-      >
         {{ $t('trials:uploadedDicoms:action:preview') }}
       </el-button>
     </div>
-    <el-table
+    <el-table v-loading="studyLoading" :data="studyList" style="width: 100%" height="300"
-      v-loading="studyLoading"
+      :row-class-name="tableRowClassName" @selection-change="handleSelectionChange"
-      :data="studyList"
+      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }">
-      style="width: 100%"
+      <el-table-column v-if="!(data.SubmitState * 1 === 2) || data.IsQCConfirmedReupload" type="selection" width="55" />
-      height="300"
-      :row-class-name="tableRowClassName"
-      @selection-change="handleSelectionChange"
-      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
-    >
-      <el-table-column
-        v-if="!(data.SubmitState * 1 === 2) || data.IsQCConfirmedReupload"
-        type="selection"
-        width="55"
-      />
       <!-- 检查编号 -->
-      <el-table-column
+      <el-table-column prop="StudyCode" :label="$t('trials:uploadedDicoms:table:studyId')" min-width="80"
-        prop="StudyCode"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:uploadedDicoms:table:studyId')"
-        min-width="80"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 检查名称 -->
-      <el-table-column
+      <el-table-column v-if="relationInfo.IsShowStudyName" prop="StudyName" :label="$t('trials:audit:table:StudyName')"
-        v-if="relationInfo.IsShowStudyName"
+        sortable />
-        prop="StudyName"
-        :label="$t('trials:audit:table:StudyName')"
-        sortable
-      />
       <!-- 检查类型 -->
-      <el-table-column
+      <el-table-column prop="ModalityForEdit" :label="$t('trials:audit:table:modality')" sortable />
-        prop="ModalityForEdit"
-        :label="$t('trials:audit:table:modality')"
-        sortable
-      />
       <!-- 检查类型 -->
-      <el-table-column
+      <el-table-column prop="Modalities" :label="$t('trials:audit:table:modality1')" sortable />
-        prop="Modalities"
-        :label="$t('trials:audit:table:modality1')"
-        sortable
-      />
       <!-- 检查部位 -->
-      <el-table-column
+      <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadedDicoms:table:bodyPart')" sortable
-        prop="BodyPartForEdit"
+        min-width="100" show-overflow-tooltip>
-        :label="$t('trials:uploadedDicoms:table:bodyPart')"
-        sortable
-        min-width="100"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPartForEdit) }}
+          {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
-      <el-table-column
+      <el-table-column prop="SeriesCount" :label="$t('trials:uploadedDicoms:table:seriesCount')" sortable
-        prop="SeriesCount"
+        min-width="100" show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:seriesCount')"
-        sortable
-        min-width="100"
-        show-overflow-tooltip
-      />
       <!-- 图像数量 -->
-      <el-table-column
+      <el-table-column prop="InstanceCount" :label="$t('trials:uploadedDicoms:table:instanceCount')" sortable
-        prop="InstanceCount"
+        min-width="100" show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:instanceCount')"
-        sortable
-        min-width="100"
-        show-overflow-tooltip
-      />
       <!-- 检查日期 -->
-      <el-table-column
+      <el-table-column prop="StudyTime" :label="$t('trials:uploadedDicoms:table:studyDate')" sortable min-width="120"
-        prop="StudyTime"
+        show-overflow-tooltip>
-        :label="$t('trials:uploadedDicoms:table:studyDate')"
-        sortable
-        min-width="120"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
       <!-- 更新时间 -->
-      <el-table-column
+      <el-table-column prop="UpdateTime" :label="$t('trials:uploadedDicoms:table:UpdateTime')" min-width="120"
-        prop="UpdateTime"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:uploadedDicoms:table:UpdateTime')"
-        min-width="120"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 上传时间 -->
-      <el-table-column
+      <el-table-column prop="UploadedTime" :label="$t('trials:uploadedDicoms:table:uploadedTime')" sortable
-        prop="UploadedTime"
+        min-width="120" show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
+      <el-table-column :label="$t('common:action:action')" min-width="100">
-        sortable
-        min-width="120"
-        show-overflow-tooltip
-      />
-      <el-table-column
-        :label="$t('common:action:action')"
-        min-width="100"
-      >
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button
+          <el-button icon="el-icon-view" :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            icon="el-icon-view"
+            :title="$t('trials:uploadedDicoms:action:preview')" circle @click="handleViewStudy(scope.row)" />
-            :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            :title="$t('trials:uploadedDicoms:action:preview')"
-            circle
-            @click="handleViewStudy(scope.row)"
-          />
           <!-- 预览PET-CT数据 -->
-          <el-button
+          <el-button icon="el-icon-folder" :title="$t('trials:audit:tab:clinicalData')" v-if="
-            icon="el-icon-folder"
+            ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
-            :title="$t('trials:audit:tab:clinicalData')"
+            relationInfo.IsHaveStudyClinicalData
-            v-if="
+          " circle :disabled="scope.row.IsDeleted" @click="handlePreviewClinicalData(scope.row)" />
-              ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
-              relationInfo.IsHaveStudyClinicalData
-            "
-            circle
-            :disabled="scope.row.IsDeleted"
-            @click="handlePreviewClinicalData(scope.row)"
-          />
           <!-- 编辑 -->
-          <el-button
+          <el-button icon="el-icon-edit-outline" v-if="
-            icon="el-icon-edit-outline"
+            data.SubmitState * 1 < 2 ||
-            v-if="
+            (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-              data.SubmitState * 1 < 2 ||
+          " v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']" title="编辑" circle
-              (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+            :disabled="scope.row.IsDeleted" @click="handleEditStudy(scope.row)" />
-            "
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
-            title="编辑"
-            circle
-            :disabled="scope.row.IsDeleted"
-            @click="handleEditStudy(scope.row)"
-          />
           <!-- 删除 -->
-          <el-button
+          <el-button v-if="
-            v-if="
+            data.SubmitState * 1 < 2 ||
-              data.SubmitState * 1 < 2 ||
+            (data.SubmitState === 2 && data.IsQCConfirmedReupload)
-              (data.SubmitState === 2 && data.IsQCConfirmedReupload)
+          " v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']" icon="el-icon-delete"
-            "
+            :title="$t('trials:uploadedDicoms:action:delete')" circle @click="handleDeleteStudy(scope.row)" />
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:delete']"
-            icon="el-icon-delete"
-            :title="$t('trials:uploadedDicoms:action:delete')"
-            circle
-            @click="handleDeleteStudy(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
-    <el-dialog
+    <el-dialog v-if="editStudyInfoVisible" :title="$t('trials:audit:action:edit')" :visible.sync="editStudyInfoVisible"
-      v-if="editStudyInfoVisible"
+      :close-on-click-modal="false" append-to-body custom-class="base-dialog-wrapper" width="600px">
-      :title="$t('trials:audit:action:edit')"
+      <div style="
-      :visible.sync="editStudyInfoVisible"
-      :close-on-click-modal="false"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-      width="600px"
-    >
-      <div
-        style="
           padding: 10px;
           border: 1px solid #e0e0e0;
           max-height: 650px;
           overflow-y: auto;
-        "
+        ">
-      >
         <el-form ref="studyForm" :model="studyForm" label-width="100px">
           <!-- 检查编号 -->
           <el-form-item :label="$t('trials:audit:table:studyId')">
             <el-input v-model="studyForm.StudyCode" disabled />
           </el-form-item>
           <!-- 检查类型 -->
-          <el-form-item
+          <el-form-item v-if="studyForm.IsDicomData" :label="$t('trials:audit:table:modality')">
-            v-if="studyForm.IsDicomData"
-            :label="$t('trials:audit:table:modality')"
-          >
             <el-input v-model="studyForm.Modalities" disabled />
           </el-form-item>
           <!-- 检查类型 -->
-          <el-form-item
+          <el-form-item v-else :label="$t('trials:audit:table:modality')" prop="Modalities" :rules="[
-            v-else
+            {
-            :label="$t('trials:audit:table:modality')"
+              required: true,
-            prop="Modalities"
+              message: $t('common:ruleMessage:specify'),
-            :rules="[
+              trigger: 'blur',
-              {
+            },
-                required: true,
+          ]">
-                message: $t('common:ruleMessage:specify'),
-                trigger: 'blur',
-              },
-            ]"
-          >
             <el-radio-group v-model="studyForm.Modalities">
-              <el-radio
+              <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px" />
-                v-for="m in trialModalitys"
-                v-show="m !== ''"
-                :key="m"
-                :label="m"
-                style="margin-bottom: 15px"
-              />
             </el-radio-group>
           </el-form-item>
           <!-- 检查部位 -->
-          <el-form-item
+          <el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
-            :label="$t('trials:audit:table:bodyPart')"
+            {
-            prop="BodyPartForEdit"
+              required: true,
-            :rules="[
+              message: $t('common:ruleMessage:specify'),
-              {
+              trigger: 'blur',
-                required: true,
+            },
-                message: $t('common:ruleMessage:specify'),
+          ]">
-                trigger: 'blur',
-              },
-            ]"
-          >
             <el-checkbox-group v-model="studyForm.BodyPartForEdit">
-              <el-checkbox
+              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
-                v-for="bodyPart in trialBodyPartTypes"
+                $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
-                :key="bodyPart"
+              }}</el-checkbox>
-                :label="bodyPart"
-                >{{
-                  $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
-                }}</el-checkbox
-              >
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -257,57 +128,28 @@
             <el-input v-model="studyForm.SeriesCount" disabled />
           </el-form-item>
           <!-- 图像数量 -->
-          <el-form-item
+          <el-form-item v-if="studyForm.InstanceCount" :label="$t('trials:audit:table:instanceCount')">
-            v-if="studyForm.InstanceCount"
-            :label="$t('trials:audit:table:instanceCount')"
-          >
             <el-input v-model="studyForm.InstanceCount" disabled />
           </el-form-item>
           <!-- 检查日期 -->
           <el-form-item :label="$t('trials:audit:table:studyDate')">
-            <el-date-picker
+            <el-date-picker v-model="studyForm.StudyTime" disabled type="date" value-format="yyyy-MM-dd"
-              v-model="studyForm.StudyTime"
+              format="yyyy-MM-dd" style="width: 100%" />
-              disabled
-              type="date"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-              style="width: 100%"
-            />
           </el-form-item>
         </el-form>
       </div>
       <div slot="footer" class="dialog-footer">
-        <el-button
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="editStudyInfoVisible = false">
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="editStudyInfoVisible = false"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
-        <el-button
+        <el-button :loading="btnLoading" size="small" type="primary" @click="handleUpdateStudyInfo">
-          :loading="btnLoading"
-          size="small"
-          type="primary"
-          @click="handleUpdateStudyInfo"
-        >
           {{ $t('common:button:save') }}
         </el-button>
       </div>
     </el-dialog>
     <!--pet-ct临床数据上传-->
-    <el-dialog
+    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
-      v-if="petVisible"
+      <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" />
-      :show-close="true"
-      :visible.sync="petVisible"
-      append-to-body
-    >
-      <uploadPetClinicalData
-        :subject-visit-id="data.Id"
-        :data="data"
-        :studyData="rowData"
-        :allow-add-or-edit="false"
-      />
     </el-dialog>
   </div>
 </template>
@@ -360,8 +202,8 @@ export default {
     }
   },
   async mounted() {
-    this.getStudyInfo()
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+    this.getStudyInfo()
   },
   methods: {
     // 预览临床数据
@@ -449,7 +291,7 @@ export default {
               this.studyLoading = true
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 预览所有影像
     handlePreviewAllFiles() {
@@ -491,10 +333,10 @@ export default {
               this.studyLoading = true
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -507,6 +349,10 @@ export default {
       var newArr = arr.map((i) => {
         return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
     },
     // 获取勾选项

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

@@ -3,125 +3,61 @@
     <!-- 已上传的dicom影像记录 -->
     <div class="functions" style="text-align:right">
       <!-- //批量删除已上传的影像 -->
-      <el-button
+      <el-button :disabled="deleteArr.length === 0" type="primary" size="small" icon="el-icon-delete"
-        :disabled="deleteArr.length === 0"
+        @click="handleBatchDelete">
-        type="primary"
-        size="small"
-        icon="el-icon-delete"
-        @click="handleBatchDelete"
-      >
         {{ $t('trials:uploadedDicoms:action:delete') }}
       </el-button>
       <!-- 预览 -->
-      <el-button
+      <el-button type="primary" icon="el-icon-view" size="small" :disabled="studyList.length === 0"
-        type="primary"
+        @click="handlePreviewAllFiles">
-        icon="el-icon-view"
-        size="small"
-        :disabled="studyList.length === 0"
-        @click="handlePreviewAllFiles"
-      >
         {{ $t('trials:uploadedDicoms:action:preview') }}
       </el-button>
     </div>
-    <el-table
+    <el-table v-loading="studyLoading" :data="studyList" style="width: 100%" :row-class-name="tableRowClassName"
-      v-loading="studyLoading"
+      max-height="250" @selection-change="handleUploadedSelectionChange">
-      :data="studyList"
+      <el-table-column type="selection" width="55" />
-      style="width: 100%"
-      :row-class-name="tableRowClassName"
-      max-height="250"
-      @selection-change="handleUploadedSelectionChange"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-      />
       <!-- 检查编号 -->
-      <el-table-column
+      <el-table-column prop="StudyCode" :label="$t('trials:uploadedDicoms:table:studyId')" min-width="80"
-        prop="StudyCode"
+        show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:studyId')"
-        min-width="80"
-        show-overflow-tooltip
-      />
       <!-- 检查类型 -->
-      <el-table-column
+      <el-table-column prop="ModalityForEdit" :label="$t('trials:audit:table:modality')" />
-        prop="ModalityForEdit"
-        :label="$t('trials:audit:table:modality')"
-      />
       <!-- 检查设备 -->
-      <el-table-column
+      <el-table-column prop="Modalities" :label="$t('trials:audit:table:modality1')" />
-        prop="Modalities"
-        :label="$t('trials:audit:table:modality1')"
-      />
       <!-- 检查部位 -->
-      <el-table-column
+      <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadedDicoms:table:bodyPart')" min-width="100"
-        prop="BodyPartForEdit"
+        show-overflow-tooltip>
-        :label="$t('trials:uploadedDicoms:table:bodyPart')"
-        min-width="100"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPartForEdit)}}
+          {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
-      <el-table-column
+      <el-table-column prop="SeriesCount" :label="$t('trials:uploadedDicoms:table:seriesCount')" min-width="100"
-        prop="SeriesCount"
+        show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:seriesCount')"
-        min-width="100"
-        show-overflow-tooltip
-      />
       <!-- 图像数量 -->
-      <el-table-column
+      <el-table-column prop="InstanceCount" :label="$t('trials:uploadedDicoms:table:instanceCount')" min-width="100"
-        prop="InstanceCount"
+        show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:instanceCount')"
-        min-width="100"
-        show-overflow-tooltip
-      />
       <!-- 检查日期 -->
-      <el-table-column
+      <el-table-column prop="StudyTime" :label="$t('trials:uploadedDicoms:table:studyDate')" min-width="120"
-        prop="StudyTime"
+        show-overflow-tooltip>
-        :label="$t('trials:uploadedDicoms:table:studyDate')"
-        min-width="120"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
-          {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD'):'' }}
+          {{ scope.row.StudyTime ? moment(scope.row.StudyTime).format('YYYY-MM-DD') : '' }}
         </template>
       </el-table-column>
       <!-- 上传时间 -->
-      <el-table-column
+      <el-table-column prop="UploadedTime" :label="$t('trials:uploadedDicoms:table:uploadedTime')" min-width="80"
-        prop="UploadedTime"
+        show-overflow-tooltip />
-        :label="$t('trials:uploadedDicoms:table:uploadedTime')"
-        min-width="80"
-        show-overflow-tooltip
-      />
       <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button
+          <el-button icon="el-icon-view" :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            icon="el-icon-view"
+            :title="$t('trials:uploadedDicoms:action:preview')" circle @click="handleViewStudy(scope.row)" />
-            :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            :title="$t('trials:uploadedDicoms:action:preview')"
-            circle
-            @click="handleViewStudy(scope.row)"
-          />
           <!-- 编辑 -->
-          <el-button
+          <el-button icon="el-icon-edit-outline" v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
-            icon="el-icon-edit-outline"
+            :title="$t('common:button:edit')" circle :disabled="scope.row.IsDeleted"
-            v-hasPermi="['trials:trials-panel:visit:crc-upload:edit']"
+            @click="handleEditStudy(scope.row)" />
-            :title="$t('common:button:edit')"
-            circle
-            :disabled="scope.row.IsDeleted"
-            @click="handleEditStudy(scope.row)"
-          />
           <!-- 删除 -->
-          <el-button
+          <el-button icon="el-icon-delete" :disabled="scope.row.IsDeleted"
-            icon="el-icon-delete"
+            :title="$t('trials:uploadedDicoms:action:delete')" circle @click="handleDeleteStudy(scope.row)" />
-            :disabled="scope.row.IsDeleted"
-            :title="$t('trials:uploadedDicoms:action:delete')"
-            circle
-            @click="handleDeleteStudy(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
@@ -132,33 +68,16 @@
       <div class="form-group">
         <div id="directoryInputWrapper" class="btn btn-link file-input">
           <el-button type="primary" size="small">{{ $t('trials:uploadedDicomsicom:button:selectFolder') }}</el-button>
-          <input
+          <input type="file" name="file" webkitdirectory multiple @change="beginScanFiles($event)">
-            type="file"
-            name="file"
-            webkitdirectory
-            multiple
-            @change="beginScanFiles($event)"
-          >
         </div>
       </div>
     </form>
 
     <!-- 文件列表 -->
-    <el-table
+    <el-table ref="dicomFilesTable" :data="uploadQueues" class="dicomFiles-table"
-      ref="dicomFilesTable"
+      @selection-change="handleSelectionChange">
-      :data="uploadQueues"
+      <el-table-column type="selection" width="55" :selectable="handleSelectable" />
-      class="dicomFiles-table"
+      <el-table-column type="index" width="40" />
-      @selection-change="handleSelectionChange"
-    >
-      <el-table-column
-        type="selection"
-        width="55"
-        :selectable="handleSelectable"
-      />
-      <el-table-column
-        type="index"
-        width="40"
-      />
       <el-table-column min-width="200" show-overflow-tooltip>
         <template slot="header">
           <el-tooltip placement="top">
@@ -174,11 +93,13 @@
           <div style="line-height:15px;">
             <div>
               <div>
-                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight:500;">Acc:</span> {{ scope.row.dicomInfo.accNumber }}</span>
+                <span v-if="scope.row.dicomInfo.accNumber"><span style="font-weight:500;">Acc:</span> {{
+                  scope.row.dicomInfo.accNumber }}</span>
                 <span v-else style="color:#f44336;">N/A</span>
               </div>
               <div style="display: inline-block;margin-right:2px">
-                <span v-if="scope.row.dicomInfo.modality.length>0"> {{ scope.row.dicomInfo.modality.join('、') }},</span>
+                <span v-if="scope.row.dicomInfo.modality.length > 0"> {{ scope.row.dicomInfo.modality.join('、')
+                  }},</span>
                 <span v-else style="color:#f44336;">N/A,</span>
               </div>
               <div style="display: inline-block;margin-right:2px">
@@ -225,25 +146,26 @@
         <template slot-scope="scope">
           <div style="line-height:15px;">
             <div>
-              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight:500;">PID: </span>{{ scope.row.dicomInfo.patientId }}</span>
+              <span v-if="scope.row.dicomInfo.patientId"><span style="font-weight:500;">PID: </span>{{
+                scope.row.dicomInfo.patientId }}</span>
               <span v-else style="color:#f44336;">N/A</span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientName?'':'colorOfRed']">
+              <span :class="[scope.row.dicomInfo.patientName ? '' : 'colorOfRed']">
-                {{ scope.row.dicomInfo.patientName?scope.row.dicomInfo.patientName:'N/A' }}
+                {{ scope.row.dicomInfo.patientName ? scope.row.dicomInfo.patientName : 'N/A' }}
               </span>
             </div>
             <div>
-              <span :class="[scope.row.dicomInfo.patientSex?'':'colorOfRed']">
+              <span :class="[scope.row.dicomInfo.patientSex ? '' : 'colorOfRed']">
-                {{ scope.row.dicomInfo.patientSex?scope.row.dicomInfo.patientSex:'N/A' }},
+                {{ scope.row.dicomInfo.patientSex ? scope.row.dicomInfo.patientSex : 'N/A' }},
               </span>
 
-              <span :class="[scope.row.dicomInfo.patientAge?'':'colorOfRed']">
+              <span :class="[scope.row.dicomInfo.patientAge ? '' : 'colorOfRed']">
-                {{ scope.row.dicomInfo.patientAge?scope.row.dicomInfo.patientAge:'N/A' }},
+                {{ scope.row.dicomInfo.patientAge ? scope.row.dicomInfo.patientAge : 'N/A' }},
               </span>
 
-              <span :class="[scope.row.dicomInfo.patientBirthDate?'':'colorOfRed']">
+              <span :class="[scope.row.dicomInfo.patientBirthDate ? '' : 'colorOfRed']">
-                {{ scope.row.dicomInfo.patientBirthDate?scope.row.dicomInfo.patientBirthDate:'N/A' }}
+                {{ scope.row.dicomInfo.patientBirthDate ? scope.row.dicomInfo.patientBirthDate : 'N/A' }}
               </span>
             </div>
           </div>
@@ -251,11 +173,13 @@
       </el-table-column>
       <el-table-column :label="$t('trials:uploadDicomList:table:status')" min-width="120" show-overflow-tooltip>
         <template slot-scope="scope">
-<!--          <el-progress v-show="scope.row.uploadState.progressValue && scope.row.uploadState.progressValue!= 100" :percentage="scope.row.uploadState.progressValue" />-->
+          <!--          <el-progress v-show="scope.row.uploadState.progressValue && scope.row.uploadState.progressValue!= 100" :percentage="scope.row.uploadState.progressValue" />-->
           <el-progress v-show="scope.row.uploadState.stateText" :percentage="scope.row.uploadState.progressValue" />
-<!--          <el-progress v-show="scope.row.uploadState.UpdataValue && scope.row.uploadState.UpdataValue!= 100" color="#409eff" :format="format(scope.row.uploadState.UpdataValue)" :percentage="scope.row.uploadState.UpdataValue" />-->
+          <!--          <el-progress v-show="scope.row.uploadState.UpdataValue && scope.row.uploadState.UpdataValue!= 100" color="#409eff" :format="format(scope.row.uploadState.UpdataValue)" :percentage="scope.row.uploadState.UpdataValue" />-->
-          <el-progress v-show="scope.row.uploadState.stateText" color="#409eff" :format="format(scope.row.uploadState.UpdataValue)" :percentage="scope.row.uploadState.UpdataValue" />
+          <el-progress v-show="scope.row.uploadState.stateText" color="#409eff"
-          <el-tooltip v-if="scope.row.uploadState.stateCode === 'Uploading not allowed'" class="item" effect="dark" :content="scope.row.uploadState.errorMessage" placement="bottom">
+            :format="format(scope.row.uploadState.UpdataValue)" :percentage="scope.row.uploadState.UpdataValue" />
+          <el-tooltip v-if="scope.row.uploadState.stateCode === 'Uploading not allowed'" class="item" effect="dark"
+            :content="scope.row.uploadState.errorMessage" placement="bottom">
             <span>{{ scope.row.uploadState.stateText }}</span>
           </el-tooltip>
 
@@ -263,31 +187,20 @@
         </template>
       </el-table-column>
 
-      <el-table-column
+      <el-table-column :label="$t('trials:uploadDicomList:table:stats')" min-width="140" show-overflow-tooltip>
-        :label="$t('trials:uploadDicomList:table:stats')"
-        min-width="140"
-        show-overflow-tooltip
-      >
         <template slot-scope="scope">
           <div style="display: flex;justify-content: flex-start;align-items: center">
-            <div
+            <div v-if="scope.row.uploadState.totalCount" style="text-align: center">
-              v-if="scope.row.uploadState.totalCount"
-              style="text-align: center"
-            >
               {{
                 scope.row.uploadState.totalCount +
-                  ' / ' +
+                ' / ' +
-                  scope.row.uploadState.successCount +
+                scope.row.uploadState.successCount +
-                  ' / ' +
+                ' / ' +
-                  scope.row.uploadState.failedCount
+                scope.row.uploadState.failedCount
               }}
             </div>
             <div v-if="scope.row.uploadState.failedCount > 0">
-              <el-button
+              <el-button type="primary" size="small" @click="exportFailedFiles(scope.row.uploadState.ErrorFiles)">
-                type="primary"
-                size="small"
-                @click="exportFailedFiles(scope.row.uploadState.ErrorFiles)"
-              >
                 {{ $t('trials:uploadDicomList:button:exportFailed') }}
               </el-button>
             </div>
@@ -298,22 +211,11 @@
       <el-table-column v-show="isScan" :label="$t('common:action:action')" width="200">
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button
+          <el-button icon="el-icon-view" circle :title="$t('trials:uploadedDicoms:action:preview')" size="small"
-            icon="el-icon-view"
+            @click="handlePreview(scope.row.dicomInfo.studyUid)" />
-            circle
-            :title="$t('trials:uploadedDicoms:action:preview')"
-            size="small"
-            @click="handlePreview(scope.row.dicomInfo.studyUid)"
-          />
           <!-- 移除 -->
-          <el-button
+          <el-button icon="el-icon-delete" circle :title="$t('trials:uploadedDicoms:action:delete')" size="small"
-            icon="el-icon-delete"
+            :disabled="scope.row.uploadState.stateCode !== ''" @click="handleDelete(scope.$index, scope.row)" />
-            circle
-            :title="$t('trials:uploadedDicoms:action:delete')"
-            size="small"
-            :disabled="scope.row.uploadState.stateCode !== ''"
-            @click="handleDelete(scope.$index, scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
@@ -323,46 +225,29 @@
         {{ $t('trials:uploadDicomList:button:close') }}
       </el-button> -->
       <!-- 上传 -->
-      <el-button
+      <el-button size="small" type="primary" :disabled="selectArr.length == 0 || !isScan"
-        size="small"
+        :loading="btnLoading || uploadCount !== uploadedCount" @click="beginUploadQueues">
-        type="primary"
-        :disabled="selectArr.length == 0 || !isScan"
-        :loading="btnLoading || uploadCount !== uploadedCount"
-        @click="beginUploadQueues"
-      >
         {{ $t('trials:uploadDicomList:button:upload') }}
       </el-button>
     </div>
 
     <!-- 预览影像模态框 -->
-    <el-dialog
+    <el-dialog v-if="previewVisible" :fullscreen="true" :show-close="true" :visible.sync="previewVisible"
-      v-if="previewVisible"
+      append-to-body>
-      :fullscreen="true"
-      :show-close="true"
-      :visible.sync="previewVisible"
-      append-to-body
-    >
       <DicomPreview :uid="uid" />
     </el-dialog>
 
     <!-- 校验警告信息模态框 -->
-    <el-dialog
+    <el-dialog v-if="warning_cfg.visible" :visible.sync="warning_cfg.visible" width="500px"
-      v-if="warning_cfg.visible"
+      :close-on-click-modal="false" append-to-body title="Warning" custom-class="warning-dialog">
-      :visible.sync="warning_cfg.visible"
-      width="500px"
-      :close-on-click-modal="false"
-      append-to-body
-      title="Warning"
-      custom-class="warning-dialog"
-    >
       <div style="border:1px solid #e0e0e0;padding:10px;">
         <!-- Information from DICOM headers not consistent with that of this subject -->
         <div style="color: red;font-size:14px;margin-bottom:10px;">
           {{ $t('trials:uploadDicomList:message:informationConsistent') }}:
         </div>
-        <div v-for="(item,i) in warningArr" :key="item.index">
+        <div v-for="(item, i) in warningArr" :key="item.index">
-          <div>{{ `(${i+1}). ACC: ${item.accNumber}` }}</div>
+          <div>{{ `(${i + 1}). ACC: ${item.accNumber}` }}</div>
-          <div v-for="(warning,index) in item.warnings" :key="index" style="margin:10px 0px;font-size:13px;">
+          <div v-for="(warning, index) in item.warnings" :key="index" style="margin:10px 0px;font-size:13px;">
             <ul>
               <li>{{ warning }}</li>
             </ul>
@@ -378,15 +263,8 @@
         </el-button>
       </div>
     </el-dialog>
-    <el-dialog
+    <el-dialog v-if="editStudyInfoVisible" :title="$t('trials:audit:action:edit')" :visible.sync="editStudyInfoVisible"
-      v-if="editStudyInfoVisible"
+      :close-on-click-modal="false" append-to-body custom-class="base-dialog-wrapper" width="600px">
-      :title="$t('trials:audit:action:edit')"
-      :visible.sync="editStudyInfoVisible"
-      :close-on-click-modal="false"
-      append-to-body
-      custom-class="base-dialog-wrapper"
-      width="600px"
-    >
       <div style="padding:10px;border: 1px solid #e0e0e0;max-height:650px;overflow-y: auto;">
         <el-form ref="studyForm" :model="studyForm" label-width="100px">
           <!-- 检查编号 -->
@@ -398,28 +276,21 @@
             <el-input v-model="studyForm.Modalities" disabled />
           </el-form-item>
           <!-- 检查类型 -->
-          <el-form-item
+          <el-form-item v-else :label="$t('trials:audit:table:modality')" prop="Modalities" :rules="[
-            v-else
+            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-            :label="$t('trials:audit:table:modality')"
+          ]">
-            prop="Modalities"
-            :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
-          >
             <el-radio-group v-model="studyForm.Modality">
-              <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m" style="margin-bottom: 15px;" />
+              <el-radio v-for="m in trialModalitys" v-show="m !== ''" :key="m" :label="m"
+                style="margin-bottom: 15px;" />
             </el-radio-group>
           </el-form-item>
           <!-- 检查部位 -->
-          <el-form-item
+          <el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
-            :label="$t('trials:audit:table:bodyPart')"
+            { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-            prop="BodyPartForEdit"
+          ]">
-            :rules="[
-                { required: true, message: $t('common:ruleMessage:specify'), trigger: 'blur' }
-              ]"
-          >
             <el-checkbox-group v-model="studyForm.BodyPartForEdit">
-              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{$fd("Bodypart", bodyPart,'Code',BodyPart,'Name')}}</el-checkbox>
+              <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{ $fd("Bodypart",
+                bodyPart, 'Code', BodyPart, 'Name') }}</el-checkbox>
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -432,14 +303,8 @@
           </el-form-item>
           <!-- 检查日期 -->
           <el-form-item :label="$t('trials:audit:table:studyDate')">
-            <el-date-picker
+            <el-date-picker v-model="studyForm.StudyTime" disabled type="date" value-format="yyyy-MM-dd"
-              v-model="studyForm.StudyTime"
+              format="yyyy-MM-dd" style="width:100%;" />
-              disabled
-              type="date"
-              value-format="yyyy-MM-dd"
-              format="yyyy-MM-dd"
-              style="width:100%;"
-            />
           </el-form-item>
         </el-form>
       </div>
@@ -515,7 +380,7 @@ export default {
       relationInfo: null,
       trialBodyPartTypes: [],
       trialModalitys: [],
-      BodyPart:{}
+      BodyPart: {}
     }
   },
   async mounted() {
@@ -595,8 +460,8 @@ export default {
       const routeData = this.$router.resolve({
         path: `/showdicom?studyId=${row.StudyId}&TokenKey=${token}&type=Study`
       })
-      var newWindow =window.open(routeData.href, '_blank')
+      var newWindow = window.open(routeData.href, '_blank')
-      this.$emit('setOpenWindow',newWindow)
+      this.$emit('setOpenWindow', newWindow)
     },
     // 预览所有影像
     handlePreviewAllFiles() {
@@ -604,8 +469,8 @@ export default {
       const routeData = this.$router.resolve({
         path: `/showvisitdicoms?trialId=${this.data.TrialId}&visitInfo=${this.data.VisitName}(${this.data.VisitNum})&subjectVisitId=${this.data.Id}&TokenKey=${token}`
       })
-      var newWindow =window.open(routeData.href, '_blank')
+      var newWindow = window.open(routeData.href, '_blank')
-      this.$emit('setOpenWindow',newWindow)
+      this.$emit('setOpenWindow', newWindow)
     },
     // 扫描待上传文件
     beginScanFiles(e) {
@@ -616,17 +481,17 @@ export default {
         var scope = this
         scope.scanState = ''
         scope.isScan = false
-        var p = new Promise(function(resolve) {
+        var p = new Promise(function (resolve) {
           resolve()
         })
         for (var i = 0; i < files.length; ++i) {
-          (function(index) {
+          (function (index) {
-            p = p.then(function() {
+            p = p.then(function () {
               return scope.parseDicomFile(files[index])
             })
           })(i)
         }
-        p.then(function(result) {
+        p.then(function (result) {
           scope.scanState = 'finished'
           scope.isScan = true
         })
@@ -635,13 +500,13 @@ export default {
     // 按序列UUID本地归档
     parseDicomFile(file) {
       var scope = this
-      return new Promise(function(resolve, reject) {
+      return new Promise(function (resolve, reject) {
         if (scope.scanState === 'cancelling') {
           resolve()
           return
         }
         var reader = new FileReader()
-        reader.onload = function(e) {
+        reader.onload = function (e) {
           try {
             var data = dicomParser.parseDicom(new Uint8Array(e.target.result))
             var studyUid = data.string('x0020000d')
@@ -664,7 +529,7 @@ export default {
                 // time = `${time.substr(0, 2)}:${time.substr(2, 2)}:${time.substr(4, 2)}`
                 time = `${time.substring(0, 2)}:${time.substring(2, 4)}:${time.substring(4, 6)}`
               }
-              if(date){
+              if (date) {
                 studyTime = time ? `${date} ${time}` : `${date} 00:00:00`
               }
               scope.uploadQueues.push({
@@ -721,7 +586,7 @@ export default {
 
             var seriesUid = data.string('x0020000e')
             var seriesList = scope.uploadQueues[studyIndex].seriesList
-            var seriesItem = seriesList.find(function(item) {
+            var seriesItem = seriesList.find(function (item) {
               return item.seriesUid === seriesUid
             })
             if (!seriesItem) {
@@ -735,7 +600,7 @@ export default {
               seriesList.push(seriesItem)
             }
             var instanceList = seriesItem.instanceList
-            var instanceItem = instanceList.find(function(item) {
+            var instanceItem = instanceList.find(function (item) {
               return item.instanceUid === instanceUid
             })
             if (!instanceItem) {
@@ -755,7 +620,7 @@ export default {
             resolve()
           }
         }
-        reader.onerror = function(e) {
+        reader.onerror = function (e) {
           resolve()
         }
         reader.readAsArrayBuffer(file)
@@ -853,7 +718,7 @@ export default {
             {
               confirmButtonText: this.$t('trials:uploadDicomList:label:confirm'),
               dangerouslyUseHTMLString: true,
-              callback: (action) => {}
+              callback: (action) => { }
             })
           this.btnLoading = false
         }
@@ -897,7 +762,7 @@ export default {
     // 上传影像并归档
     archiveStudy(index) {
       var scope = this
-      return new Promise(function(resolve, reject) {
+      return new Promise(function (resolve, reject) {
         preArchiveStudy({
           subjectVisitId: scope.subjectVisitId,
           isDicom: true
@@ -934,15 +799,15 @@ export default {
           // xhr.setRequestHeader('Content-Type', 'octet-stream')
           xhr.timeout = 2 * 360000 // 超时时间，单位是毫秒
           xhr.responseType = 'text'
-          xhr.onload = function(e) {
+          xhr.onload = function (e) {
             scope.onUploadCompleted(e, index)
             resolve()
           }
-          xhr.onerror = function(e) {
+          xhr.onerror = function (e) {
             scope.onUploadError(e, index)
             resolve()
           }
-          xhr.upload.onprogress = function(e) {
+          xhr.upload.onprogress = function (e) {
             scope.onUploadProgress(e, index)
           }
           // xhr.onprogress = function(e) {
@@ -960,7 +825,7 @@ export default {
       })
     },
     // 上传成功回调
-    onUploadCompleted: function(e, index) {
+    onUploadCompleted: function (e, index) {
       this.uploadedCount++
       var uploadState = this.uploadQueues[index].uploadState
       // this.btnLoading = false
@@ -1005,7 +870,7 @@ export default {
       this.$forceUpdate()
     },
     // 上传失败回调
-    onUploadError: function(e, index) {
+    onUploadError: function (e, index) {
       this.uploadedCount++
       // this.btnLoading = false
       var uploadState = this.uploadQueues[index].uploadState
@@ -1025,7 +890,7 @@ export default {
       }
     },
     // 上传进程
-    onUploadProgress: function(e, index) {
+    onUploadProgress: function (e, index) {
       if (e.lengthComputable) {
         var percent = Math.floor(e.loaded / e.total * 100)
         console.log(e.loaded, e.total, percent)
@@ -1111,7 +976,7 @@ export default {
             }).catch(() => {
               this.studyLoading = true
             })
-        }).catch(() => {})
+        }).catch(() => { })
     },
     // 删除已上传的某个检查
     handleDeleteStudy(row) {
@@ -1131,7 +996,7 @@ export default {
             }).catch(() => {
               this.studyLoading = true
             })
-        }).catch(() => {})
+        }).catch(() => { })
     },
     // cancel按钮回调
     cancel() {
@@ -1173,8 +1038,8 @@ export default {
         return ''
       }
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -1184,38 +1049,47 @@ export default {
         separator = '，'
       }
       var arr = bodyPart.split(separator)
-      var newArr = arr.map(i => {
+      var newArr = arr.map((i) => {
-        return this.$fd('Bodypart', i.trim(),'Code',this.BodyPart,'Name')
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
-    }
+    },
   }
 }
 </script>
 <style lang="scss">
-.upload-dicom-files-wrapper{
+.upload-dicom-files-wrapper {
-  .dicomFiles-table{
+  .dicomFiles-table {
-    .el-table__body-wrapper{
+    .el-table__body-wrapper {
       height: 300px;
       overflow-y: auto;
     }
   }
-  .delete-row{
+
-      text-decoration-line: line-through;
+  .delete-row {
-      color: #c0c4cc;
+    text-decoration-line: line-through;
-    }
+    color: #c0c4cc;
+  }
+
   .previewActive:hover {
     cursor: pointer;
     color: #428bca;
   }
+
   #inputForm label {
     font-weight: normal;
   }
+
   #inputForm .file-input {
     position: relative;
     overflow: hidden;
     display: inline-block;
   }
+
   #inputForm .file-input input[type='file'] {
     position: absolute;
     top: 0;
@@ -1234,12 +1108,13 @@ export default {
   #inputForm #listWrapper a {
     text-decoration: none;
   }
+
   #inputForm .text-left {
     text-align: left;
   }
-  .colorOfRed{
+
-    color:#f44336;
+  .colorOfRed {
+    color: #f44336;
   }
 }
-
 </style>

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

@@ -509,7 +509,7 @@
                 $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
               }}</el-checkbox>
               <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
-                v-model="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
+                v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -1066,7 +1066,7 @@ export default {
                 imageColumns: data.uint16('x00280011') || 0,
                 sliceLocation: data.intString('x00201041') || 0,
                 sliceThickness: data.string('x00180050') || '',
-                numberOfFrames: data.intString('x00280008') || 0,
+                numberOfFrames: data.intString('x00280008') || 1,
                 pixelSpacing: data.string('x00280030') || '',
                 imagerPixelSpacing: data.string('x00181164') || '',
                 frameOfReferenceUID: data.string('x00200052') || '',

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

@@ -173,7 +173,7 @@
                 $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
               }}</el-checkbox>
               <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
-                v-model="form.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
+                v-model.trim="form.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
             </el-checkbox-group>
           </el-form-item>
           <!-- 检查日期 -->
@@ -413,7 +413,6 @@ export default {
     }
   },
   async mounted() {
-    console.log(this.data)
     this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getNoneDicomList()
     this.trialBodyPartTypes = this.bodyParts ? this.bodyParts.split('|') : []

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

@@ -2,33 +2,17 @@
   <div class="study-info">
     <div class="functions" style="text-align: right">
       <!-- 预览 -->
-      <el-button
+      <el-button type="primary" size="small" :disabled="studyList.length === 0" icon="el-icon-view"
-        type="primary"
+        @click="handlePreviewAllFiles">
-        size="small"
-        :disabled="studyList.length === 0"
-        icon="el-icon-view"
-        @click="handlePreviewAllFiles"
-      >
         {{ $t('trials:audit:action:preview') }}
       </el-button>
     </div>
-    <el-table
+    <el-table v-loading="studyLoading" :data="studyList" style="width: 100%" height="300"
-      v-loading="studyLoading"
+      :row-class-name="tableRowClassName" @selection-change="handleSelectionChange"
-      :data="studyList"
+      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }">
-      style="width: 100%"
-      height="300"
-      :row-class-name="tableRowClassName"
-      @selection-change="handleSelectionChange"
-      :default-sort="{ prop: 'UploadedTime', order: 'ascending' }"
-    >
       <!-- 检查编号 -->
-      <el-table-column
+      <el-table-column prop="StudyCode" :label="$t('trials:audit:table:studyId')" min-width="80" show-overflow-tooltip
-        prop="StudyCode"
+        sortable />
-        :label="$t('trials:audit:table:studyId')"
-        min-width="80"
-        show-overflow-tooltip
-        sortable
-      />
       <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
       <!--      <el-table-column-->
       <!--        prop="Modalities"-->
@@ -49,121 +33,53 @@
       <!--      </el-table-column>-->
       <!--      &lt;!&ndash; 检查类型 &ndash;&gt;-->
       <!-- 检查名称 -->
-      <el-table-column
+      <el-table-column v-if="relationInfo.IsShowStudyName" prop="StudyName" :label="$t('trials:audit:table:StudyName')"
-        v-if="relationInfo.IsShowStudyName"
+        sortable />
-        prop="StudyName"
+      <el-table-column prop="ModalityForEdit" :label="$t('trials:audit:table:modality')" sortable />
-        :label="$t('trials:audit:table:StudyName')"
-        sortable
-      />
-      <el-table-column
-        prop="ModalityForEdit"
-        :label="$t('trials:audit:table:modality')"
-        sortable
-      />
       <!-- 检查类型 -->
-      <el-table-column
+      <el-table-column prop="Modalities" :label="$t('trials:audit:table:modality1')" sortable />
-        prop="Modalities"
-        :label="$t('trials:audit:table:modality1')"
-        sortable
-      />
       <!-- 检查部位 -->
-      <el-table-column
+      <el-table-column prop="BodyPartForEdit" :label="$t('trials:uploadedDicoms:table:bodyPart')" min-width="100"
-        prop="BodyPartForEdit"
+        show-overflow-tooltip sortable>
-        :label="$t('trials:uploadedDicoms:table:bodyPart')"
-        min-width="100"
-        show-overflow-tooltip
-        sortable
-      >
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPartForEdit) }}
+          {{ getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther) }}
         </template>
       </el-table-column>
       <!-- 序列数量 -->
-      <el-table-column
+      <el-table-column prop="SeriesCount" :label="$t('trials:audit:table:seriesCount')" min-width="100"
-        prop="SeriesCount"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:audit:table:seriesCount')"
-        min-width="100"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 图像数量 -->
-      <el-table-column
+      <el-table-column prop="InstanceCount" :label="$t('trials:audit:table:instanceCount')" min-width="100"
-        prop="InstanceCount"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:audit:table:instanceCount')"
-        min-width="100"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 检查日期 -->
-      <el-table-column
+      <el-table-column prop="StudyTime" :label="$t('trials:audit:table:studyDate')" min-width="120"
-        prop="StudyTime"
+        show-overflow-tooltip sortable>
-        :label="$t('trials:audit:table:studyDate')"
-        min-width="120"
-        show-overflow-tooltip
-        sortable
-      >
         <template slot-scope="scope">
           {{ moment(scope.row.StudyTime).format('YYYY-MM-DD') }}
         </template>
       </el-table-column>
       <!-- 更新时间 -->
-      <el-table-column
+      <el-table-column prop="UpdateTime" :label="$t('trials:audit:table:studyUpdateTime')" min-width="80"
-        prop="UpdateTime"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:audit:table:studyUpdateTime')"
-        min-width="80"
-        show-overflow-tooltip
-        sortable
-      />
       <!-- 上传时间 -->
-      <el-table-column
+      <el-table-column prop="UploadedTime" :label="$t('trials:audit:table:studyUploadTime')" min-width="80"
-        prop="UploadedTime"
+        show-overflow-tooltip sortable />
-        :label="$t('trials:audit:table:studyUploadTime')"
+      <el-table-column :label="$t('common:action:action')" min-width="100" fixed="right">
-        min-width="80"
-        show-overflow-tooltip
-        sortable
-      />
-      <el-table-column
-        :label="$t('common:action:action')"
-        min-width="100"
-        fixed="right"
-      >
         <template slot-scope="scope">
           <!-- 预览 -->
-          <el-button
+          <el-button icon="el-icon-view" :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            icon="el-icon-view"
+            :title="$t('trials:audit:action:preview')" circle @click="handleViewStudy(scope.row)" />
-            :disabled="scope.row.SeriesCount === 0 || scope.row.IsDeleted"
-            :title="$t('trials:audit:action:preview')"
-            circle
-            @click="handleViewStudy(scope.row)"
-          />
           <!-- 预览PET-CT数据 -->
-          <el-button
+          <el-button icon="el-icon-folder" :title="$t('trials:audit:tab:clinicalData')" v-if="
-            icon="el-icon-folder"
+            ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
-            :title="$t('trials:audit:tab:clinicalData')"
+            relationInfo.IsHaveStudyClinicalData
-            v-if="
+          " circle :disabled="scope.row.IsDeleted" @click="handlePreviewClinicalData(scope.row)" />
-              ['PT、CT', 'CT、PT', 'PET-CT'].includes(scope.row.Modalities) &&
-              relationInfo.IsHaveStudyClinicalData
-            "
-            circle
-            :disabled="scope.row.IsDeleted"
-            @click="handlePreviewClinicalData(scope.row)"
-          />
         </template>
       </el-table-column>
     </el-table>
     <!--pet-ct临床数据预览-->
-    <el-dialog
+    <el-dialog v-if="petVisible" :show-close="true" :visible.sync="petVisible" append-to-body>
-      v-if="petVisible"
+      <uploadPetClinicalData :subject-visit-id="data.Id" :data="data" :studyData="rowData" :allow-add-or-edit="false" />
-      :show-close="true"
-      :visible.sync="petVisible"
-      append-to-body
-    >
-      <uploadPetClinicalData
-        :subject-visit-id="data.Id"
-        :data="data"
-        :studyData="rowData"
-        :allow-add-or-edit="false"
-      />
     </el-dialog>
   </div>
 </template>
@@ -195,12 +111,12 @@ export default {
       petVisible: false,
       rowData: {},
       relationInfo: {},
-      bp: [],
+      BodyPart: {},
     }
   },
-  async mounted() {
+  async created() {
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
     this.getStudyInfo()
-    this.bp = await this.$getBodyPart(this.$route.query.trialId)
   },
   methods: {
     // 预览临床数据
@@ -242,7 +158,7 @@ export default {
               this.studyLoading = true
             })
         })
-        .catch(() => {})
+        .catch(() => { })
     },
     // 预览所有影像
     handlePreviewAllFiles() {
@@ -260,8 +176,8 @@ export default {
       })
       window.open(routeData.href, '_blank')
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -272,14 +188,12 @@ export default {
       }
       var arr = bodyPart.split(separator)
       var newArr = arr.map((i) => {
-        return this.$fd(
+        return this.$fd('Bodypart', i.trim(), 'Code', this.BodyPart, 'Name')
-          'Bodypart',
-          i.trim(),
-          'Code',
-          { Bodypart: this.bp },
-          'Name'
-        )
       })
+      if (other) {
+        newArr.push(other)
+      }
+      newArr = newArr.filter(Boolean)
       return newArr.join(' | ')
     },
     // 获取勾选项

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

@@ -96,7 +96,7 @@
               <el-table-column prop="BodyPartForEdit" :label="$t('trials:audit:table:bodyPart')" sortable>
                 <template slot-scope="scope">
                   <el-tooltip class="item" effect="dark" :content="$t('trials:audit:message:noBodyPartForEdit')"
-                    placement="bottom" v-if="!scope.row.BodyPartForEdit">
+                    placement="bottom" v-if="!scope.row.BodyPartForEdit && !scope.row.BodyPartForEditOther">
                     <i class="el-icon-warning" style="color: #f44336; font-size: 16px" />
                   </el-tooltip>
                   <span v-else>{{
@@ -645,7 +645,7 @@
                   $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                 }}</el-checkbox>
                 <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
-                  v-model="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
+                  v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
               </el-checkbox-group>
             </el-form-item>
             <!-- 序列数量 -->
@@ -754,7 +754,7 @@
                   $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                 }}</el-checkbox>
                 <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
-                  v-model="noneDicomForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
+                  v-model.trim="noneDicomForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
               </el-checkbox-group>
             </el-form-item>
             <!-- 检查日期 -->
@@ -1935,7 +1935,7 @@ export default {
           hasStudyNameList = []
         var isgoList = []
         this.studyList.forEach((v) => {
-          if (!v.BodyPartForEdit && !v.IsDeleted) {
+          if (!v.BodyPartForEdit && !v.IsDeleted && !v.BodyPartForEditOther) {
             isgo = false
             isgoList.push(v.StudyCode)
           }