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

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`,
@@ -4229,3 +4235,50 @@ export function getVisitStage(data) {
     data
   })
 }
+// 稽查管理-列表
+export function getAuditRecordList(data) {
+  return request({
+    url: `/AuditDocument/getAuditRecordList`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-列表(EA)
+export function getAuditRecordSelectList(data) {
+  return request({
+    url: `/AuditDocument/getAuditRecordSelectList`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-列表新增修改
+export function addOrUpdateAuditRecord(data) {
+  return request({
+    url: `/AuditDocument/addOrUpdateAuditRecord`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-文档授权
+export function setAuditRecordPermission(data) {
+  return request({
+    url: `/AuditDocument/setAuditRecordPermission`,
+    method: 'post',
+    data
+  })
+}
+// 稽查管理-人员管理
+export function addOrDeleteAuditRecordUser(data) {
+  return request({
+    url: `/AuditDocument/addOrDeleteAuditRecordUser`,
+    method: 'put',
+    data
+  })
+}
+// 稽查管理-删除
+export function deleteAuditRecord(auditRecordId) {
+  return request({
+    url: `/AuditDocument/deleteAuditRecord/${auditRecordId}`,
+    method: 'delete'
+  })
+}

src/components/Dicom/DicomCanvas.vue

@@ -116,7 +116,7 @@ export default {
   components: { DicomTags },
   computed: {
     NSTip() {
-      return `${this.$store.state.trials.uploadSize}, NS: ${this.$store.state.trials.uploadTip}`
+      return `${this.$store.state.trials.downloadSize}, NS: ${this.$store.state.trials.downloadTip}`
     }
   },
   data() {

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()
   },
@@ -646,6 +644,7 @@ export default {
           resolve()
         })
         var validFilesCount = 0
+        scope.uploadQueues = []
         for (var i = 0; i < checkFiles.length; ++i) {
           ; (function (index) {
             p = p.then(function () {
@@ -895,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') || '',
@@ -1124,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,
@@ -1209,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/getters.js

@@ -34,6 +34,7 @@ const getters = {
   paymentHistoryQuery: state => state.financials.paymentHistoryQuery,
   revenusQuery: state => state.financials.revenusQuery,
   visitTaskList: state => state.reading.visitTaskList,
+  BodyPart: state => state.reading.BodyPart,
   organList: state => state.reading.organList,
   seriesStack: state => state.reading.seriesStack,
   activeHangingAgreement: state => state.reading.activeHangingAgreement,

src/store/modules/reading.js

@@ -32,7 +32,8 @@ const getDefaultState = () => {
     lastCanvasTaskId: '',
     imageQuality: null,
     imageQualityIssues: null,
-    currentLoadIns: []
+    currentLoadIns: [],
+    BodyPart: []
   }
 }
 function getQuestions(questions) {
@@ -171,6 +172,45 @@ 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 = ','
+  if (bodyPart.indexOf('|') > -1) {
+    separator = '|'
+  } else if (bodyPart.indexOf(',') > -1) {
+    separator = ','
+  } else if (bodyPart.indexOf('，') > -1) {
+    separator = '，'
+  }
+  let BodyPart = {}
+  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')
+  })
+  if (other) {
+    newArr.push(other)
+  }
+  newArr = newArr.filter(Boolean)
+  return newArr
+}
 // function getKeySeriesInfo(keyInstance, series) {
 //   const obj = {}
 //   const set = new Set()
@@ -850,6 +890,20 @@ const actions = {
         var studyList = []
         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.push({
+                StudyId: item.StudyId,
+                StudyCode: item.StudyCode,
+                BodyPart: arr,
+                Modalities: item.Modalities
+              })
+            })
+          } catch (err) {
+            console.log(err)
+          }
           const i = res.Result.findIndex(i => i.IsCriticalSequence)
           if (i > -1) {
             const seriesList = res.Result[i].SeriesList && res.Result[i].SeriesList

src/store/modules/trials.js

@@ -10,7 +10,8 @@ const getDefaultState = () => {
     unlock: false,
     config: {},
     uploadTip: '0.00KB/s',
-    uploadSize: '',
+    downloadTip: '0.00KB/s',
+    downloadSize: '',
     timer: null,
     whiteList: [],
     checkTaskId: null

src/utils/index.js

@@ -123,7 +123,7 @@ export function getNetWorkSpeed() {
         totalBytes = totalBytes / 1024;
         unit = "MB/s";
       }
-      store.state.trials.uploadTip = totalBytes.toFixed(3) + unit;
+      store.state.trials.downloadTip = totalBytes.toFixed(3) + unit;
     }
     if (timeList.length >= 5) {
       delete bytesReceivedPerSecond[timeList[0]]
@@ -189,8 +189,8 @@ export function workSpeedclose(isForce = false) {
   if (timer) {
     clearInterval(timer);
     timer = null;
-    store.state.trials.uploadTip = '0KB/s'
+    store.state.trials.downloadTip = '0KB/s'
-    store.state.trials.uploadSize = ''
+    store.state.trials.downloadSize = ''
   }
   bytesReceivedPerSecond = {};
   lastPercentage = 0;

src/views/dictionary/checkConfig/index.vue

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

src/views/login/index.vue

@@ -7,20 +7,13 @@
       <div class="login-l">
         <div class="login-logo">
           <img v-if="language === 'zh'" src="@/assets/zzlogo2.png" alt="" />
-          <img
+          <img v-else-if="NODE_ENV === 'usa'" src="@/assets/zzlogo-usa.png" alt="" class="usa-logo" />
-            v-else-if="NODE_ENV === 'usa'"
-            src="@/assets/zzlogo-usa.png"
-            alt=""
-            class="usa-logo"
-          />
           <img v-else src="@/assets/zzlogo4.png" alt="" />
         </div>
-        <div
+        <div :class="{
-          :class="{
+          'login-image': true,
-            'login-image': true,
+          'login-image-usa': true,
-            'login-image-usa': true,
+        }">
-          }"
-        >
           <svg-icon icon-class="login-bg" style="width: 90%; height: 90%" />
           <!-- <img src="@/assets/login-bg.png" v-else /> -->
         </div>
@@ -29,77 +22,43 @@
         <div class="title-container">
           <!-- IRC Management System -->
           <div v-if="NODE_ENV === 'usa'">
-            <svg-icon
+            <svg-icon icon-class="login-logo" style="width: 300px; height: 94px" />
-              icon-class="login-logo"
-              style="width: 300px; height: 94px"
-            />
           </div>
           <div class="title" v-else>{{ $t('login:title:system') }}</div>
         </div>
-        <el-form
+        <el-form ref="loginForm" :model="loginForm" :rules="loginRules" class="login-form" auto-complete="on"
-          ref="loginForm"
+          label-position="left">
-          :model="loginForm"
+          <el-form-item prop="username" :rules="[
-          :rules="loginRules"
+            {
-          class="login-form"
+              required: true,
-          auto-complete="on"
+              message: this.$t('login:formRule:userName'),
-          label-position="left"
+              trigger: 'blur',
-        >
+            },
-          <el-form-item
+          ]">
-            prop="username"
-            :rules="[
-              {
-                required: true,
-                message: this.$t('login:formRule:userName'),
-                trigger: 'blur',
-              },
-            ]"
-          >
             <span class="svg-container">
               <svg-icon icon-class="user" />
             </span>
             <!-- User Name -->
-            <el-input
+            <el-input ref="username" v-model="loginForm.username" size="small" :placeholder="$t('login:form:userName')"
-              ref="username"
+              name="username" type="text" tabindex="1" />
-              v-model="loginForm.username"
-              size="small"
-              :placeholder="$t('login:form:userName')"
-              name="username"
-              type="text"
-              tabindex="1"
-            />
           </el-form-item>
 
-          <el-form-item
+          <el-form-item prop="password" :rules="[
-            prop="password"
+            {
-            :rules="[
+              required: true,
-              {
+              message: this.$t('login:formRule:password'),
-                required: true,
+              trigger: 'blur',
-                message: this.$t('login:formRule:password'),
+            },
-                trigger: 'blur',
+          ]">
-              },
-            ]"
-          >
             <span class="svg-container">
               <svg-icon icon-class="password" />
             </span>
             <!-- password -->
-            <el-input
+            <el-input :key="passwordType" ref="password" v-model="loginForm.password" size="small" :type="passwordType"
-              :key="passwordType"
+              :placeholder="$t('login:form:password')" name="password" auto-complete="new-password"
-              ref="password"
+              autocomplete="new-password" tabindex="2" @keyup.enter.native="handleLogin" />
-              v-model="loginForm.password"
-              size="small"
-              :type="passwordType"
-              :placeholder="$t('login:form:password')"
-              name="password"
-              auto-complete="new-password"
-              autocomplete="new-password"
-              tabindex="2"
-              @keyup.enter.native="handleLogin"
-            />
             <span class="show-pwd" @click="showPwd">
-              <svg-icon
+              <svg-icon :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'" />
-                :icon-class="passwordType === 'password' ? 'eye' : 'eye-open'"
-              />
             </span>
             <!-- <el-input
               :key="passwordType"
@@ -118,53 +77,39 @@
             </span> -->
           </el-form-item>
           <!-- Login -->
-          <el-button
+          <el-button :loading="loading" type="primary" style="
-            :loading="loading"
-            type="primary"
-            style="
               width: 100%;
               margin-bottom: 10px;
               background-color: rgb(0, 147, 221);
-            "
+            " size="medium" @click.native.prevent="handleLogin">
-            size="medium"
-            @click.native.prevent="handleLogin"
-          >
             {{ $t('login:button:login') }}
           </el-button>
           <div style="text-align: right">
-            <TopLang
+            <TopLang v-if="
-              v-if="
+              VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
-                VUE_APP_OSS_CONFIG_REGION !== 'oss-us-west-1' &&
+              NODE_ENV !== 'usa'
-                NODE_ENV !== 'usa'
+            " />
-              "
-            />
             <!-- Forget password? -->
-            <el-button
+            <el-button type="text" size="medium" @click.native.prevent="handleResetPwd" style="color: rgb(0, 147, 221)">
-              type="text"
-              size="medium"
-              @click.native.prevent="handleResetPwd"
-              style="color: rgb(0, 147, 221)"
-            >
               {{ $t('login:button:forgetPassword') }}
             </el-button>
           </div>
+          <div class="PrivacyPolicy">
+            <span>{{ $t('login:message:PrivacyPolicy') }}</span>
+            <span style="cursor: pointer;color:#428bca">《{{ $t('login:message:PrivacyPolicyName') }}》</span>
+          </div>
         </el-form>
       </div>
     </div>
     <div v-if="language === 'zh'" class="login-footer">
-      <span
+      <span>Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
-        >Copyright © {{ new Date().getFullYear() }} 上海展影医疗科技有限公司
+        版权所有</span>
-        版权所有</span
-      >
       <span> | </span>
       <a target="_blank" href="https://beian.miit.gov.cn/">
         <span> 沪ICP备2021037850-2 </span>
       </a>
       <span> | </span>
-      <a
+      <a target="_blank" href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859">
-        target="_blank"
-        href="http://www.beian.gov.cn/portal/registerSystemInfo?recordcode=31011002005859"
-      >
         <img src="@/assets/filing.png" />
         <span>沪公网安备 31011002005859号</span>
       </a>
@@ -180,43 +125,23 @@
         <span style="color: #428bca">About</span>
       </a>
     </div>
-    <Vcode
+    <Vcode :show="isShow" :fail-text="$t('login:button:failText')" :success-text="$t('login:button:successText')"
-      :show="isShow"
+      :slider-text="$t('login:button:sliderText')" :imgs="[Img1]" @success="onSuccess" />
-      :fail-text="$t('login:button:failText')"
+    <el-dialog v-if="aboutVisible" :visible.sync="aboutVisible" width="680px" style="margin-top: 0"
-      :success-text="$t('login:button:successText')"
+      :close-on-click-modal="false" size="small">
-      :slider-text="$t('login:button:sliderText')"
+      <div style="
-      :imgs="[Img1]"
-      @success="onSuccess"
-    />
-    <el-dialog
-      v-if="aboutVisible"
-      :visible.sync="aboutVisible"
-      width="680px"
-      style="margin-top: 0"
-      :close-on-click-modal="false"
-      size="small"
-    >
-      <div
-        style="
           margin: 0 auto;
           width: 600px;
           line-height: 28px;
           text-align: center;
-        "
+        ">
-      >
+        <h1 style="text-align: center; margin-bottom: 30px" v-if="NODE_ENV === 'usa'">
-        <h1
-          style="text-align: center; margin-bottom: 30px"
-          v-if="NODE_ENV === 'usa'"
-        >
           About
         </h1>
         <h1 style="text-align: center; margin-bottom: 30px" v-else>关于</h1>
         <p style="margin-bottom: 0px" v-if="NODE_ENV === 'usa'">
           <!-- {{ $t('login:title:system_title_about') }} -->
-          <svg-icon
+          <svg-icon icon-class="login-logo" style="width: 250px; height: 71px" />
-            icon-class="login-logo"
-            style="width: 250px; height: 71px"
-          />
         </p>
         <p style="margin-bottom: 0px" v-else>{{ $t('login:title:system') }}</p>
         <p style="margin-bottom: 20px; margin-top: 0">
@@ -247,13 +172,8 @@
       </div>
     </el-dialog>
     <browserTip ref="browserTip" />
-    <toggleRole
+    <toggleRole v-if="toggleRoleVisible" :visible.sync="toggleRoleVisible" :loading="toggleRoleLoading"
-      v-if="toggleRoleVisible"
+      @save="loginByRole" @cancel="cancel" />
-      :visible.sync="toggleRoleVisible"
-      :loading="toggleRoleLoading"
-      @save="loginByRole"
-      @cancel="cancel"
-    />
   </div>
 </template>
 
@@ -339,7 +259,14 @@ export default {
     this.location = this.$route.query.location
     zzSessionStorage.setItem('loginType', this.loginType)
     localStorage.setItem('location', this.location)
-    if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
+    // zh-CN navigator.language
+    console.log(navigator.language, 'navigator.language')
+    if (navigator.language !== 'zh-CN' && navigator.language !== 'zh-TW') {
+      this.$i18n.locale = 'en'
+      this.setLanguage('en')
+      this.$updateDictionary()
+    }
+    else if (process.env.VUE_APP_OSS_CONFIG_REGION === 'oss-us-west-1') {
       this.$i18n.locale = 'en'
       this.setLanguage('en')
       this.$updateDictionary()
@@ -516,7 +443,7 @@ export default {
         Array.isArray(this.$store.state.user.roles) &&
         this.$store.state.user.roles.filter((item) => item.IsUserRoleDisabled)
           .length ===
-          this.$store.state.user.roles.length - 1
+        this.$store.state.user.roles.length - 1
       ) {
         let role = this.$store.state.user.roles.find(
           (item) => !item.IsUserRoleDisabled
@@ -640,6 +567,7 @@ $cursor: #fff;
       // }
     }
   }
+
   .login-r {
     .el-form-item {
       border: 1px solid rgba(255, 255, 255, 0.1);
@@ -655,23 +583,28 @@ $cursor: #fff;
 $bg: #2d3a4b;
 $dark_gray: #889aa4;
 $light_gray: #606266;
+
 .login-container {
   position: relative;
   width: 100%;
   height: 100%;
   overflow: auto;
   background: rgb(249, 249, 249);
+
   ::v-deep .el-input__inner::placeholder {
     color: $dark_gray;
   }
+
   .login-header {
     margin: 10px 0px 20px 10px;
     height: 3rem;
     width: 720px;
+
     .login-logo {
       height: 100%;
     }
   }
+
   .login-body {
     position: absolute;
     left: 50%;
@@ -685,32 +618,39 @@ $light_gray: #606266;
     box-sizing: border-box;
     background: rgb(255, 255, 255);
     border-radius: 10px 0px 0px 10px;
+
     .login-l {
       position: relative;
       float: left;
       width: 50%;
       height: 100%;
+
       .login-logo {
         position: absolute;
         top: 35px;
         left: 50px;
+
         img {
           height: 40px;
         }
+
         .usa-logo {
           height: 60px;
         }
       }
+
       .login-image {
         position: absolute;
         top: 10px;
         left: 0px;
         // transform: translateY(-50%);
         height: 100%;
+
         img {
           height: 100%;
         }
       }
+
       .login-image-usa {
         width: 100%;
         display: flex;
@@ -718,6 +658,7 @@ $light_gray: #606266;
         justify-content: flex-end;
       }
     }
+
     .login-r {
       position: relative;
       float: left;
@@ -735,16 +676,19 @@ $light_gray: #606266;
         margin: 0 auto;
         overflow: hidden;
       }
+
       .title-container {
         // margin-bottom: 50px;
         text-align: center;
         margin-top: 20%;
+
         .title {
           font-size: 35px;
           color: $light_gray;
           text-align: center;
           font-weight: bold;
         }
+
         .title-logo-message {
           font-size: 26px;
           color: $light_gray;
@@ -784,6 +728,7 @@ $light_gray: #606266;
       }
     }
   }
+
   .login-footer {
     position: absolute;
     bottom: 50px;
@@ -797,6 +742,7 @@ $light_gray: #606266;
     align-items: center;
     // color: rgb(180, 190, 199);
     color: #909399;
+
     a {
       display: inline-block;
       text-decoration: none;
@@ -805,13 +751,16 @@ $light_gray: #606266;
       display: flex;
       justify-content: center;
     }
+
     span {
       margin: 0 2px;
     }
+
     img {
       height: 20px;
       line-height: 20px;
     }
+
     // p{
     //   display: inline-block;
     //   height:20px;

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/reviewers/curriculumVitae/components/info/clinicalTrials.vue

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

src/views/reviewers/curriculumVitae/index.vue

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

src/views/trials/trials-panel/attachments/attachment-management/index.vue

@@ -60,7 +60,7 @@
           <el-input v-model="searchData.userName" clearable style="width: 120px" />
         </el-form-item>
         <!-- 用户类型 -->
-        <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc">
+        <el-form-item :label="$t('trials:signRecords:table:userType')" v-if="!isDoc && !isEASystem">
           <el-select v-model="searchData.UserTypeId" clearable filterable style="width: 120px">
             <el-option v-for="item of userTypeOptions"
               v-show="isSystem || (item.UserTypeEnum !== 26 && item.UserTypeEnum !== 27)" :key="item.Id"
@@ -69,7 +69,7 @@
             </el-option>
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:isSign')" v-if="!isDoc || !viewStatus">
+        <el-form-item :label="$t('trials:signRecords:table:isSign')" v-if="(!isDoc || !viewStatus) && !isEASystem">
           <el-select v-model="searchData.IsConfirmed" clearable style="width: 120px">
             <el-option v-for="i of $d.TrainingStatusEnum" :key="'IsConfirmed' + i.label" :value="i.value"
               :label="i.label" />
@@ -78,12 +78,12 @@
         <el-form-item :label="isDoc
           ? $t('trials:signRecords:table:isDeletedFile')
           : $t('trials:signRecords:table:isDeleted')
-          ">
+          " v-if="!isEASystem">
           <el-select v-model="searchData.IsDeleted" clearable style="width: 120px">
             <el-option v-for="i of $d.TrainingStatus" :key="'IsDeleted' + i.label" :value="i.value" :label="i.label" />
           </el-select>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:username')" v-if="isDoc">
+        <el-form-item :label="$t('trials:signRecords:table:username')" v-if="isDoc && !isEASystem">
           <el-input v-model="searchData.UserName" style="width: 120px" />
         </el-form-item>
         <el-form-item :label="$t('trials:signRecords:table:confirmTime')" v-if="isDoc || isSystem">
@@ -91,7 +91,7 @@
             :default-time="['00:00:00', '23:59:59']" type="datetimerange">
           </el-date-picker>
         </el-form-item>
-        <el-form-item :label="$t('trials:signRecords:table:uploadTime')" v-if="isSystem">
+        <el-form-item :label="$t('trials:signRecords:table:uploadTime')" v-if="isSystem && !isEASystem">
           <el-date-picker v-model="timeListC" value-format="yyyy-MM-dd HH:mm:ss" format="yyyy-MM-dd HH:mm:ss"
             type="datetimerange" :default-time="['00:00:00', '23:59:59']" @change="changeTimeListC" />
         </el-form-item>
@@ -305,6 +305,11 @@ export default {
       },
     }
   },
+  computed: {
+    isEASystem() {
+      return this.isSystem && this.hasPermi(['role:ea'])
+    }
+  },
   mounted() {
     this.getTypeOptions()
     this.getUserSelect()
@@ -360,6 +365,14 @@ export default {
     },
     // 获取系统文件数据
     getList() {
+      if (this.isEASystem) {
+        this.searchData.IsConfirmed = true
+        if (!this.searchData.FileTypeId && !this.searchData.Name && !this.searchData.UserId && !this.searchData.userName && (!Array.isArray(this.timeList) || this.timeList.length < 2)) {
+          this.list = []
+          this.total = 0
+          return false
+        }
+      }
       this.loading = true
       if (this.viewStatus) {
         this.searchData.IsConfirmed = true
@@ -398,6 +411,7 @@ export default {
     getTypeOptions() {
       if (this.isSystem) {
         this.typeOptions = this.$d.Sys_Document
+        if (this.isEASystem) this.typeOptions = this.typeOptions.filter(item => item.raw.ChildGroup !== "Trial")
       } else {
         getTrialDocAndSystemDocType(this.trialId).then((res) => {
           this.typeOptions = res.Result

src/views/trials/trials-panel/attachments/self-attachment/index.vue

@@ -47,7 +47,7 @@
         <el-table-column prop="Name" :label="$t('trials:self-attachment:table:fileName')" show-overflow-tooltip
           sortable="custom" />
         <el-table-column :label="$t('trials:self-attachment:table:AttachmentCount')" prop="AttachmentCount"
-          show-overflow-tooltip sortable="custom">
+          show-overflow-tooltip>
           <template slot-scope="scope">
             <el-button type="text" @click.stop="openAttachment(scope.row, true)">{{ scope.row.AttachmentCount
             }}</el-button>

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

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

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

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

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

@@ -7,7 +7,14 @@
       <el-tooltip class="item" effect="dark" :content="$t('trials:reading:button:clinicalData')" placement="bottom">
         <svg-icon icon-class="documentation" class="svg-icon" />
       </el-tooltip>
-
+    </div>
+    <!-- 检查部位 -->
+    <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" /> -->
+        <i class="el-icon-tickets"></i>
+      </el-tooltip>
     </div>
     <!-- 切换访视 -->
     <div v-if="stack.imageRendered && isReadingTaskViewInOrder === 1" class="info-visit"
@@ -35,7 +42,8 @@
     </div>
     <div class="info-image">
       <div v-show="mousePosition.mo">
-        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) : '' }}
+        Pos: {{ mousePosition.x ? mousePosition.x.toFixed(0) : '' }}, {{ mousePosition.y ? mousePosition.y.toFixed(0) :
+          '' }}
       </div>
       <div
         v-if="(dicomInfo.modality === 'CT' || dicomInfo.modality === 'DR' || dicomInfo.modality === 'CR') && mousePosition.mo">
@@ -299,7 +307,7 @@ export default {
   computed: {
     ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
     NSTip() {
-      return `NS: ${this.$store.state.trials.uploadTip}`
+      return `NS: ${this.$store.state.trials.downloadTip}`
     }
   },
   watch: {
@@ -2004,8 +2012,13 @@ export default {
       e.stopImmediatePropagation()
       e.stopPropagation()
       e.preventDefault()
+    },
+    handleViewBP(e) {
+      DicomEvent.$emit('previewBP', this.stack.visitTaskId)
+      e.stopImmediatePropagation()
+      e.stopPropagation()
+      e.preventDefault()
     }
-
   }
 }
 </script>
@@ -2116,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/components/ReportPage.vue

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

src/views/trials/trials-panel/reading/dicoms/customize/CustomizeDicomCanvas.vue

@@ -297,7 +297,7 @@ export default {
   computed: {
     ...mapGetters(['visitTaskList', 'currentReadingTaskState']),
     NSTip() {
-      return `NS: ${this.$store.state.trials.uploadTip}`
+      return `NS: ${this.$store.state.trials.downloadTip}`
     }
   },
   watch: {

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

@@ -1,57 +1,44 @@
 <template>
   <div ref="container" style="width:100%;height:100%" class="dicom-container">
     <!-- 访视阅片 -->
-    <div v-if="readingCategory === 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1)) " class="reading-wrapper">
+    <div
+      v-if="readingCategory === 1 && (CriterionType === 7 || ((CriterionType === 1 || CriterionType === 0) && readingVersionEnum === 1))"
+      class="reading-wrapper">
       <VisitReview :reading-tool="readingTool" />
     </div>
-    <div v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType !== 0" class="reading-wrapper">
+    <div
+      v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory === 1 && CriterionType !== 0"
+      class="reading-wrapper">
       <el-tabs v-model="activeName" v-loading="loading" :before-leave="beforeLeave">
         <!-- 阅片 -->
         <el-tab-pane :label="$t('trials:reading:tabTitle:review')" name="read">
-          <ReadPage
+          <ReadPage v-if="tabs.includes('read')" :trial-id="trialId" :visit-task-id="visitTaskId"
-            v-if="tabs.includes('read')"
+            :subject-id="subjectId" :subject-code="subjectCode" :is-show="isShow"
-            :trial-id="trialId"
+            :question-form-change-state="questionFormChangeState" :question-form-change-num="questionFormChangeNum"
-            :visit-task-id="visitTaskId"
-            :subject-id="subjectId"
-            :subject-code="subjectCode"
-            :is-show="isShow"
-            :question-form-change-state="questionFormChangeState"
-            :question-form-change-num="questionFormChangeNum"
             :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            :is-reading-task-view-in-order="isReadingTaskViewInOrder"
+            :is-reading-task-view-in-order="isReadingTaskViewInOrder" :is-exists-clinical-data="isExistsClinicalData"
-            :is-exists-clinical-data="isExistsClinicalData"
+            :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual"
-            :is-exists-no-dicom-file="isExistsNoDicomFile"
+            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading" @previewCD="previewCD" />
-            :is-exists-manual="isExistsManual"
-            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
-            @previewCD="previewCD"
-          />
         </el-tab-pane>
         <!-- 报告 -->
         <el-tab-pane v-if="!IseCRFShowInDicomReading" :label="$t('trials:reading:tabTitle:report')" name="report">
-          <ReportPage v-if="tabs.includes('report') && isShow" ref="reportPage" :question-form-change-state="questionFormChangeState" :visit-task-id="visitTaskId" />
+          <ReportPage v-if="tabs.includes('report') && isShow" ref="reportPage"
+            :question-form-change-state="questionFormChangeState" :visit-task-id="visitTaskId" />
         </el-tab-pane>
       </el-tabs>
     </div>
-    <div v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory=== 1 && CriterionType === 0" class="reading-wrapper">
+    <div
+      v-else-if="(isReadingTaskViewInOrder === 1 || ((isReadingTaskViewInOrder !== 1) && isShow)) && readingCategory === 1 && CriterionType === 0"
+      class="reading-wrapper">
       <el-tabs v-model="activeName" v-loading="loading" :before-leave="beforeLeaveCustomize">
         <!-- 阅片 -->
         <el-tab-pane :label="$t('trials:reading:tabTitle:review')" name="read">
-          <CustomizeReadPage
+          <CustomizeReadPage v-if="tabs.includes('read')" :trial-id="trialId"
-            v-if="tabs.includes('read')"
+            :trial-reading-criterion-id="TrialReadingCriterionId" :visit-task-id="visitTaskId" :subject-id="subjectId"
-            :trial-id="trialId"
+            :subject-code="subjectCode" :is-show="isShow" :is-reading-show-subject-info="isReadingShowSubjectInfo"
-            :trial-reading-criterion-id="TrialReadingCriterionId"
-            :visit-task-id="visitTaskId"
-            :subject-id="subjectId"
-            :subject-code="subjectCode"
-            :is-show="isShow"
-            :is-reading-show-subject-info="isReadingShowSubjectInfo"
             :is-reading-task-view-in-order="isReadingTaskViewInOrder"
-            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading"
+            :ise-c-r-f-show-in-dicom-reading="IseCRFShowInDicomReading" :is-exists-clinical-data="isExistsClinicalData"
-            :is-exists-clinical-data="isExistsClinicalData"
+            :is-exists-no-dicom-file="isExistsNoDicomFile" :is-exists-manual="isExistsManual" @previewCD="previewCD" />
-            :is-exists-no-dicom-file="isExistsNoDicomFile"
-            :is-exists-manual="isExistsManual"
-            @previewCD="previewCD"
-          />
         </el-tab-pane>
         <!-- 报告 -->
         <el-tab-pane v-if="!IseCRFShowInDicomReading" :label="$t('trials:reading:tabTitle:report')" name="report">
@@ -60,70 +47,40 @@
       </el-tabs>
     </div>
     <!-- 全局阅片 -->
-    <GlobalReview
+    <GlobalReview v-else-if="isShow && readingCategory === 2" :trial-id="trialId" :subject-id="subjectId"
-      v-else-if="isShow && readingCategory === 2"
+      :visit-task-id="visitTaskId" :reading-category="readingCategory" :subject-code="subjectCode"
-      :trial-id="trialId"
+      :task-blind-name="taskBlindName" :is-reading-show-subject-info="isReadingShowSubjectInfo"
-      :subject-id="subjectId"
-      :visit-task-id="visitTaskId"
-      :reading-category="readingCategory"
-      :subject-code="subjectCode"
-      :task-blind-name="taskBlindName"
-      :is-reading-show-subject-info="isReadingShowSubjectInfo"
       :is-reading-show-previous-results="isReadingShowPreviousResults"
-      :is-exists-clinical-data="isExistsClinicalData"
+      :is-exists-clinical-data="isExistsClinicalData" />
-    />
     <!-- 裁判阅片 -->
-    <AdReview
+    <AdReview v-else-if="isShow && readingCategory === 4" :trial-id="trialId" :subject-id="subjectId"
-      v-else-if="isShow && readingCategory === 4"
+      :visit-task-id="visitTaskId" :reading-category="readingCategory" :subject-code="subjectCode"
-      :trial-id="trialId"
+      :task-blind-name="taskBlindName" :is-reading-show-subject-info="isReadingShowSubjectInfo"
-      :subject-id="subjectId"
-      :visit-task-id="visitTaskId"
-      :reading-category="readingCategory"
-      :subject-code="subjectCode"
-      :task-blind-name="taskBlindName"
-      :is-reading-show-subject-info="isReadingShowSubjectInfo"
       :is-reading-show-previous-results="isReadingShowPreviousResults"
-      :is-exists-clinical-data="isExistsClinicalData"
+      :is-exists-clinical-data="isExistsClinicalData" />
-    />
 
     <!-- 肿瘤学阅片 -->
-    <OncologyReview
+    <OncologyReview v-else-if="isShow && readingCategory === 5" :trial-id="trialId" :subject-id="subjectId"
-      v-else-if="isShow && readingCategory === 5"
+      :visit-task-id="visitTaskId" :reading-category="readingCategory" :subject-code="subjectCode"
-      :trial-id="trialId"
+      :task-blind-name="taskBlindName" :is-reading-show-subject-info="isReadingShowSubjectInfo"
-      :subject-id="subjectId"
-      :visit-task-id="visitTaskId"
-      :reading-category="readingCategory"
-      :subject-code="subjectCode"
-      :task-blind-name="taskBlindName"
-      :is-reading-show-subject-info="isReadingShowSubjectInfo"
       :is-reading-show-previous-results="isReadingShowPreviousResults"
-      :is-exists-clinical-data="isExistsClinicalData"
+      :is-exists-clinical-data="isExistsClinicalData" />
-    />
 
-    <el-dialog
+    <el-dialog :visible.sync="dialogVisible" :custom-class="isFullscreen ? 'full-dialog-container' : 'dialog-container'"
-      :visible.sync="dialogVisible"
+      :show-close="false" :close-on-click-modal="false" :fullscreen="isFullscreen">
-      :custom-class="isFullscreen?'full-dialog-container':'dialog-container'"
-      :show-close="false"
-      :close-on-click-modal="false"
-      :fullscreen="isFullscreen"
-    >
       <span slot="title" class="dialog-footer">
         <!-- 当前阅片任务存在临床数据，请查看。若已查看，请点击“确认” -->
         <span v-if="!closeCDVisible">{{ $t('trials:reading:dagTitle:msg1') }}</span>
         <div style="position: absolute;right: 20px;top: 10px;">
-          <svg-icon :icon-class="isFullscreen?'exit-fullscreen':'fullscreen'" style="cursor: pointer;font-size: 20px;" @click="isFullscreen=!isFullscreen" />
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
-          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;" @click="dialogVisible = false" />
+            style="cursor: pointer;font-size: 20px;" @click="isFullscreen = !isFullscreen" />
+          <svg-icon v-if="closeCDVisible" icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+            @click="dialogVisible = false" />
         </div>
       </span>
       <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
-        <ClinicalData
+        <ClinicalData v-if="dialogVisible" style="flex: 1" :trial-id="trialId" :subject-id="subjectId"
-          v-if="dialogVisible"
+          :visit-task-id="cdVisitTaskId" :is-reading-show-subject-info="isReadingShowSubjectInfo" />
-          style="flex: 1"
-          :trial-id="trialId"
-          :subject-id="subjectId"
-          :visit-task-id="cdVisitTaskId"
-          :is-reading-show-subject-info="isReadingShowSubjectInfo"
-        />
         <div v-if="!closeCDVisible" style="text-align:right">
           <!-- 确认 -->
           <el-button type="primary" @click="handleConfirmCD">{{ $t('trials:reading:button:confirm') }}</el-button>
@@ -131,12 +88,7 @@
       </div>
     </el-dialog>
 
-    <el-dialog
+    <el-dialog :visible.sync="tipVisible" :show-close="false" :close-on-click-modal="false" width="500px">
-      :visible.sync="tipVisible"
-      :show-close="false"
-      :close-on-click-modal="false"
-      width="500px"
-    >
       <span slot="title" class="dialog-footer">
         <!-- 提示 -->
         {{ $t('trials:iRecist:warnning:msg44') }}
@@ -169,11 +121,41 @@
         <el-button type="primary" @click="tipVisible = false">{{ $t('trials:reading:button:confirm') }}</el-button>
       </span>
     </el-dialog>
-
+    <el-dialog :visible.sync="dialogBodyPartVisible"
+      :custom-class="isFullscreen ? 'full-dialog-container' : 'dialog-container'" :show-close="false"
+      :close-on-click-modal="false" :fullscreen="isFullscreen">
+      <span slot="title" class="dialog-footer">
+        <!-- <span>{{ $t('trials:reading:dagTitle:msg1') }}</span> -->
+        <div style="position: absolute;right: 20px;top: 10px;">
+          <svg-icon :icon-class="isFullscreen ? 'exit-fullscreen' : 'fullscreen'"
+            style="cursor: pointer;font-size: 20px;" @click="isFullscreen = !isFullscreen" />
+          <svg-icon icon-class="dClose" style="cursor: pointer;font-size: 25px;margin-left: 10px;"
+            @click="dialogBodyPartVisible = false" />
+        </div>
+      </span>
+      <div style="height: 100%;margin:0;display: flex;flex-direction: column;">
+        <el-table :data="BodyPart" style="width: 100%">
+          <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="handleConfirmBP">{{ $t('trials:reading:button:confirm')
+          }}</el-button>
+        </div>
+      </div>
+    </el-dialog>
   </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'
@@ -188,6 +170,7 @@ import store from '@/store'
 // import { getToken } from '@/utils/auth'
 import { changeURLStatic } from '@/utils/history.js'
 import requestPoolManager from '@/utils/request-pool'
+import { mapGetters } from 'vuex'
 export default {
   name: 'Reading',
   components: {
@@ -235,9 +218,13 @@ export default {
       tipVisible: false,
       closeCDVisible: false,
       cdVisitTaskId: '',
-      readingVersionEnum: null
+      readingVersionEnum: null,
+      dialogBodyPartVisible: false
     }
   },
+  computed: {
+    ...mapGetters(['BodyPart'])
+  },
   mounted() {
     requestPoolManager.resetRequestPool()
     requestPoolManager.setSortType(0)
@@ -264,6 +251,10 @@ export default {
       this.dialogVisible = true
       this.cdVisitTaskId = taskId
     })
+    DicomEvent.$on('previewBP', (taskId) => {
+      this.isFullscreen = false
+      this.dialogBodyPartVisible = true
+    })
     this.activeName = this.$router.currentRoute.query.tabName ? this.$router.currentRoute.query.tabName : 'read'
     this.tabs.push(this.activeName)
     this.trialId = this.$router.currentRoute.query.trialId
@@ -294,6 +285,7 @@ export default {
   beforeDestroy() {
     DicomEvent.$off('getNextTask')
     DicomEvent.$off('previewCD')
+    DicomEvent.$off('previewBP')
     DicomEvent.$emit('resetOpenWindow')
     window.removeEventListener('beforeunload', this.handleWindowClose)
   },
@@ -336,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
@@ -356,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]
@@ -501,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
@@ -514,98 +523,115 @@ export default {
 }
 </script>
 <style lang="scss" scoped>
-::v-deep.el-message-box__headerbtn{
+::v-deep.el-message-box__headerbtn {
   display: none;
 }
-.dicom-container{
+
-.reading-wrapper{
+.dicom-container {
-  width: 100%;
+  .reading-wrapper {
-  height: 100%;
+    width: 100%;
-  padding: 0 5px;
-  box-sizing: border-box;
-  background-color: #000;
-  ::v-deep.el-tabs{
-    box-sizing: border-box;
     height: 100%;
-    display: flex;
+    padding: 0 5px;
-    flex-direction: column;
+    box-sizing: border-box;
-    .el-tabs__item{
+    background-color: #000;
-      color: #fff;
+
-    }
+    ::v-deep.el-tabs {
-    .el-tabs__header{
-      height: 50px;
-      margin:0px;
       box-sizing: border-box;
-    }
-    .el-tabs__content{
-      flex: 1;
-      margin:0px;
-      box-sizing: border-box;
-    }
-    .el-tabs__item{
-      color: #fff;
-    }
-    .el-tab-pane{
       height: 100%;
+      display: flex;
+      flex-direction: column;
+
+      .el-tabs__item {
+        color: #fff;
+      }
+
+      .el-tabs__header {
+        height: 50px;
+        margin: 0px;
+        box-sizing: border-box;
+      }
+
+      .el-tabs__content {
+        flex: 1;
+        margin: 0px;
+        box-sizing: border-box;
+      }
+
+      .el-tabs__item {
+        color: #fff;
+      }
+
+      .el-tab-pane {
+        height: 100%;
+      }
+
     }
 
-  }
+    ::v-deep.hot-keys-label {
-  ::v-deep.hot-keys-label{
+      color: #dfdfdf !important;
-    color: #dfdfdf !important;
+    }
-  }
-  ::v-deep.shortcut-key-input span{
-    color: #dfdfdf !important;
-  }
-  // ::v-deep .el-dialog{
-  //   background: #1e1e1e;
-  //   ::v-deep .el-dialog__body{
-  //     padding: 10px;
-  //   }
 
-  // }
+    ::v-deep.shortcut-key-input span {
-  ::v-deep.el-dialog{
+      color: #dfdfdf !important;
+    }
+
+    // ::v-deep .el-dialog{
+    //   background: #1e1e1e;
+    //   ::v-deep .el-dialog__body{
+    //     padding: 10px;
+    //   }
+
+    // }
+    ::v-deep.el-dialog {
       background: #1e1e1e;
       border: 1px solid #ddd;
       color: #ddd;
-      .el-dialog__title{
+
-        color:#fff;
+      .el-dialog__title {
+        color: #fff;
       }
-      .el-input .el-input__inner{
+
+      .el-input .el-input__inner {
         background-color: transparent;
         color: #ddd;
         border: 1px solid #5e5e5e;
       }
-      .el-input.is-disabled .el-input__inner{
+
+      .el-input.is-disabled .el-input__inner {
         background-color: #646464a1;
       }
-      .el-form-item__label{
+
+      .el-form-item__label {
         color: #dfdfdf
       }
     }
 
-}
-::v-deep.dialog-container{
-    margin-top: 50px !important;
-    width:75%;
-    height:80%;
   }
-  ::v-deep.el-dialog__body{
+
-      padding: 20px;
+  ::v-deep.dialog-container {
-      height: calc(100% - 70px);
+    margin-top: 50px !important;
-    }
+    width: 75%;
-  .el-dialog__header{
+    height: 80%;
+  }
+
+  ::v-deep.el-dialog__body {
+    padding: 20px;
+    height: calc(100% - 70px);
+  }
+
+  .el-dialog__header {
     position: relative;
   }
 }
+
 ::v-deep .el-radio__input.is-disabled.is-checked .el-radio__inner {
   background-color: #428bca;
   border-color: #428bca;
 }
 
-.full-dialog-container{
+.full-dialog-container {
-  ::v-deep.is-fullscreen .el-dialog__body{
+  ::v-deep.is-fullscreen .el-dialog__body {
     height: calc(100% - 70px);
   }
 }
-
 </style>

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/PetCtViewport.vue

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

src/views/trials/trials-panel/reading/dicoms3D/components/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/ReportPage.vue

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

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

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

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

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

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

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

src/views/trials/trials-panel/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/setting/personnel-manage/components/staff.vue

@@ -147,7 +147,6 @@
         prop="UserType"
         :label="$t('trials:staff:table:userType')"
         show-overflow-tooltip
-        sortable
         width="160"
       >
         <template slot-scope="scope">

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/subject/subject-list/components/SubjectStatusForm.vue

@@ -1,60 +1,39 @@
 <template>
-  <el-form
+  <el-form ref="subjectStatusForm" v-loading="loading" :model="form" :rules="rules" size="small" label-width="160px">
-    ref="subjectStatusForm"
-    v-loading="loading"
-    :model="form"
-    :rules="rules"
-    size="small"
-    label-width="160px"
-  >
     <div class="base-dialog-body">
       <!-- Status -->
       <el-form-item :label="$t('trials:subject:table:status')" prop="Status">
-        <el-radio-group v-model="form.Status" :disabled="originalStatus === 2">
+        <el-radio-group v-model="form.Status" :disabled="originalStatus === 2" @change="handleChange">
-          <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value" :key="item.id">{{item.label}}</el-radio>
+          <el-radio v-for="item of $d.Subject_Visit_Status" :label="item.value" :key="item.id">
+            {{ item.label }}</el-radio>
         </el-radio-group>
       </el-form-item>
       <!-- Out Visit Date -->
-      <el-form-item v-if="form.Status== 2" :label="$t('trials:subject:table:outVisitDate')" prop="VisitOverTime">
+      <el-form-item v-if="form.Status == 2" :label="$t('trials:subject:table:outVisitDate')" prop="VisitOverTime">
-        <el-date-picker
+        <el-date-picker v-model="form.VisitOverTime" type="date" :picker-options="pickerOption"
-          v-model="form.VisitOverTime"
+          value-format="yyyy-MM-dd" format="yyyy-MM-dd" />
-          type="date"
-          :picker-options="pickerOption"
-          value-format="yyyy-MM-dd"
-          format="yyyy-MM-dd"
-        />
       </el-form-item>
       <!-- 末次访视 -->
-      <el-form-item v-if="form.Status===2" :label="$t('trials:subject:table:finalSubjectVisit')" prop="FinalSubjectVisitId">
+      <el-form-item v-if="form.Status === 2" :label="$t('trials:subject:table:finalSubjectVisit')"
-        <el-select
+        prop="FinalSubjectVisitId">
-          v-model="form.FinalSubjectVisitId"
+        <el-select v-model="form.FinalSubjectVisitId" clearable filterable style="width:100%"
-          clearable
+          :disabled="originalStatus === 2">
-          filterable
+          <el-option v-for="item in subjectVisitOptions" :key="item.Id" :label="item.VisitName" :value="item.Id" />
-          style="width:100%"
-          :disabled="originalStatus === 2"
-        >
-          <el-option
-            v-for="item in subjectVisitOptions"
-            :key="item.Id"
-            :label="item.VisitName"
-            :value="item.Id"
-          />
         </el-select>
       </el-form-item>
       <!-- 结束访视的原因 -->
-      <el-form-item v-if="form.Status===2" :label="$t('trials:subject:table:outVisitReason')" prop="Reason">
+      <el-form-item v-if="form.Status === 2" :label="$t('trials:subject:table:outVisitReason')" prop="Reason">
         <el-input v-model="form.Reason" type="textarea" autosize />
       </el-form-item>
+      <!-- 访视中止的原因 -->
+      <el-form-item v-if="form.Status === 3" :label="$t('trials:subject:table:outVisitReason')" prop="SuspendReason">
+        <el-input v-model="form.SuspendReason" type="textarea" autosize />
+      </el-form-item>
     </div>
     <div class="base-dialog-footer" style="text-align:right;margin-top:10px;">
       <el-form-item style="text-align:right;">
         <!-- 取消 -->
-        <el-button
+        <el-button :disabled="btnLoading" size="small" type="primary" @click="handleCancel">
-          :disabled="btnLoading"
-          size="small"
-          type="primary"
-          @click="handleCancel"
-        >
           {{ $t('common:button:cancel') }}
         </el-button>
         <el-button size="small" type="primary" :loading="btnLoading" @click="handleSave">
@@ -83,12 +62,14 @@ export default {
         OutEnrollmentTime: '',
         Reason: '',
         VisitOverTime: '',
-        FinalSubjectVisitId: ''
+        FinalSubjectVisitId: '',
+        SuspendReason: ''
       },
       rules: {
         OutEnrollmentTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
         FinalSubjectVisitId: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }],
         Reason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
+        SuspendReason: [{ max: 500, message: `${this.$t('common:ruleMessage:maxLength')} 500` }],
         VisitOverTime: [{ required: true, message: this.$t('common:ruleMessage:select'), trigger: ['blur'] }]
       },
       pickerOption: {
@@ -108,6 +89,9 @@ export default {
     this.initForm()
   },
   methods: {
+    handleChange() {
+      if (this.form.Status !== 3) this.form.SuspendReason = ''
+    },
     async initForm() {
       this.loading = true
       const { Result } = await getSubjectVisitSelectOptions(this.data.Id)

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

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

src/views/trials/trials-panel/trial-summary/image-summary/index.vue

@@ -356,7 +356,14 @@ export default {
             } else {
                 this.searchData.Asc = false
             }
-            this.searchData.SortField = column.prop
+            let prop = column.prop
+            if (prop === 'TotalImageSizeStr') {
+                prop = 'TotalImageSize'
+            }
+            if (prop === 'TotalReadingImageSizeStr') {
+                prop = 'TotalReadingImageSize'
+            }
+            this.searchData.SortField = prop
             this.searchData.PageIndex = 1
             this.getList()
         },

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

@@ -70,7 +70,7 @@
       <el-table-column prop="BodyPartForEdit" :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>
       <!-- 序列数量 -->
@@ -499,7 +499,7 @@
           <!-- 检查部位 -->
           <el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
             {
-              required: true,
+              required: studyForm.BodyPartForEditOther ? false : true,
               message: $t('common:ruleMessage:specify'),
               trigger: 'blur',
             },
@@ -508,6 +508,8 @@
               <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
                 $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
               }}</el-checkbox>
+              <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
+                v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
             </el-checkbox-group>
           </el-form-item>
           <!-- 序列数量 -->
@@ -604,6 +606,7 @@ export default {
         BodyPartForEdit: [],
         SeriesCount: null,
         StudyTime: '',
+        BodyPartForEditOther: ''
       },
       uploadQueues: dicomStore.studyList, // 上传队列
       selectArr: [], // 已勾选待上传文件
@@ -709,6 +712,7 @@ export default {
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
           StudyName: this.studyForm.StudyName,
+          BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
         }
         updateModality(this.trialId, params)
           .then((res) => {
@@ -1062,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') || '',
@@ -1441,7 +1445,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,
@@ -1530,7 +1534,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,
@@ -1867,8 +1871,8 @@ export default {
         return ''
       }
     },
-    getBodyPart(bodyPart) {
+    getBodyPart(bodyPart, other) {
-      if (!bodyPart) return ''
+      if (!bodyPart && !other) return ''
       var separator = ','
       if (bodyPart.indexOf('|') > -1) {
         separator = '|'
@@ -1881,6 +1885,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/uploadNonDicomFiles.vue

@@ -24,7 +24,7 @@
       <!-- 检查部位 -->
       <el-table-column prop="BodyPart" :label="$t('trials:uploadNonDicoms:table:bodyPart')" sortable>
         <template slot-scope="scope">
-          {{ getBodyPart(scope.row.BodyPart) }}
+          {{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}
         </template>
       </el-table-column>
       <!-- 文件 -->
@@ -163,7 +163,7 @@
           <!-- 检查部位 -->
           <el-form-item :label="$t('trials:uploadNonDicoms:table:bodyPart')" prop="BodyParts" :rules="[
             {
-              required: true,
+              required: form.BodyPartForEditOther ? false : true,
               message: $t('common:ruleMessage:specify'),
               trigger: 'blur',
             },
@@ -172,6 +172,8 @@
               <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
                 $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
               }}</el-checkbox>
+              <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
+                v-model.trim="form.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
             </el-checkbox-group>
           </el-form-item>
           <!-- 检查日期 -->
@@ -381,6 +383,7 @@ export default {
         Modality: '',
         ImageDate: '',
         StudyName: '',
+        BodyPartForEditOther: ""
       },
       pickerOption: {
         disabledDate: (time) => {
@@ -410,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('|') : []
@@ -484,12 +486,13 @@ export default {
       this.form.StudyName = ''
       this.form.ImageDate = ''
       this.form.BodyParts = []
+      this.form.BodyPartForEditOther = ''
       this.dialogVisible = true
     },
     // 打开比编辑弹框，并初始化数据
     handleEdit(row) {
       this.title = this.$t('trials:uploadNonDicoms:dialogTitle:edit')
-      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName, BodyPartForEditOther } = {
         ...row,
       }
       this.form.CodeView = CodeView
@@ -499,6 +502,7 @@ export default {
       this.form.StudyName = StudyName
       this.form.ImageDate = ImageDate
       this.form.BodyParts = this.form.BodyPart.split(', ')
+      this.form.BodyPartForEditOther = BodyPartForEditOther
       this.dialogVisible = true
     },
     // 保存非Dicom检查信息
@@ -1018,8 +1022,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 = '|'
@@ -1032,6 +1036,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/index.vue

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

src/views/trials/trials-panel/visit/qc-check/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,11 +96,11 @@
               <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>{{
-                    getBodyPart(scope.row.BodyPartForEdit)
+                    getBodyPart(scope.row.BodyPartForEdit, scope.row.BodyPartForEditOther)
                   }}</span>
                 </template>
               </el-table-column>
@@ -284,7 +284,7 @@
               <!-- 检查部位 -->
               <el-table-column prop="BodyPart" :label="$t('trials:audit:table:nonDicomsBodypart')" sortable>
                 <template slot-scope="scope">
-                  {{ getBodyPart(scope.row.BodyPart) }}
+                  {{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}
                 </template>
               </el-table-column>
               <!-- 文件 -->
@@ -635,7 +635,7 @@
             <!-- 检查部位 -->
             <el-form-item :label="$t('trials:audit:table:bodyPart')" prop="BodyPartForEdit" :rules="[
               {
-                required: true,
+                required: studyForm.BodyPartForEditOther ? false : true,
                 message: $t('common:ruleMessage:specify'),
                 trigger: 'blur',
               },
@@ -644,6 +644,8 @@
                 <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
                   $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                 }}</el-checkbox>
+                <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
+                  v-model.trim="studyForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
               </el-checkbox-group>
             </el-form-item>
             <!-- 序列数量 -->
@@ -742,7 +744,7 @@
             <!-- 检查部位 -->
             <el-form-item :label="$t('trials:audit:table:nonDicomsBodypart')" prop="BodyParts" :rules="[
               {
-                required: true,
+                required: noneDicomForm.BodyPartForEditOther ? false : true,
                 message: $t('common:ruleMessage:specify'),
                 trigger: 'blur',
               },
@@ -751,6 +753,8 @@
                 <el-checkbox v-for="bodyPart in trialBodyPartTypes" :key="bodyPart" :label="bodyPart">{{
                   $fd('Bodypart', bodyPart, 'Code', BodyPart, 'Name')
                 }}</el-checkbox>
+                <el-input :placeholder="$t('trials:audit:placeholder:BodyPartForEditOther')"
+                  v-model.trim="noneDicomForm.BodyPartForEditOther" style="width:150px;margin-left: 30px;"></el-input>
               </el-checkbox-group>
             </el-form-item>
             <!-- 检查日期 -->
@@ -1018,7 +1022,8 @@ export default {
         BodyPartForEdit: [],
         SeriesCount: null,
         StudyTime: '',
-        ModifyReason: ''
+        ModifyReason: '',
+        BodyPartForEditOther: ''
       },
       currentQCRow: {},
       isAudit: false, // 审核过之后功能按钮禁用标识
@@ -1037,7 +1042,8 @@ export default {
         Modality: '',
         ImageDate: '',
         StudyName: '',
-        ModifyReason: ''
+        ModifyReason: '',
+        BodyPartForEditOther: ''
       },
       subjectClinicalData: {},
       moment,
@@ -1929,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)
           }
@@ -2155,7 +2161,9 @@ export default {
       this.$set(this.studyForm, 'Modality', row.ModalityForEdit)
       // this.studyForm.Modality = row.ModalityForEdit
       this.studyForm.BodyPartForEdit = bodyPart
+      // this.studyForm.BodyPartForEditOther = BodyPartForEditOther
       this.$set(this.studyForm, 'ModifyReason', '')
+      console.log(this.studyForm, 'this.studyForm')
     },
     // 更新拍片部位/拍片类型信息
     handleUpdateStudyInfo() {
@@ -2171,6 +2179,7 @@ export default {
           modality: this.studyForm.Modality,
           bodyPart: this.studyForm.BodyPart,
           StudyName: this.studyForm.StudyName,
+          BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
         }
         if (this.isAuditToEdit) {
           this.btnLoading = false
@@ -2206,6 +2215,7 @@ export default {
             ModifyReason: this.studyForm.ModifyReason,
             Modality: this.studyForm.Modality,
             BodyPart: this.studyForm.BodyPart,
+            BodyPartForEditOther: this.studyForm.BodyPartForEditOther,
           },
           signInfo
         }
@@ -2241,7 +2251,7 @@ export default {
 
     // 打开非Dicom信息编辑框
     handleEditNoneDicomInfo(row) {
-      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName } = {
+      const { CodeView, Id, BodyPart, Modality, ImageDate, StudyName, BodyPartForEditOther } = {
         ...row,
       }
       this.noneDicomForm.StudyName = StudyName
@@ -2252,6 +2262,7 @@ export default {
       this.noneDicomForm.ImageDate = ImageDate
       this.noneDicomForm.BodyParts = BodyPart.split(', ')
       this.noneDicomForm.ModifyReason = null
+      this.noneDicomForm.BodyPartForEditOther = BodyPartForEditOther
       this.editNoneDicomVisible = true
     },
     // 更新非Dicom部位/拍片类型信息
@@ -2434,8 +2445,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 = '|'
@@ -2448,6 +2459,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(' | ')
     },
     openManuals() {

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

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

src/views/trials/trials-workbench/components/auditDocument/index.vue

@@ -2,7 +2,9 @@
     <div class="auditDocument">
         <el-row>
             <el-col :span="12">
-                <h3>{{ isManage ? $t('trials:tab:updateAuditDocument') : $t('trials:tab:viewAuditDocument') }}</h3>
+                <h3>{{ isManage || isAudit ? $t('trials:tab:updateAuditDocument') : $t('trials:tab:viewAuditDocument')
+                    }}
+                </h3>
             </el-col>
             <el-col :span="12" style="text-align:right;">
                 <h3>
@@ -51,6 +53,11 @@
                     {{ $t('trials:trials-workbench:auditDocument:button:del') }}
                 </el-button>
             </el-form-item>
+            <el-form-item v-if="isAudit">
+                <el-button type="primary" :disabled="checkList.length <= 0" @click.stop="auditAuth(true)">
+                    {{ $t('trials:trials-workbench:auditDocument:button:auth') }}
+                </el-button>
+            </el-form-item>
         </el-form>
         <div class="catalogue">
             <span>{{ $t('trials:trials-workbench:auditDocument:catalogue:title') }}</span>
@@ -85,7 +92,7 @@
                             </span>
                             <i :class="{ 'el-icon-success': true, 'icon_check': true, isCheck: checkList.includes(scope.row.Id) }"
                                 @click.stop="addCheck(scope.row)"
-                                v-if="(hoverId === scope.row.Id || checkList.includes(scope.row.Id)) && isManage" />
+                                v-if="(hoverId === scope.row.Id || checkList.includes(scope.row.Id)) && (isManage || isAudit)" />
                             <span class="version"
                                 v-if="(hoverId !== scope.row.Id && !checkList.includes(scope.row.Id)) && isManage && scope.row.HistoricalVersionsCount > 0">
                                 <i class="el-icon-warning-outline"></i>{{ scope.row.HistoricalVersionsCount }}
@@ -116,6 +123,17 @@
                     </el-switch>
                 </template>
             </el-table-column>
+            <el-table-column prop="IsCurrentAuditRecordAuthorization"
+                :label="$t('trials:trials-workbench:auditDocument:table:IsAuthorization')" show-overflow-tooltip
+                v-if="isAudit">
+                <template slot-scope="scope">
+                    <el-switch v-model="scope.row.IsCurrentAuditRecordAuthorization"
+                        @change="(val) => auditAuth(false, scope.row, val)" :active-value="true" :inactive-value="false"
+                        :active-text="$fd('YesOrNo', true)" class="IsAuthorization_swich"
+                        :inactive-text="$fd('YesOrNo', false)">
+                    </el-switch>
+                </template>
+            </el-table-column>
             <el-table-column prop="UpdateTime" show-overflow-tooltip
                 :label="$t('trials:trials-workbench:auditDocument:table:updateTime')">
             </el-table-column>
@@ -137,7 +155,7 @@
     </div>
 </template>
 <script>
-import { getAuditDocumentData, addAuditDocument, getBreadcrumbData, updateAuditDocument, deleteAuditDocument, setCurrentVersion, movieFileOrFolder, copyFileOrFolder, setIsAuthorization, addFolder } from '@/api/trials'
+import { getAuditDocumentData, addAuditDocument, getBreadcrumbData, updateAuditDocument, deleteAuditDocument, setCurrentVersion, movieFileOrFolder, copyFileOrFolder, setIsAuthorization, addFolder, setAuditRecordPermission } from '@/api/trials'
 import Pagination from '@/components/Pagination'
 import contextmenu from './contextmenu.vue'
 import uploadFiles from '@/views/trials/trials-panel/trial-summary/trial-document/components/uploadFiles.vue'
@@ -159,7 +177,15 @@ export default {
         isManage: {
             type: Boolean,
             default: false
-        }
+        },
+        AuditRecordId: {
+            type: String,
+            default: ''
+        },
+        isAudit: {
+            type: Boolean,
+            default: false
+        },
     },
     computed: {
         isCopy() {
@@ -226,6 +252,40 @@ export default {
         }
     },
     methods: {
+        async auditAuth(isArray = true, row, IsAuthorization) {
+            if (!this.isAudit) return false
+            try {
+                let data = {}
+                if (isArray) {
+                    data = {
+                        AuditDocumentIdList: this.checkList,
+                        AuditRecordId: this.AuditRecordId,
+                        IsAuthorization: true,
+                    }
+                } else {
+                    data = {
+                        AuditDocumentIdList: [row.Id],
+                        AuditRecordId: this.AuditRecordId,
+                        IsAuthorization,
+                    }
+                }
+                this.loading = true
+                let res = await setAuditRecordPermission(data)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.$t('trials:trials-workbench:auditDocument:message:authSuccessfully')
+                    // if (isArray) {
+                    this.getList()
+                    // }
+                }
+            } catch (err) {
+                this.loading = false
+                if (!isArray) {
+                    row.IsCurrentAuditRecordAuthorization = !row.IsCurrentAuditRecordAuthorization
+                }
+                console.log(err)
+            }
+        },
         async auth(isArray = true, row, IsAuthorization) {
             if (!this.isManage) return false
             try {
@@ -356,6 +416,12 @@ export default {
                 } else {
                     this.searchData.IsAuthorization = null
                 }
+                if (this.AuditRecordId) this.searchData.AuditRecordId = this.AuditRecordId
+                if (!this.isAudit) {
+                    this.searchData.IsCurrentAuditRecordAuthorization = true
+                } else {
+                    this.searchData.IsCurrentAuditRecordAuthorization = null
+                }
                 let res = await getAuditDocumentData(this.searchData)
                 this.loading = false
                 if (res.IsSuccess) {
@@ -558,7 +624,7 @@ export default {
             this.getList()
         },
         addCheck(row) {
-            if (!this.isManage) return false
+            if (!this.isManage && !this.isAudit) return false
             let index = this.checkList.indexOf(row.Id)
             if (!!~index) {
                 this.checkList.splice(index, 1)

src/views/trials/trials-workbench/components/auditDocument/view.vue

@@ -0,0 +1,43 @@
+<template>
+    <el-tabs v-model="activeName" @tab-click="handleClick">
+        <el-tab-pane v-for="item in tabs" :key="item.Id"
+            :label="`${item.AuditTime} ${item.AuditContent} (${item.CompanyName})`" :name="item.Id">
+            <auditDocument v-if="activeName === item.Id" :isManage="false" :AuditRecordId="item.Id" />
+        </el-tab-pane>
+    </el-tabs>
+
+</template>
+<script>
+import { getAuditRecordSelectList } from '@/api/trials'
+import auditDocument from "@/views/trials/trials-workbench/components/auditDocument"
+export default {
+    name: "auditDocumentView",
+    components: { auditDocument },
+    data() {
+        return {
+            activeName: '',
+            tabs: []
+        }
+    },
+    created() {
+        this.getTabs()
+    },
+    methods: {
+        handleClick(row) {
+            this.activeName = row.name
+        },
+        async getTabs() {
+            try {
+                let res = await getAuditRecordSelectList({})
+                if (res.IsSuccess) {
+                    this.tabs = res.Result
+                    this.activeName = res.Result[0].Id
+                }
+            } catch (err) {
+                console.log(err)
+            }
+        }
+    }
+}
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-workbench/components/inspectionManagement/dataForm.vue

@@ -0,0 +1,245 @@
+<template>
+    <el-dialog v-if="visible" :visible.sync="visible" :close-on-click-modal="false"
+        :title="$t(`trials:trials-workbench:inspectionManagement:dialogTitle:${state}`)" width="600px"
+        custom-class="base-dialog-wrapper" v-dialogDrag :before-close="handleCancle">
+        <el-form :model="from" size="mini" :rules="rules" ref="dataForm" label-width="120px">
+            <div class="base-dialog-body">
+                <!-- 公司名称 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:CompanyName')"
+                    prop="CompanyName">
+                    <el-input v-model="from.CompanyName" clearable></el-input>
+                </el-form-item>
+                <!-- 稽查内容 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditContent')"
+                    prop="AuditContent">
+                    <el-input v-model="from.AuditContent" clearable></el-input>
+                </el-form-item>
+                <!-- 稽查形式 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditType')"
+                    prop="AuditType">
+                    <el-select v-model="from.AuditType" placeholder="" clearable style="width: 100%;">
+                        <el-option v-for="item in $d.AuditType" :key="item.id" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <!-- 稽查人员 -->
+                <!-- <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:IdnetityUserName')"
+                    prop="IdnetityUserName">
+                    <div style="display: flex;align-items: center;justify-content: space-around;">
+                        <p :title="from.IdnetityUserName"
+                            style="width: 50%;overflow: hidden;white-space: nowrap;text-overflow: ellipsis;margin: 0;">
+                            {{
+                                from.IdnetityUserName }}</p>
+                        <el-button type="primary" @click.stop="openUserList">{{
+                            $t('trials:trials-workbench:inspectionManagement:button:select')
+                            }}</el-button>
+                    </div>
+                </el-form-item> -->
+                <!-- 稽查日期 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditTime')"
+                    prop="AuditTime">
+                    <el-date-picker v-model="from.AuditTime" type="date" placeholder="" value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd" clearable style="width: 100%;">
+                    </el-date-picker>
+                </el-form-item>
+                <!-- 文档查看时间 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:ViewTime')" prop="ViewTime">
+                    <el-date-picker v-model="from.ViewTime" type="datetimerange"
+                        :default-time="['00:00:00', '23:59:59']" range-separator="-"
+                        :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+                        :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+                        format="yyyy-MM-dd HH:mm:ss" clearable style="width: 100%;">
+                    </el-date-picker>
+                </el-form-item>
+                <!-- 状态 -->
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:from:AuditState')"
+                    prop="AuditState" v-if="state === 'edit'">
+                    <el-radio-group v-model="from.AuditState">
+                        <el-radio v-for="item in $d.AuditState" :key="item.id" :label="item.value">{{ item.label
+                        }}</el-radio>
+                    </el-radio-group>
+                </el-form-item>
+            </div>
+            <div class="base-dialog-footer" style="text-align: right; margin-top: 10px">
+                <el-form-item>
+                    <!-- 取消 -->
+                    <el-button :disabled="loading" size="small" type="primary" @click="handleCancle">
+                        {{ $t('common:button:cancel') }}
+                    </el-button>
+                    <!-- 保存 -->
+                    <el-button size="small" type="primary" :loading="loading" @click="handleSave">
+                        {{ $t('common:button:save') }}
+                    </el-button>
+                </el-form-item>
+            </div>
+        </el-form>
+    </el-dialog>
+</template>
+<script>
+import { addOrUpdateAuditRecord } from '@/api/trials'
+
+export default {
+    props: {
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        state: {
+            type: String,
+            default: 'add'
+        },
+        rowData: {
+            type: Object,
+            default: () => {
+                return {}
+            }
+        }
+    },
+    watch: {
+        state: {
+            handler() {
+                if (this.state === 'edit') {
+                    Object.keys(this.from).forEach(key => {
+                        if (this.rowData[key] || this.rowData[key] == 0) {
+                            this.from[key] = this.rowData[key]
+                        }
+                    })
+                    this.from.IdnetityUserName = this.rowData.IdentityUserList.map(item => item.FullName).join(", ")
+                    this.from.ViewTime = [this.from.BeginTime, this.from.EndTime]
+                } else {
+                    Object.keys(this.from).forEach(key => {
+                        this.from[key] = ''
+                    })
+                    this.from.ViewTime = []
+                    this.from.IdnetityUserIdList = []
+                }
+            },
+            immediate: true,
+        },
+        'from.ViewTime': {
+            handler() {
+                if (Array.isArray(this.from.ViewTime) && this.from.ViewTime.length === 2) {
+                    this.from.BeginTime = this.from.ViewTime[0]
+                    this.from.EndTime = this.from.ViewTime[1]
+                } else {
+                    this.from.BeginTime = ''
+                    this.from.EndTime = ''
+                }
+            }
+        }
+    },
+    data() {
+        return {
+            loading: false,
+            from: {
+                Id: '',
+                CompanyName: '',
+                AuditContent: '',
+                AuditTime: '',
+                BeginTime: '',
+                EndTime: '',
+                AuditState: '',
+                AuditType: '',
+                IdnetityUserIdList: [],
+                IdnetityUserName: '',
+                ViewTime: []
+            },
+            rules: {
+                CompanyName: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:specify'),
+                        trigger: 'blur',
+                    },
+                ],
+                AuditContent: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:specify'),
+                        trigger: 'blur',
+                    },
+                ],
+                AuditTime: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:select'),
+                        trigger: 'blur',
+                    },
+                ],
+                AuditType: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:select'),
+                        trigger: 'blur',
+                    },
+                ],
+                IdnetityUserName: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:select'),
+                        trigger: 'blur',
+                    },
+                ],
+                AuditState: [
+                    {
+                        required: true,
+                        message: this.$t('common:ruleMessage:select'),
+                        trigger: 'blur',
+                    },
+                ],
+                ViewTime: [
+                    {
+                        required: true,
+                        type: 'array',
+                        message: this.$t('common:ruleMessage:select'),
+                        trigger: 'blur',
+                    },
+                    {
+                        validator: (rule, value, callback) => {
+                            if (value.length < 2) {
+                                callback(
+                                    new Error(this.$t('common:ruleMessage:select'))
+                                )
+                            }
+                            callback()
+                        },
+                        trigger: 'blur',
+                    },
+                ],
+            },
+        }
+    },
+    methods: {
+        openUserList() {
+            this.config.visible = true
+        },
+        handleCancle() {
+            this.$emit('update:visible', false)
+        },
+        async handleSave() {
+            try {
+                let validate = await this.$refs.dataForm.validate()
+                if (!validate) return false
+                if (this.state === 'add') this.from.AuditState = 0
+                this.loading = true
+                let res = await addOrUpdateAuditRecord(this.from)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.$emit('getList')
+                    this.handleCancle()
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        addUser(arr) {
+            this.from.IdnetityUserIdList = arr.map(item => item.Id)
+            this.from.IdnetityUserName = arr.map(item => item.FullName).join(", ")
+            this.config.visible = false
+        }
+    }
+
+}
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-workbench/components/inspectionManagement/document.vue

@@ -0,0 +1,38 @@
+<template>
+    <el-dialog v-if="visible" :visible.sync="visible" :close-on-click-modal="false" :fullscreen="true"
+        :before-close="close" :title="$t(`trials:trials-workbench:inspectionManagement:dialogTitle:${isAudit}`)"
+        custom-class="base-dialog-wrapper">
+        <auditDocument :isManage="false" :AuditRecordId="AuditRecordId" :isAudit="isAudit" />
+    </el-dialog>
+</template>
+<script>
+import auditDocument from "@/views/trials/trials-workbench/components/auditDocument"
+export default {
+    props: {
+        isAudit: {
+            type: Boolean,
+            default: false
+        },
+        visible: {
+            type: Boolean,
+            default: false
+        },
+        AuditRecordId: {
+            type: String,
+            default: ''
+        }
+    },
+    components: { auditDocument },
+    methods: {
+        close(done) {
+            this.$emit("update:visible", false)
+            // done()
+        }
+    }
+}
+</script>
+<style lang="scss" scoped>
+::v-deep .el-dialog__body {
+    margin-top: 0;
+}
+</style>

src/views/trials/trials-workbench/components/inspectionManagement/index.vue

@@ -0,0 +1,305 @@
+<template>
+
+    <BaseContainer class="inspectionManagement">
+        <template slot="title-container">
+            <el-row>
+                <el-col :span="12">
+                    <h3>{{ $t('trials:tab:inspectionManagement') }}</h3>
+                </el-col>
+                <el-col :span="12" style="text-align:right;">
+                    <h3>
+                        <Pagination class="page" :total="total" :page.sync="searchData.pageIndex"
+                            :limit.sync="searchData.pageSize" layout="total, sizes, prev, pager, next"
+                            :background="false" style="display: inline-block;" @pagination="getList" />
+                        <el-button icon="el-icon-refresh-left" size="small" circle :title="$t('common:button:reset')"
+                            @click="handleReset" />
+                    </h3>
+                </el-col>
+            </el-row>
+        </template>
+        <template slot="search-container">
+            <el-form :inline="true">
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')">
+                    <el-input v-model="searchData.CompanyName" clearable placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')">
+                    <el-input v-model="searchData.AuditContent" clearable placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')">
+                    <el-select v-model="searchData.AuditType" placeholder="" clearable>
+                        <el-option v-for="item in $d.AuditType" :key="item.id" :label="item.label" :value="item.value">
+                        </el-option>
+                    </el-select>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
+                    <el-input v-model="searchData.IdentityUserName" clearable placeholder=""></el-input>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')">
+                    <el-date-picker v-model="auditTime" type="daterange" range-separator="-"
+                        :start-placeholder="$t('imageInspect:daterange:startPlaceholder')"
+                        :end-placeholder="$t('imageInspect:daterange:endPlaceholder')" value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd" clearable>
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
+                    <el-date-picker v-model="viewTime" type="datetimerange" range-separator="-"
+                        :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+                        :default-time="['00:00:00', '23:59:59']"
+                        :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd HH:mm:ss"
+                        format="yyyy-MM-dd HH:mm:ss" clearable>
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')">
+                    <el-date-picker v-model="createTime" type="daterange" range-separator="-"
+                        :start-placeholder="$t('curriculumVitae:daterange:startTime')"
+                        :end-placeholder="$t('curriculumVitae:daterange:endTime')" value-format="yyyy-MM-dd"
+                        format="yyyy-MM-dd" clearable>
+                    </el-date-picker>
+                </el-form-item>
+                <el-form-item>
+                    <el-button type="primary" icon="el-icon-search" @click="handleSearch">
+                        {{ $t('common:button:search') }}
+                    </el-button>
+                    <el-button type="primary" icon="el-icon-refresh-left" @click="handleReset">
+                        {{ $t('common:button:reset') }}
+                    </el-button>
+                    <el-button type="primary" @click="openForm('add', {})">
+                        {{ $t('common:button:new') }}
+                    </el-button>
+                </el-form-item>
+            </el-form>
+        </template>
+        <template slot="main-container">
+            <el-table id="auditDocumentTable" ref="auditDocumentTable" :data="tableData" style="width: 99%" row-key="Id"
+                :loading="loading" v-adaptive="{ bottomOffset: 75 }" height="100" @sort-change="handleSortChange">
+                <el-table-column type="index" width="50" />
+                <el-table-column prop="CompanyName" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:CompanyName')" sortable="custom">
+                </el-table-column>
+                <el-table-column prop="AuditContent" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditContent')" sortable="custom">
+                </el-table-column>
+                <el-table-column prop="AuditType" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditType')" sortable="custom">
+                    <template slot-scope="scope">
+                        <span>{{ $fd('AuditType', scope.row.AuditType) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="identityUserList" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:IdentityUserName')">
+                    <template slot-scope="scope">
+                        <el-button v-if="Array.isArray(scope.row.IdentityUserList)" type="text"
+                            @click="openUserList(true, scope.row)">
+                            {{scope.row.IdentityUserList.map(item => item.FullName).join(", ")}}
+                        </el-button>
+                        <!-- <span>
+                        {{Array.isArray(scope.row.IdentityUserList) ?
+                            scope.row.IdentityUserList.map(item => item.FullName).join(", ") :
+                            ''}}
+                    </span> -->
+                    </template>
+                </el-table-column>
+                <el-table-column prop="AuditTime" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:auditTime')" sortable="custom">
+                </el-table-column>
+                <el-table-column prop="BeginTime" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:viewTime')">
+                    <template slot-scope="scope">
+                        <span>{{ `${scope.row.BeginTime} - ${scope.row.EndTime}` }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="AuditState" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:AuditState')" sortable="custom">
+                    <template slot-scope="scope">
+                        <span>{{ $fd('AuditState', scope.row.AuditState) }}</span>
+                    </template>
+                </el-table-column>
+                <el-table-column prop="CreateTime" show-overflow-tooltip
+                    :label="$t('trials:trials-workbench:inspectionManagement:table:createTime')" sortable="custom">
+                </el-table-column>
+                <el-table-column :label="$t('common:action:action')" width="260" align="left" fixed="right">
+                    <template slot-scope="scope">
+                        <el-button circle icon="el-icon-view"
+                            :title="$t('trials:trials-workbench:inspectionManagement:button:viewDocument')"
+                            @click="openDoc(false, scope.row)" />
+                        <el-button circle icon="el-icon-edit-outline"
+                            :title="$t('trials:trials-workbench:inspectionManagement:button:editDocument')"
+                            @click="openDoc(true, scope.row)" />
+                        <el-button circle icon="el-icon-user"
+                            :title="$t('trials:trials-workbench:inspectionManagement:button:user')"
+                            @click="openUserList(false, scope.row)" />
+                        <el-button circle icon="el-icon-edit" :title="$t('common:button:edit')"
+                            @click="openForm('edit', scope.row)" />
+                        <el-button circle icon="el-icon-delete" :title="$t('common:button:delete')"
+                            :disabled="scope.row.AuditState > 0" @click="del(scope.row)" />
+                    </template>
+                </el-table-column>
+            </el-table>
+        </template>
+        <dataForm v-if="fromVisible" :visible.sync="fromVisible" :rowData="rowData" :state="state" @getList="getList" />
+        <document v-if="docVisible" :visible.sync="docVisible" :isAudit="isAudit" :AuditRecordId="AuditRecordId" />
+        <base-model :config="config">
+            <template slot="dialog-body">
+                <userList v-if="config.visible" :AuditRecordId="AuditRecordId" :isView="isView" @close="close"
+                    @getList="getList" />
+            </template>
+        </base-model>
+    </BaseContainer>
+</template>
+<script>
+import Pagination from '@/components/Pagination'
+import { getAuditRecordList, deleteAuditRecord } from '@/api/trials'
+import dataForm from "./dataForm.vue"
+import document from "./document.vue"
+import userList from './userList'
+import baseModel from '@/components/BaseModel'
+import BaseContainer from '@/components/BaseContainer'
+const searchDataDefault = () => {
+    return {
+        CompanyName: '',
+        AuditContent: "",
+        AuditType: "",
+        IdentityUserName: '',
+        BeginAuditTime: '',
+        EndAuditTime: '',
+        BeginTime: '',
+        EndTime: '',
+        BeginCreateTime: '',
+        EndCreateTime: '',
+        PageIndex: 1,
+        PageSize: 20,
+        Asc: false,
+        SortField: ''
+    }
+}
+export default {
+    name: "inspectionManagement",
+    components: { Pagination, dataForm, document, userList, baseModel, BaseContainer },
+    data() {
+        return {
+            searchData: searchDataDefault(),
+            total: 0,
+            Id: null,
+            loading: false,
+            tableData: [],
+            auditTime: [],
+            viewTime: [],
+            createTime: [],
+
+            visible: false, // 属性详情弹框
+
+            rowData: {},
+            fromVisible: false,
+            state: 'add',
+
+            docVisible: false,
+            isAudit: false,
+            AuditRecordId: null,
+
+            config: {
+                visible: false,
+                title: this.$t('trials:trials-workbench:inspectionManagement:dialogTitle:selectUser'),
+                width: '1200px',
+            },
+            isView: false,
+
+        }
+    },
+    created() {
+        this.getList()
+    },
+    methods: {
+        async del(row) {
+            try {
+                let confirm = await this.$confirm(this.$t("trials:trials-workbench:inspectionManagement:confirm:del"))
+                if (!confirm) return false
+                this.loading = true
+                let res = await deleteAuditRecord(row.Id)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.getList()
+                    this.$message.success(this.$t("common:message:deletedSuccessfully"))
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        close() {
+            this.config.visible = false
+        },
+        openUserList(isView = false, row) {
+            this.isView = isView
+            this.AuditRecordId = row.Id
+            this.config.visible = true
+        },
+        openDoc(isAudit = false, row) {
+            this.AuditRecordId = row.Id
+            this.isAudit = isAudit
+            this.docVisible = true
+        },
+        openForm(state, row) {
+            this.rowData = Object.assign({}, row)
+            this.state = state
+            this.fromVisible = true
+        },
+        async getList() {
+            try {
+                if (Array.isArray(this.auditTime) && this.auditTime.length === 2) {
+                    this.searchData.BeginAuditTime = this.auditTime[0]
+                    this.searchData.EndAuditTime = this.auditTime[1]
+                } else {
+                    this.searchData.BeginAuditTime = ''
+                    this.searchData.EndAuditTime = ''
+                }
+                if (Array.isArray(this.viewTime) && this.viewTime.length === 2) {
+                    this.searchData.BeginTime = this.viewTime[0]
+                    this.searchData.EndTime = this.viewTime[1]
+                } else {
+                    this.searchData.BeginTime = ''
+                    this.searchData.EndTime = ''
+                }
+                if (Array.isArray(this.createTime) && this.createTime.length === 2) {
+                    this.searchData.BeginCreateTime = this.createTime[0]
+                    this.searchData.EndCreateTime = this.createTime[1]
+                } else {
+                    this.searchData.BeginCreateTime = ''
+                    this.searchData.EndCreateTime = ''
+                }
+                this.loading = true
+                let res = await getAuditRecordList(this.searchData)
+                this.loading = false
+                if (res.IsSuccess) {
+                    this.tableData = res.Result.CurrentPageData
+                    this.total = res.Result.TotalCount
+                }
+            } catch (err) {
+                this.loading = false
+                console.log(err)
+            }
+        },
+        handleReset() {
+            this.searchData = searchDataDefault()
+            this.auditTime = []
+            this.viewTime = []
+            this.createTime = []
+            this.getList()
+        },
+        handleSearch() {
+            this.getList()
+        },
+        // 排序
+        handleSortChange(column) {
+            if (column.order === 'ascending') {
+                this.searchData.Asc = true
+            } else {
+                this.searchData.Asc = false
+            }
+            this.searchData.SortField = column.prop
+            this.searchData.PageIndex = 1
+            this.getList()
+        },
+    }
+}
+</script>
+<style lang="scss" scoped></style>

src/views/trials/trials-workbench/components/inspectionManagement/userList.vue

@@ -0,0 +1,229 @@
+<template>
+  <el-container class="participant-container">
+    <el-header style="height: 50px">
+      <div class="filter-container">
+        <!-- 姓名 -->
+        <span>{{ $t('trials:staff:table:name') }}:</span>
+        <el-input v-model="listQuery.RealName" size="mini" class="mr" clearable />
+        <!-- 用户名 -->
+        <span>{{ $t('trials:staff:table:uid') }}:</span>
+        <el-input v-model="listQuery.UserName" size="mini" class="mr" clearable />
+        <!-- 单位 -->
+        <span>{{ $t('trials:staff:table:organization') }}:</span>
+        <el-input v-model="listQuery.OrganizationName" size="mini" class="mr" clearable />
+        <!-- 是否加入 -->
+        <template v-if="!isView">
+          <span>{{ $t('trials:staff:table:Join') }}:</span>
+          <el-select v-model="listQuery.IsAuditRecordUserSelect" placeholder="" size="mini" class="mr" clearable>
+            <el-option v-for="item in $d.IsJoin" :key="item.id" :label="item.label" :value="item.value">
+            </el-option>
+          </el-select>
+        </template>
+        <!-- 用户类型 -->
+        <!-- <span>{{ $t('trials:staff:table:userType') }}:</span>
+        <el-select v-model="listQuery.UserTypeEnum" size="mini" clearable class="mr">
+          <el-option v-for="item of userTypeOptions" :key="item.Id" :label="item.UserTypeShortName"
+            :value="item.UserTypeEnum">
+            <span>{{ item.UserType }}</span>
+          </el-option>
+        </el-select> -->
+        <!-- 查询 -->
+        <el-button type="primary" size="mini" icon="el-icon-search" @click="handleSearch">
+          {{ $t('common:button:search') }}
+        </el-button>
+        <!-- 重置 -->
+        <el-button size="mini" type="primary" icon="el-icon-refresh-left" @click="handleReset">
+          {{ $t('common:button:reset') }}
+        </el-button>
+
+        <!-- <el-button type="primary" size="mini" style="margin-left: auto" :disabled="selectArr.length === 0"
+          :loading="assignLoadStatus" icon="el-icon-plus" @click="handleAssign">
+          {{ $t('common:button:add') }}
+        </el-button> -->
+      </div>
+    </el-header>
+    <el-main>
+      <div class="data-table">
+        <el-table :data="list" stripe height="400px" class="participant-table-list"
+          @selection-change="handleSelectChange" @sort-change="handleSortByColumn">
+          <!-- <el-table-column type="selection" width="50" /> -->
+          <el-table-column type="index" width="50" />
+          <!-- 姓名 -->
+          <el-table-column prop="FullName" :label="$t('trials:staff:table:name')" show-overflow-tooltip
+            sortable="custom" min-width="100" />
+          <!-- 用户名 -->
+          <el-table-column prop="UserName" :label="$t('trials:staff:table:uid')" show-overflow-tooltip sortable="custom"
+            min-width="100" />
+          <!-- 电话 -->
+          <el-table-column prop="Phone" :label="$t('trials:staff:table:phone')" show-overflow-tooltip sortable="custom"
+            min-width="120" />
+          <!-- 邮箱 -->
+          <el-table-column prop="EMail" :label="$t('trials:staff:table:email')" show-overflow-tooltip sortable="custom"
+            min-width="120" />
+          <!-- 单位 -->
+          <el-table-column prop="OrganizationName" :label="$t('trials:staff:table:organization')" show-overflow-tooltip
+            min-width="100" sortable="custom" />
+          <!-- 用户类型 -->
+          <!-- <el-table-column prop="UserTypeShortName" :label="$t('trials:staff:table:userType')" show-overflow-tooltip
+            sortable="custom" min-width="100" /> -->
+          <el-table-column prop="IsAuditRecordUserSelect" :label="$t('trials:staff:table:Join')" show-overflow-tooltip>
+            <template slot-scope="scope">
+              <span>{{ $fd('IsJoin', scope.row.IsAuditRecordUserSelect) }}</span>
+            </template>
+          </el-table-column>
+          <el-table-column :label="$t('common:action:action')" width="120" align="left" fixed="right">
+            <template slot-scope="scope">
+              <el-button type="text" @click="changeUser(true, scope.row)" :disabled="scope.row.IsAuditRecordUserSelect">
+                {{ $t('trials:trials-workbench:inspectionManagement:button:join') }}
+              </el-button>
+              <el-button type="text" @click="changeUser(false, scope.row)"
+                :disabled="!scope.row.IsAuditRecordUserSelect">
+                {{ $t('trials:trials-workbench:inspectionManagement:button:Exit') }}
+              </el-button>
+            </template>
+          </el-table-column>
+        </el-table>
+      </div>
+    </el-main>
+    <div class="pagination" style="text-align: right; margin-top: 5px">
+      <pagination :total="total" :page.sync="listQuery.PageIndex" :limit.sync="listQuery.PageSize"
+        @pagination="getList" />
+    </div>
+  </el-container>
+</template>
+<script>
+import { getUserList } from '@/api/admin'
+import { addOrDeleteAuditRecordUser } from '@/api/trials'
+import Pagination from '@/components/Pagination'
+const getListQueryDefault = () => {
+  return {
+    RealName: '',
+    UserName: '',
+    OrganizationName: '',
+    IsAuditRecordUserSelect: null,
+    UserTypeEnum: '16',
+    PageIndex: 1,
+    PageSize: 20,
+  }
+}
+export default {
+  components: { Pagination },
+  props: {
+    AuditRecordId: {
+      type: String,
+      default: ''
+    },
+    isView: {
+      type: Boolean,
+      default: false
+    }
+  },
+  data() {
+    return {
+      list: [],
+      total: 0,
+      listQuery: getListQueryDefault(),
+      selectArr: [],
+      assignLoadStatus: false,
+      // isAdmin: JSON.parse(zzSessionStorage.getItem('IsAdmin')),
+      userTypeOptions: [],
+      trialId: '',
+    }
+  },
+  mounted() {
+    this.getList()
+  },
+  methods: {
+    async changeUser(IsAdd = true, row) {
+      try {
+        let data = {
+          AuditRecordId: this.AuditRecordId,
+          IsAdd,
+          identityUserIdList: [row.Id]
+        }
+        let res = await addOrDeleteAuditRecordUser(data)
+        if (res.IsSuccess) {
+          this.getList()
+          this.$emit("getList")
+        }
+      } catch (err) {
+        console.log(err)
+      }
+    },
+    getList() {
+      const loading = this.$loading({
+        target: document.querySelector('.participant-table-list'),
+        fullscreen: false,
+        lock: true,
+      })
+      this.listQuery.UserState = 1
+      this.listQuery.AuditRecordId = this.AuditRecordId
+      if (this.isView) this.listQuery.IsAuditRecordUserSelect = true
+      getUserList(this.listQuery)
+        .then((res) => {
+          loading.close()
+          this.list = res.Result.CurrentPageData
+          this.total = res.Result.TotalCount
+        })
+        .catch(() => {
+          loading.close()
+        })
+    },
+    handleAssign() {
+      this.$emit('add', this.selectArr)
+    },
+    handleSearch() {
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+    handleReset() {
+      this.listQuery = getListQueryDefault()
+      if (this.isView) this.listQuery.IsAuditRecordUserSelect = true
+      this.getList()
+    },
+    handleSelectChange(val) {
+      this.selectArr = val
+    },
+    handleSortByColumn(column) {
+      if (column.order === 'ascending') {
+        this.listQuery.Asc = true
+      } else {
+        this.listQuery.Asc = false
+      }
+      this.listQuery.SortField = column.prop
+      this.listQuery.PageIndex = 1
+      this.getList()
+    },
+  },
+}
+</script>
+<style lang="scss" scoped>
+.participant-container {
+  height: 100%;
+
+  .el-header {
+    .filter-container {
+      display: flex;
+      align-items: center;
+
+      span {
+        font-size: 13px;
+        margin-right: 5px;
+      }
+
+      .mr {
+        margin-right: 5px;
+        width: 120px;
+      }
+    }
+  }
+
+  .el-main {
+    padding: 0px;
+  }
+
+  .el-footer {
+    padding: 0 20px;
+  }
+}
+</style>

src/views/trials/trials-workbench/index.vue

@@ -365,6 +365,15 @@
                     <span class="my_select_box_content_text">{{ $t('trials:tab:updateAuditDocument') }}</span>
                   </div>
                 </div>
+                <!-- 稽查管理 -->
+                <div class="my_select_box" :class="{ selected: selected === 'inspectionManagement' }"
+                  tab-data="updateAuditDocument" @click="handleClick('inspectionManagement')"
+                  v-if="hasPermi(['trials:trials-workbench:inspectionManagement'])">
+                  <div class="my_select_box_content">
+                    <span class="el-icon-folder-checked" style="padding: 4px;margin: 4px;color: #6698ff"></span>
+                    <span class="my_select_box_content_text">{{ $t('trials:tab:inspectionManagement') }}</span>
+                  </div>
+                </div>
               </div>
             </template>
           </div>
@@ -443,11 +452,13 @@
         <!--通用培训记录-->
         <generalTraining v-if="selected === 'viewGeneralTraining'" :isManage="false" />
         <!--稽查文档-->
-        <auditDocument v-if="selected === 'viewAuditDocument'" :isManage="false" />
+        <auditDocumentView v-if="selected === 'viewAuditDocument'" :isManage="false" />
         <!--培训课程管理-->
         <generalTraining v-if="selected === 'updateGeneralTraining'" :isManage="true" />
         <!--稽查文档管理-->
         <auditDocument v-if="selected === 'updateAuditDocument'" :isManage="true" />
+        <!--稽查管理-->
+        <inspectionManagement v-if="selected === 'inspectionManagement'" />
       </div>
       <!--        <div v-show="false" style="height: 100%;position: relative">-->
       <!--          <div style="font-weight:900;font-size: 20px;position: absolute;line-height: 60px;text-align: left;white-space: nowrap;padding-left: 20px" :style="{width: width + 'px'}">-->
@@ -570,8 +581,10 @@ import MedicalFeedback from './components/medicalFeedback'
 import MedicalAudit from './components/medicalAudit'
 import NeedSignedTrialDoc from './components/NeedSignedTrialDoc'
 import auditDocument from "./components/auditDocument"
+import auditDocumentView from "./components/auditDocument/view"
 import generalTraining from "./components/generalTraining"
 import ReuploadAudit from "./components/ReuploadAudit"
+import inspectionManagement from "./components/inspectionManagement"
 import store from '@/store'
 import './index.css'
 
@@ -583,7 +596,9 @@ export default {
   name: 'WorkBench',
   components: {
     auditDocument,
+    auditDocumentView,
     generalTraining,
+    inspectionManagement,
     clinicalDataConfirm,
     clinicalDataPM,
     PanelCount,