优化会诊提示等

src/components/hui-zhen-da-ying/PrintTheConsultationForm.vue

@@ -1,5 +1,8 @@
 <template>
-  <el-button @click="printClick" v-if="props.showPrintButton">打印</el-button>
+  <el-button @click="printClick"
+             v-if="props.showPrintButton">
+    打印
+  </el-button>
   <div style="width: 595.275pt;  height: 841.89pt;  font-size: 6.75pt;
    border: 0.75pt solid" ref="divRef">
     <div style="margin-left: 20mm; ">
@@ -117,7 +120,6 @@
       </div>
     </div>
   </div>
-
 </template>
 
 <script setup>

src/components/zhu-yuan-yi-sheng/emr/auxiliary-tools/EmrTestV2/ResultTable.vue

@@ -52,11 +52,19 @@ function getItemStr(val, strValue, value) {
 }
 
 const selectedData = () => {
+
+  function danger(item: Measurement): string {
+    if (item.critical_exec_flag === 1) {
+      return '危'
+    }
+    return ''
+  }
+
   const temp = mainTableRef.value.getSelectionRows() as Measurement[];
   let data = ''
   if (temp) {
     XEUtils.arrayEach(temp, (item: Measurement) => {
-      data += `${item.itm_name}:${result(item)} ${item.itm_unit} ${getItemStr(item.itm_alert, item.itm_str_value, item.itm_value)}，`
+      data += `${item.itm_name}${danger(item)}:${result(item)} ${item.itm_unit} ${getItemStr(item.itm_alert, item.itm_str_value, item.itm_value)}，`
     })
   }
   return {

src/utils/request.js

@@ -51,7 +51,6 @@ service.interceptors.request.use(
 
 service.interceptors.response.use(
     (response) => {
-
         endLoading()
         store.commit('app/closeButton', true)
         if (response.data.code === 200 || response.data.code === 0) {

src/views/hospitalization/zhu-yuan-yi-sheng/hui-zhen/HuiZhenShenQing.vue

@@ -1,17 +1,20 @@
 <template>
   <div style="display: flex">
     <div>
-      <el-button icon="Search" type="primary" @click="chaKanHuiZhenShenQingClick">会诊查询</el-button>
-      <el-button icon="Plus" type="success" @click="dianJiHuiZhenShenQing">会诊申请</el-button>
+      <el-button icon="Search" type="primary" @click="chaKanHuiZhenShenQingClick">查询</el-button>
+      <el-button icon="Plus" type="success" @click="dianJiHuiZhenShenQing">申请</el-button>
       <div style="width: 400px">
+        <el-alert title="不需要会诊，表格中点击删除，会退费、撤销医嘱、删除会诊（已完成的无法删除）"
+                  type="warning"
+                  ref="alertRef"/>
         <xc-table
-            :final-height="yzSize.h  -  50"
+            :final-height="tableHeight"
             :local-data="chaKanHuiZhenList"
             @rowClick="chaKanHuiZhenDan"
             layout='total, prev,  next'>
-          <el-table-column label="申请时间" prop="inputDate" width="70">
+          <el-table-column label="申请时间" prop="inputDate">
             <template #default="scope">
-              {{ scope.row.inputDate + '_' + scope.row.reqTimes }}
+              <div v-html=" dateBr(scope.row.inputDate) + '_' + scope.row.reqTimes"></div>
             </template>
           </el-table-column>
           <el-table-column label="科室" prop="deptName"></el-table-column>
@@ -27,7 +30,7 @@
             </template>
           </el-table-column>
           <el-table-column label="接受意见" prop="hzComment" show-overflow-tooltip></el-table-column>
-          <el-table-column fixed="left" label="操作" width="50">
+          <el-table-column fixed="left" label="操作" width="55">
             <template #default="scope">
               <el-popconfirm
                   cancel-button-text="取消"
@@ -35,15 +38,13 @@
                   icon="InfoFilled"
                   icon-color="red"
                   title="确定要删除吗？"
-                  @confirm="shanChuHuiZhenShenQingClick(scope.$index, scope.row)"
-              >
+                  @confirm="shanChuHuiZhenShenQingClick(scope.$index, scope.row)">
                 <template #reference>
                   <el-button :disabled="scope.row.statusFlag === '2'"
-                             title="删除"
-                             circle
                              @click.stop.prevent
-                             icon="Delete"
-                             type="danger"/>
+                             type="danger">
+                    删除
+                  </el-button>
                 </template>
               </el-popconfirm>
             </template>
@@ -59,7 +60,9 @@
                @tab-remove="tabRemove">
         <el-tab-pane label="会诊详情"
                      :name="0">
-          <print-the-consultation-form ref="daYingHuiZhenRef" :lai-yuan="2"/>
+          <div style="overflow: auto;width: max-content" :style="{height: yzSize.h - 100 +'px'}">
+            <print-the-consultation-form ref="daYingHuiZhenRef" :lai-yuan="2"/>
+          </div>
         </el-tab-pane>
         <el-tab-pane :name="1"
                      label="添加会诊申请"
@@ -71,31 +74,33 @@
   </div>
 
 </template>
-<script setup name="HuiZhenShenQing">
+<script setup name="HuiZhenShenQing" lang="ts">
 import TianJiaHuiZhenShenQing from '@/components/zhu-yuan-yi-sheng/hui-zhen-shen-qing/TianJiaHuiZhenShenQing.vue'
 import {computed, onActivated, ref, watch} from 'vue'
 import {chaKanHuiZhenShenQing, shanChuHuiZhenShenQing} from '@/api/case-front-sheet'
 import {
   consultationApplication,
-  huanZheXinXi, jsQueryYzData,
-  youWuXuanZheHuanZhe, yzHeaderSize, yzSize
+  huanZheXinXi,
+  jsQueryYzData,
+  youWuXuanZheHuanZhe,
+  yzSize
 } from '@/views/hospitalization/zhu-yuan-yi-sheng/public-js/zhu-yuan-yi-sheng'
-import store from '@/store'
 import {getHuanZheXinXi} from '@/api/case-front-sheet/jie-shou-hui-zhen'
 import XcTable from "@/components/xiao-chan/xc-table/XcTable";
 import {BizException, ExceptionEnum} from "@/utils/BizException";
 import PrintTheConsultationForm from "@/components/hui-zhen-da-ying/PrintTheConsultationForm.vue";
-import {getWindowSize} from "@/utils/window-size";
-
-const windowSize = computed(() => {
-  return store.state.app.windowSize
-})
-
+import {dateBr} from "@/utils/moment-utils";
+import {useCompRef} from "@/utils/useCompRef";
+import {ElAlert} from "element-plus";
 
 const chaKanHuiZhenList = ref([])
-
+const alertRef = useCompRef(ElAlert)
 const tabs = ref(0)
 
+const tableHeight = computed(() => {
+  return yzSize.value.h - 60 - (alertRef.value?.$el?.clientHeight || 0)
+})
+
 const chaKanHuiZhenShenQingClick = () => {
   if (youWuXuanZheHuanZhe()) return
   chaKanHuiZhenShenQing(huanZheXinXi.value.inpatientNo, huanZheXinXi.value.admissTimes).then((res) => {