【实时报告】受试者页面发送实时报告，阅片标准未显示，发送报告时报错

src/views/trials/trials-panel/subject/subject-list/components/MessageTable.vue

@@ -1,89 +1,50 @@
 <template>
   <BaseContainer>
     <template slot="main-container">
-      <el-table
+      <el-table ref="emailList" v-loading="loading" :data="list" stripe @sort-change="handleSortChange">
-        ref="emailList"
-        v-loading="loading"
-        :data="list"
-        stripe
-        @sort-change="handleSortChange"
-      >
         <el-table-column type="index" width="40" />
-        <el-table-column
+        <el-table-column prop="TrialReadingCriterionId" :label="$t('trials:reviewTrack:table:criterionName')"
-          prop="TrialReadingCriterionId"
+          show-overflow-tooltip width="100">
-          :label="$t('trials:reviewTrack:table:criterionName')"
-          show-overflow-tooltip
-          width="100"
-        >
           <template slot-scope="scope">
-            {{ scope.row.TrialCriterionName }}
+            {{ $fd("CriterionType", scope.row.CriterionType) }}
           </template>
         </el-table-column>
         <!-- 业务场景 -->
-        <el-table-column
+        <el-table-column prop="BusinessScenarioEnum" :label="$t('trials:emailManageCfg:title:businessScenario')"
-          prop="BusinessScenarioEnum"
+          show-overflow-tooltip width="100">
-          :label="$t('trials:emailManageCfg:title:businessScenario')"
-          show-overflow-tooltip
-          width="100"
-        >
           <template slot-scope="scope">
             {{ $fd('Common_File_BusinessScenario', scope.row.BusinessScenarioEnum) }}
           </template>
         </el-table-column>
-        <el-table-column
+        <el-table-column prop="ToUserTypeList" :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          prop="ToUserTypeList"
+          show-overflow-tooltip width="100">
-          :label="$t('trials:emailManageCfg:title:toUserTypeList')"
-          show-overflow-tooltip
-          width="100"
-        >
           <template slot-scope="scope">
             {{ scope.row.ToUserTypeNameList.length > 0 ? scope.row.ToUserTypeNameList.join('、') : '' }}
           </template>
         </el-table-column>
         <!-- 抄送人 -->
-        <el-table-column
+        <el-table-column prop="CopyUserTypeList" :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          prop="CopyUserTypeList"
+          show-overflow-tooltip width="100">
-          :label="$t('trials:emailManageCfg:title:copyUserTypeList')"
-          show-overflow-tooltip
-          width="100"
-        >
           <template slot-scope="scope">
             {{ scope.row.CopyUserTypeNameList.length > 0 ? scope.row.CopyUserTypeNameList.join('、') : '' }}
           </template>
         </el-table-column>
         <!-- 附件 -->
-        <el-table-column
+        <el-table-column prop="FileName" :label="$t('trials:subject:title:report')" show-overflow-tooltip
-          prop="FileName"
+          min-width="120">
-          :label="$t('trials:subject:title:report')"
-          show-overflow-tooltip
-          min-width="120"
-        >
           <template slot-scope="scope">
-            <el-button
+            <el-button icon="el-icon-view" :disabled="!scope.row.fileInfo" circle
-              icon="el-icon-view"
-              :disabled="!scope.row.fileInfo"
-              circle
               :title="$t('trials:uploadedDicoms:action:preview')"
-              @click="handlePreview(scope.row.fileInfo.RelativePath)"
+              @click="handlePreview(scope.row.fileInfo.RelativePath)" />
-            />
+            <el-button icon="el-icon-pie-chart" circle :title="$t('trials:subject:title:addReport')"
-            <el-button
+              @click="handleGenerate(scope.row)" />
-              icon="el-icon-pie-chart"
-              circle
-              :title="$t('trials:subject:title:addReport')"
-              @click="handleGenerate(scope.row)"
-            />
           </template>
         </el-table-column>
         <el-table-column :label="$t('common:action:action')" width="80px" fixed="right">
           <template slot-scope="scope">
             <!-- 编辑 -->
-            <el-button
+            <el-button icon="el-icon-message" :disabled="!scope.row.fileInfo" circle
-              icon="el-icon-message"
+              :title="$t('trials:subject:title:send')" @click="sendEmail(scope.row)" />
-              :disabled="!scope.row.fileInfo"
-              circle
-              :title="$t('trials:subject:title:send')"
-              @click="sendEmail(scope.row)"
-            />
           </template>
         </el-table-column>
       </el-table>
@@ -156,6 +117,7 @@ export default {
       manualGenerateEmailFile({
         SubjectId: this.data.Id,
         TrialReadingCriterionId: row.TrialReadingCriterionId,
+        CriterionType: row.CriterionType,
         BusinessScenarioEnum: row.BusinessScenarioEnum
       }).then(res => {
         this.loading = false
@@ -182,7 +144,17 @@ export default {
           item.ToUserTypeNameList = this.getUserTypeName(item.ToUserTypeList)
           item.CopyUserTypeNameList = this.getUserTypeName(item.CopyUserTypeList)
         })
-        this.list = res.Result
+        let list = []
+        res.Result.forEach(item => {
+          if (Array.isArray(item.CriterionTypeList) && item.CriterionTypeList.length > 0) {
+            item.CriterionTypeList.forEach(CriterionType => {
+              let obj = Object.assign({}, item)
+              obj.CriterionType = CriterionType
+              list.push(obj)
+            })
+          }
+        })
+        this.list = list
       }).catch(() => {
         this.loading = false
       })