后处理上传检查部位修改

src/components/uploadDicomAndNonedicom/nonedicomFile.vue

@@ -18,7 +18,9 @@
       <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">
+        <span>{{ getBodyPart(scope.row.BodyPart, scope.row.BodyPartForEditOther) }}</span>
+      </el-table-column>
       <!--原文件数-->
       <el-table-column prop="FileCount" :label="$t('upload:nonedicom:table:fileCount')">
         <template slot-scope="scope">
@@ -262,6 +264,7 @@ export default {
       currentRow: {},
       studyMonitorId: null,
       open: null,
+      BodyPart: {}
     }
   },
   watch: {
@@ -289,8 +292,9 @@ export default {
       store.dispatch('trials/setUnLock', this.btnLoading)
     },
   },
-  created() {
+  async created() {
     this.getList()
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
   },
   beforeDestroy() {
     store.dispatch('trials/setUnLock', false)
@@ -674,6 +678,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,28 +4,15 @@
       <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>{{
                 $fd(
@@ -39,83 +26,35 @@
             </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 +63,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>
@@ -235,8 +152,12 @@ export default {
         ],
       },
       loading: false,
+      BodyPart: {}
     }
   },
+  async created() {
+    this.BodyPart.Bodypart = await this.$getBodyPart(this.$route.query.trialId)
+  },
   methods: {
     // 预览
     preview(row) {
@@ -283,8 +204,27 @@ 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)
+      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>