优化

src/views/hospitalization/adverse-event/FillAderverseEvent.vue

@@ -150,7 +150,7 @@ function validateReport(val) {
     return '请选择发生科室！'
   }
   if (val.eventResult == null) {
-    return '请选择不良后果！'
+    return '请选择损害程度！'
   }
   if (!val.course) {
     return '请填写事件经过！';

src/views/hospitalization/adverse-event/component/EventEditor.vue

@@ -47,7 +47,7 @@
     <el-col :span="12">
       <el-row :gutter="5">
         <el-col :span="24">
-          <el-tag type="info">不良后果：</el-tag>
+          <el-tag type="info">损害程度：</el-tag>
           <el-select v-model="report.eventResult" placeholder="请选择" style="width: 100%">
             <el-option
                 v-for="item in dict.eventResult"

src/views/hospitalization/adverse-event/component/EventPrinter.vue

@@ -14,12 +14,10 @@
       <td style="width: 120px">{{ report.department }}</td>
     </tr>
     <tr>
-      <th>不良后果</th>
-      <td>{{ dict.eventResult[report.eventResult]?.label }}</td>
       <th colspan="2">姓名/工号</th>
-      <td>{{ report.userName }}/{{ report.userId }}</td>
+      <td colspan="2">{{ report.userName }}/{{ report.userId }}</td>
       <th>职称</th>
-      <td>{{ report.userLevel }}</td>
+      <td colspan="2">{{ report.userLevel }}</td>
       <th>工龄</th>
       <td>{{ report.workYear }}</td>
     </tr>
@@ -69,7 +67,9 @@
 
     <tr>
       <th colspan="2">事件等级</th>
-      <td colspan="7" style="text-align: left;padding-left: 10px;">{{ dict.eventLevel[report.eventLevel]?.label }}</td>
+      <td colspan="3" style="text-align: left;padding-left: 10px;">{{ dict.eventLevel[report.eventLevel]?.label }}</td>
+      <th colspan="2">损害程度</th>
+      <td colspan="2">{{ dict.eventResult[report.eventResult]?.label }}</td>
     </tr>
     <tr>
       <th rowspan="2" colspan="2">科室处理意见</th>
@@ -79,19 +79,6 @@
     <tr>
       <td colspan="2">处理时间：{{ report.deptDealTime }}</td>
     </tr>
-
-<!--    <tr>-->
-<!--      <th rowspan="3" colspan="2">科室处理意见</th>-->
-<!--      <td rowspan="3" colspan="5" style="text-align: left;padding-left: 10px;">{{ report.deptDealing }}</td>-->
-<!--      <td colspan="2">事件等级：{{ dict.eventLevel[report.eventLevel]?.label }}</td>-->
-<!--    </tr>-->
-<!--    <tr>-->
-<!--      <td colspan="2">处理人：{{ report.deptDealerName }}</td>-->
-<!--    </tr>-->
-<!--    <tr>-->
-<!--      <td colspan="2">处理时间：{{ report.deptDealTime }}</td>-->
-<!--    </tr>-->
-
     <tr>
       <th rowspan="2" colspan="2">护理部处理意见</th>
       <td rowspan="2" colspan="5" style="text-align: left;padding-left: 10px;">{{ report.finalDealing }}</td>
@@ -104,8 +91,8 @@
     <tr>
       <th rowspan="2" colspan="2">整改效果反馈</th>
       <td rowspan="2" colspan="5" style="text-align: left;padding-left: 10px;">
-        <span v-for="item in report.feedbackList">
-          {{dict.eventFeedback[item]?.name}}；
+        <span v-for="(item,index) in report.feedbackList">
+          {{index+1}}.{{dict.eventFeedback[item]?.name}}；
         </span>
       </td>
       <td colspan="2">反馈人：{{ report.feedbackStaffName }}</td>

src/views/hospitalization/adverse-event/component/EventViewer.vue

@@ -5,7 +5,7 @@
       <span style="margin-left: 20px;color: #8f8f8f">发生时间：</span>{{ report.occurDatetime }}
     </div>
     <div class="report-column-div">
-      <span style="color: #8f8f8f">不良后果：</span>
+      <span style="color: #8f8f8f">损害程度：</span>
       {{dict.eventResult[report.eventResult]?.name}}
     </div>
     <el-tag style="margin-top: 12px">提交人信息</el-tag>