From 9d486af9750b555e669e515aef5bfc06c6e64cc3 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Fri, 24 Oct 2025 15:23:13 +0800
Subject: [PATCH] =?UTF-8?q?=E5=85=AC=E5=85=B1=E6=A0=B7=E5=BC=8F=E6=9B=B4?=
 =?UTF-8?q?=E6=94=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/ruoyi.scss                  | 20 ++++++++
 src/views/checkCode/index.vue                 | 50 +++++++++----------
 src/views/checkCode/report/index.vue          | 18 +++----
 .../liswork/work/components/labpatlist.vue    | 44 +++++++++-------
 .../liswork/work/components/labresult.vue     | 19 ++++---
 src/views/liswork/work/index.vue              |  1 +
 src/views/liswork/work/others/index.vue       |  2 +-
 .../liswork/work/reexamination/index.vue      | 15 +++++-
 8 files changed, 105 insertions(+), 64 deletions(-)

diff --git a/src/assets/styles/ruoyi.scss b/src/assets/styles/ruoyi.scss
index ee15270..f9754e7 100644
--- a/src/assets/styles/ruoyi.scss
+++ b/src/assets/styles/ruoyi.scss
@@ -156,6 +156,18 @@
      min-width: 0;
    }
 
+   .el-table__body-wrapper .el-table-column--selection>.cell {
+     padding: 0 !important;
+   }
+
+   .cell.el-tooltip {
+     padding: 0 !important;
+   }
+
+   .el-table-header-cell .cell {
+     padding: 0 !important;
+   }
+
    .el-table__cell {
      padding: 0 !important;
    }
@@ -256,6 +268,14 @@
      border-color: #1F6DD3 !important;
    }
 
+   .vxe-table--render-default.is--padding .vxe-body--column .vxe-cell {
+     padding: 0 !important;
+   }
+
+   .vxe-table--render-default .vxe-header--column .vxe-cell {
+     padding: 0 !important;
+   }
+
    .vxe-table--render-default .vxe-body--column {
      height: 23px !important;
      line-height: 23px !important;
diff --git a/src/views/checkCode/index.vue b/src/views/checkCode/index.vue
index 866cf7d..429e759 100644
--- a/src/views/checkCode/index.vue
+++ b/src/views/checkCode/index.vue
@@ -82,7 +82,7 @@
             <svg-icon v-else icon-class="hongcha" />
           </template>
           <template #jzbz="{ row }">
-            {{ row.jzbz == '1' ? '急诊' : '非急诊' }}
+            {{ row.jzbz == '1' ? '急' : '' }}
           </template>
           <template #jjzt="{ row }">
             {{ row.jjzt == '1' ? '计价' : '无' }}
@@ -251,26 +251,26 @@ const tableData = ref([])
 const columns = ref([
   { type: 'selection', visible: true, align: 'center', width: 40, label: '多选框' },
   // { type: 'index', visible: true, align: 'center', width: 60, label: '序号' },
-  { prop: 'zt', label: '打印', visible: true, align: 'center', slot: 'dy', width: 60 },
-  { prop: 'ch', label: '床号', visible: true, align: 'center', sortable: true, },
-  { prop: 'brxm', label: '姓名', align: 'center', visible: true, },
-  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 60 },
-  { prop: 'jymd', label: '项目名称', align: 'center', visible: true, width: '140px' },
-  { prop: 'bgddhname', label: '类别', align: 'center', visible: true, width: '120px' },
-  { prop: 'sampletips', label: '采样提示', align: 'center', visible: true, width: '110px' },
-  { prop: 'jzbz', label: '急诊', align: 'center', visible: true, slot: 'jzbz', width: '110px' },
-  { prop: 'yblx', label: '样本类型', align: 'center', visible: true, width: '110px' },
-  { prop: 'brdh', label: '病人号', align: 'center', visible: true, width: '110px' },
-  { prop: 'ksname', label: '科室名称', align: 'center', visible: true, width: '110px' },
-  { prop: 'sqh', label: '申请号/条码', align: 'center', visible: true, width: '110px' },
-  { prop: 'zt', label: '状态', align: 'center', visible: true, slot: 'zt', width: '110px' },
-  { prop: 'brly', label: '病人来源', align: 'center', visible: true, slot: 'brly', width: '110px' },
-  { prop: 'sqysname', label: '申请医生', align: 'center', visible: true, width: '110px' },
-  { prop: 'sqsj', label: '申请时间', align: 'center', visible: true, width: '170px' },
-  { prop: 'jjzt', label: '计价标志', align: 'center', visible: true, slot: 'jjzt', },
-  { prop: 'zxysname', label: '执行医生', align: 'center', visible: true, },
-  { prop: 'bbsjrname', label: '送检人', align: 'center', visible: true, },
-  { prop: 'yljg', label: '医疗机构', align: 'center', visible: true, slot: 'yljg', width: '170px' },
+  { prop: 'zt', label: '印', visible: true, align: 'center', slot: 'dy', width: 20 },
+  { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 20 },
+  { prop: 'ch', label: '床号', visible: true, align: 'center', width: 30 },//sortable: true,
+  { prop: 'brxm', label: '姓名', align: 'center', visible: true, width: 40 },
+  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 30 },
+  { prop: 'jymd', label: '项目名称', visible: true, width: 130 },
+  { prop: 'bgddhname', label: '类别', align: 'center', visible: true, width: 80 },
+  { prop: 'sampletips', label: '采样提示', align: 'center', visible: true, width: 60 },
+  { prop: 'yblx', label: '样本类型', align: 'center', visible: true, width: 60 },
+  { prop: 'brdh', label: '病人号', align: 'center', visible: true, width: 90 },
+  { prop: 'ksname', label: '科室名称', align: 'center', visible: true, width: 100 },
+  { prop: 'sqh', label: '申请号/条码', align: 'center', visible: true, width: 100 },
+  { prop: 'zt', label: '状态', align: 'center', visible: true, slot: 'zt', width: 40 },
+  { prop: 'brly', label: '病人来源', align: 'center', visible: true, slot: 'brly', width: 60 },
+  { prop: 'sqysname', label: '申请医生', align: 'center', visible: true, width: 60 },
+  { prop: 'sqsj', label: '申请时间', align: 'center', visible: true, width: 150 },
+  { prop: 'jjzt', label: '计价标志', align: 'center', visible: true, slot: 'jjzt', width: 60 },
+  { prop: 'zxysname', label: '执行医生', align: 'center', visible: true, width: 60 },
+  { prop: 'bbsjrname', label: '送检人', align: 'center', visible: true, width: 50 },
+  { prop: 'yljg', label: '医疗机构', align: 'center', visible: true, slot: 'yljg', width: 150 },
 ])
 
 const single = ref(true);
@@ -284,7 +284,7 @@ const cellStyleHd = ({ row, column, rowIndex, columnIndex }: {
   columnIndex: number;
 }) => {
   // console.log(row, column, rowIndex, columnIndex);
-  if (column.label == "急诊" && row.jzbz == "1") {
+  if (column.label == "急" && row.jzbz == "1") {
     return { background: '#f00  !important', color: '#fff' };
   }
 
@@ -485,9 +485,9 @@ interface ColumnItem {
   width: string;
 }
 // 更新列
-const updateColumns = (arr: Array<ColumnItem>) => {
-  columns.value = arr
-};
+// const updateColumns = (arr: Array<ColumnItem>) => {
+//   columns.value = arr
+// };
 
 const getRightTable = (row: any) => {
   fetchCodeDetail({ sqh: row.sqh }).then((res: any) => {
diff --git a/src/views/checkCode/report/index.vue b/src/views/checkCode/report/index.vue
index 0daff31..bc88a0c 100644
--- a/src/views/checkCode/report/index.vue
+++ b/src/views/checkCode/report/index.vue
@@ -256,20 +256,20 @@ const rows = ref<any[]>([])
 const tableData = ref([])
 // 配置项
 const columns = ref([
-  { type: 'selection', visible: true, align: 'center', width: 45, label: '多选框' },
+  { type: 'selection', visible: true, align: 'center', width: 30, label: '多选框' },
   { prop: 'dybz', label: '印', align: 'center', visible: true, slot: 'dybz', width: 40 },
   { prop: 'jzbz', label: '急', align: 'center', visible: true, slot: 'jzbz', width: 40 },
   { prop: 'alarmflag', label: '危', align: 'center', visible: true, slot: 'alarmflag', width: 40 },
-  { prop: 'jyrqname', label: '检验日期', align: 'center', visible: true, sortable: true, width: 120 },
-  { prop: 'brdh', label: '病人代号', align: 'center', visible: true, width: 110 },
+  { prop: 'jyrqname', label: '检验日期', align: 'center', visible: true, sortable: true, width: 100 },
+  { prop: 'brdh', label: '病人代号', align: 'center', visible: true, width: 100 },
   { prop: 'brxm', label: '病人姓名', align: 'center', visible: true, },
-  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 60 },
-  { prop: 'ch', label: '床号', align: 'center', visible: true, width: 80 },
-  { prop: 'yqdl', label: '仪器', align: 'center', visible: true, width: 110 },
-  { prop: 'ybh', label: '样本号', align: 'center', visible: true, },
+  { prop: 'brxbname', label: '性别', align: 'center', visible: true, width: 40 },
+  { prop: 'ch', label: '床号', align: 'center', visible: true, width: 50 },
+  { prop: 'yqdl', label: '仪器', align: 'center', visible: true, width: 100 },
+  { prop: 'ybh', label: '样本号', align: 'center', visible: true, width: 60 },
   { prop: 'yblxname', label: '样本类型', align: 'center', visible: true, },
-  { prop: 'jymd', label: '检验目的', align: 'center', visible: true, width: 110 },
-  { prop: 'brlyname', label: '病人类型', align: 'center', visible: true, },
+  { prop: 'jymd', label: '检验目的', align: 'center', visible: true, width: 118 },
+  { prop: 'brlyname', label: '病人类型', align: 'center', visible: true, width: 80 },
   { prop: 'yqmc', label: '仪器名称', align: 'center', visible: true, width: 150 },
   { prop: 'yljg', label: '医疗机构', align: 'center', visible: true, width: 150 },
 ])
diff --git a/src/views/liswork/work/components/labpatlist.vue b/src/views/liswork/work/components/labpatlist.vue
index 168a26c..6c8188e 100644
--- a/src/views/liswork/work/components/labpatlist.vue
+++ b/src/views/liswork/work/components/labpatlist.vue
@@ -28,6 +28,9 @@
       <template #ksdh="{ row }">
         {{ formatDict(row.ksdh, 'DP') }}
       </template>
+      <template #yhdh="{ row }">
+        {{ formatDict(row.yhdh, 'SRD') }}
+      </template>
 
       <template #autojgbz="{ row }">
         <el-checkbox :model-value="row.autojgbz === '1'" readonly />
@@ -75,26 +78,26 @@ const emits = defineEmits(['select'])
 
 // 表格列配置
 const tableColumns = ref([
-  { field: 'finish', title: '完', width: 35, align: 'center', slotName: 'finish', resizable: true },
-  { field: 'jgbz', title: '审', width: 40, align: 'center', slotName: 'jgbz', resizable: true },
-  { field: 'alarmflag', title: '警', width: 40, align: 'center', slotName: 'alarmflag', resizable: true },
-  { field: 'brly', title: '类型', width: 70, align: 'center', slotName: 'brly', resizable: true },
-  { field: 'autojgbz', title: '自', width: 40, align: 'center', slotName: 'autojgbz', resizable: true },
-  { field: 'ybh', title: '样本号', width: 80, align: 'center', resizable: true },
-  { field: 'brxm', title: '病人姓名', width: 80, align: 'center', resizable: true },
-  { field: 'brdh', title: '病历号', width: 120, align: 'center', resizable: true },
-  { field: 'ch', title: '床号', width: 50, align: 'center', resizable: true },
-  { field: 'brxb', title: '病人性别', width: 80, align: 'center', slotName: 'brxb', resizable: true },
-  { field: 'nl', title: '年', width: 50, align: 'center', resizable: true },
-  { field: 'nldw', title: '龄', width: 50, align: 'center', slotName: 'nldw', resizable: true },
-  { field: 'ksdh', title: '科室', width: 100, align: 'center', slotName: 'ksdh', resizable: true },
+  { field: 'finish', title: '完', width: 20, align: 'center', slotName: 'finish', resizable: true },
+  { field: 'jgbz', title: '审', width: 20, align: 'center', slotName: 'jgbz', resizable: true },
+  { field: 'alarmflag', title: '警', width: 20, align: 'center', slotName: 'alarmflag', resizable: true },
+  { field: 'autojgbz', title: '自', width: 20, align: 'center', slotName: 'autojgbz', resizable: true },
+  { field: 'brly', title: '类型', width: 50, align: 'center', slotName: 'brly', resizable: true },
+  { field: 'ybh', title: '样本号', width: 45, align: 'center', resizable: true },
+  { field: 'brxm', title: '姓名', width: 40, align: 'center', resizable: true },
+  { field: 'brdh', title: '病历号', width: 80, align: 'center', resizable: true },
+  { field: 'ch', title: '床号', width: 40, align: 'center', resizable: true },
+  { field: 'brxb', title: '性别', width: 30, align: 'center', slotName: 'brxb', resizable: true },
+  { field: 'nl', title: '年', width: 30, align: 'center', resizable: true },
+  { field: 'nldw', title: '龄', width: 20, align: 'center', slotName: 'nldw', resizable: true },
+  { field: 'ksdh', title: '科室', width: 80, align: 'center', slotName: 'ksdh', resizable: true },
   { field: 'yblx', title: '标本', width: 50, align: 'center', resizable: true },
-  { field: 'dybz', title: '印', width: 40, align: 'center', slotName: 'dybz', resizable: true },
-  { field: 'fslx', title: '发送', width: 50, align: 'center', slotName: 'fslx', resizable: true },
-  { field: 'shcs', title: '次数', width: 50, align: 'center', resizable: true },
-  { field: 'sqh', title: '申请号/条码', width: 150, align: 'center', resizable: true, },
-  { field: 'jymd', title: '检验目的', width: 120, align: 'center', resizable: true },
-  { field: 'yhdh', title: '检验医生', width: 80, align: 'center', resizable: true },
+  { field: 'dybz', title: '印', width: 20, align: 'center', slotName: 'dybz', resizable: true },
+  { field: 'fslx', title: '发送', width: 30, align: 'center', slotName: 'fslx', resizable: true },
+  { field: 'shcs', title: '次数', width: 30, align: 'center', resizable: true },
+  { field: 'sqh', title: '申请号/条码', width: 100, align: 'center', resizable: true, },
+  { field: 'jymd', title: '检验目的', width: 90, align: 'center', resizable: true },
+  { field: 'yhdh', title: '检验医生', width: 60, align: 'center', resizable: true, slotName: 'yhdh' },
   { field: 'yljg', title: '送检医院', width: 120, align: 'center', slotName: 'yljg', resizable: true, }
 ])
 
@@ -124,6 +127,9 @@ const cellStyle = ({ row, column }: any) => {
   if (column.title == "警" && row.alarmflag == 1) {
     return { background: '#f00  !important', color: '#FFF' };
   }
+  if (column.title == "审" && row.jgbz == '2') {
+    return { background: '#ffc0c0  !important', color: '#FFF' };
+  }
 }
 // 引入公共组件的字典格式化方法
 const formatDict = (v: string, dictType: string) => {
diff --git a/src/views/liswork/work/components/labresult.vue b/src/views/liswork/work/components/labresult.vue
index b65fea0..1112341 100644
--- a/src/views/liswork/work/components/labresult.vue
+++ b/src/views/liswork/work/components/labresult.vue
@@ -44,6 +44,9 @@
       <template #cp_compa="{ column, $index }">
         {{ lastjyrq }}
       </template>
+      <template #refs="{ row }">
+        {{ row.refs }}{{ row.dw }}
+      </template>
       <template #od="{ row }">
         <el-input v-model="row.od" v-if="labPat.jgbz == 0 || labPat.jgbz == null" size="small" class="full-width-input"
           @change="handleCsjgEnter(row)" />
@@ -210,17 +213,17 @@ watch(() => props.resultSysList, (newVal) => {
 
 
 const columns = ref([
-  { label: 'No', prop: 'index', width: 45, visible: true, slot: "index" },
+  { label: 'No', prop: 'index', width: 30, align: 'center', visible: true, slot: "index" },
   { label: "复", prop: "redo_flag", width: 30, align: 'center', visible: true, },
-  { label: "项目", prop: "xmdh", width: 70, visible: true, },
+  { label: "项目", prop: "xmdh", width: 50, visible: true, },
   { label: "名称", prop: "xmmc", width: 180, visible: true, },
-  { label: "结果", prop: "csjg", width: 80, visible: true, slot: "csjg" },
-  { label: "上次结果", prop: "cp_compa", width: 80, visible: true, headerSlot: "cp_compa" },
+  { label: "结果", prop: "csjg", width: 50, visible: true, slot: "csjg" },
+  { label: "上次结果", prop: "cp_compa", width: 60, visible: true, headerSlot: "cp_compa" },
   { label: "OD", prop: "od", width: 80, visible: true, slot: "od" },
   { label: "CUTOFF", prop: "cutoff", width: 80, visible: true, slot: "cutoff" },
-  { label: "参考值", prop: "refs", width: 100, visible: true, },
-  { label: "单位", prop: "dw", width: 80, visible: true, },
-  { label: "子模块", prop: "bz1", width: 100, visible: true, },
+  { label: "参考值", prop: "refs", width: 100, visible: true, slot: "refs" },
+  // { label: "单位", prop: "dw", width: 80, visible: true, },
+  { label: "子模块", prop: "bz1", visible: true, },
 ])
 
 const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
@@ -241,7 +244,7 @@ const cellStyle = ({ row, column, rowIndex, columnIndex }) => {
   }
 
 
-  if (column.label == "上次结果" && (row.alarm_flag ?? "").trim().length > 0) {
+  if (column.label == "上次结果" && (row.alarm_flag ?? "").trim().length > 0 && row.cp_compa) {
     return { background: '#f00  !important', color: '#FFF' };
   }
   if (column.label == "上次结果" && row.cp_lastflag == "H") {
diff --git a/src/views/liswork/work/index.vue b/src/views/liswork/work/index.vue
index 17dfd7b..940dfee 100644
--- a/src/views/liswork/work/index.vue
+++ b/src/views/liswork/work/index.vue
@@ -322,6 +322,7 @@ const handleCreate = () => {
       labPat.value.id = `temp_${Date.now()}_${Math.random().toString(36).substr(2, 8)}`;
       labResuts.value = []
       labPatListRef.value?.clearCurrentRow();
+      fetchLabResults()
     }
   });
 }
diff --git a/src/views/liswork/work/others/index.vue b/src/views/liswork/work/others/index.vue
index 7cf789e..cc8e9b3 100644
--- a/src/views/liswork/work/others/index.vue
+++ b/src/views/liswork/work/others/index.vue
@@ -50,7 +50,7 @@
 
 <script setup lang="ts">
 import type { PropType } from 'vue';
-import { ref, watch, computed, reactive, toRefs, onMounted, h, nextTick } from 'vue';
+import { ref, watch, computed, reactive, toRefs, onMounted, nextTick } from 'vue';
 import { otherinstr, otherInstrDetail } from '@/api/liswork/work/LisWork';
 import CustomTable from '@/components/elTable/index.vue'
 import dayjs from 'dayjs';
diff --git a/src/views/liswork/work/reexamination/index.vue b/src/views/liswork/work/reexamination/index.vue
index 3b6f9e0..3e33297 100644
--- a/src/views/liswork/work/reexamination/index.vue
+++ b/src/views/liswork/work/reexamination/index.vue
@@ -1,6 +1,17 @@
 <template>
   <div class="reex_box">
     <!-- 结果复查 -->
+    <el-table ref="tableRef" :data="tableData" style="width: 100%" highlight-current-row border height="82vh"
+      show-overflow-tooltip>
+      <el-table-column prop="xmdh" label="检验项目" align="center" width="120" />
+      <el-table-column prop="csjg" label="复查前结果" align="center" width="150" />
+      <el-table-column label="操作" width="150">
+        <template #default>
+          <el-button type="primary" link size="small"> 删除 </el-button>
+          <el-button type="primary" link size="small">交换</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
   </div>
 </template>
 
@@ -21,11 +32,11 @@ const props = defineProps({
 
 // 解构 props
 const { queryParams } = toRefs(props);
-
+const tableData = ref([]);
 const getReexamination = () => {
   redoResult(queryParams.value).then((res: any) => {
     if (res.code == 0) {
-
+      tableData.value = res.data || [];
     }
   })
 };