From 47277ee5eb8088c1f270aa6db7fbefb6228c09a2 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Wed, 15 Apr 2026 18:03:32 +0800
Subject: [PATCH] =?UTF-8?q?=E4=B8=BB=E7=95=8C=E9=9D=A2=E5=88=97=E7=BC=93?=
 =?UTF-8?q?=E5=AD=98=EF=BC=8C=E6=95=B0=E6=8D=AE=E6=A0=8F=E6=8B=96=E6=8B=89?=
 =?UTF-8?q?=E5=8A=9F=E8=83=BD?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/layout/components/Navbar.vue              | 36 +++++++++++++-
 src/views/liswork/labItem/BatchInstrVs.vue    | 24 ++++++----
 src/views/liswork/labItem/index.vue           |  8 +++-
 src/views/liswork/micro/index.vue             | 18 +++----
 src/views/liswork/micro/labpatlist.vue        | 48 +++++++++++++++++--
 .../liswork/qualityControl/qcgraph/index.vue  |  4 +-
 src/views/liswork/work/index.vue              | 22 +++++----
 src/views/liswork/work/labpatlist.vue         | 44 +++++++++++++++--
 src/views/liswork/xmKnowledge/Modify.vue      | 19 ++++----
 src/views/liswork/xmKnowledge/index.vue       | 26 +++++-----
 src/views/liswork/xtwh/comopt/index.vue       |  2 +-
 11 files changed, 190 insertions(+), 61 deletions(-)

diff --git a/src/layout/components/Navbar.vue b/src/layout/components/Navbar.vue
index ebca030..6d7eed0 100644
--- a/src/layout/components/Navbar.vue
+++ b/src/layout/components/Navbar.vue
@@ -43,6 +43,9 @@
                 <el-dropdown-item command="setLayout" v-if="settingsStore.showSettings">
                   <span>布局设置</span>
                 </el-dropdown-item>
+                <el-dropdown-item command="clearCache">
+                  <span>清除缓存</span>
+                </el-dropdown-item>
                 <el-dropdown-item divided command="logout">
                   <span>退出登录</span>
                 </el-dropdown-item>
@@ -56,7 +59,7 @@
 </template>
 
 <script setup>
-import { ElMessageBox } from 'element-plus'
+import { ElMessageBox, ElMessage } from 'element-plus'
 // 引入原有组件
 import Breadcrumb from '@/components/Breadcrumb'
 import TopNav from '@/components/TopNav'
@@ -76,7 +79,8 @@ import { formatDict, getDictData } from '@/hooks'
 const appStore = useAppStore()
 const userStore = useUserStore()
 const settingsStore = useSettingsStore()
-
+import { useRoute } from 'vue-router';
+const route = useRoute();
 // 处理角色名称（取第一个角色，多角色可自定义）
 const roleName = computed(() => {
   if (!userStore.roles || userStore.roles.length === 0) {
@@ -103,6 +107,9 @@ function handleCommand(command) {
     case "setLayout":
       setLayout();
       break;
+    case "clearCache":
+      clearCache();
+      break;
     case "logout":
       logout();
       break;
@@ -111,6 +118,31 @@ function handleCommand(command) {
   }
 }
 
+const clearCache = () => {
+  console.log(route.path);
+  const routeColumnKeyMap = {
+    '/liswork/work': 'cgjyList_column_config', // 检验列表页面
+    '/liswork/micro': 'wswList_column_config', // 微生物列表页面
+  };
+
+  // 获取当前页面的缓存KEY
+  const currentKey = routeColumnKeyMap[route.path];
+  if (!currentKey) {
+    ElMessage.warning('当前页面无表格列缓存可清除');
+    return;
+  }
+
+  try {
+    localStorage.removeItem(currentKey);
+    ElMessage.success('当前页面表格列缓存已清除');
+    // 可选：刷新页面使配置生效（或通知对应页面重置列）
+    location.reload();
+  } catch (e) {
+    console.error('清除当前列缓存失败', e);
+    ElMessage.error('清除缓存失败');
+  }
+}
+
 function logout() {
   ElMessageBox.confirm('确定注销并退出系统吗？', '提示', {
     confirmButtonText: '确定',
diff --git a/src/views/liswork/labItem/BatchInstrVs.vue b/src/views/liswork/labItem/BatchInstrVs.vue
index eca06d1..504149e 100644
--- a/src/views/liswork/labItem/BatchInstrVs.vue
+++ b/src/views/liswork/labItem/BatchInstrVs.vue
@@ -177,24 +177,30 @@ const selecChange = (rows: any[]) => {
 
 //确定
 const handleOk = () => {
+  if (selecRows.value.length == 0) {
+    ElMessage.warning('请选择要操作的行！')
+    return
+  }
+  let arr = []
+  arr = selecRows.value.map((item) => {
+    return {
+      ...item,
+      yq: formData.value.yq,
+    }
+  })
   if (formData.value.queryDylx == '1') {
-    addBatch(selecRows.value).then((res: any) => {
+    addBatch(arr).then((res) => {
       if (res.code == 0) {
         ElMessage.success('操作成功！')
+        selecRows.value = []
         getList()
       }
     })
   } else if (formData.value.queryDylx == '2') {
-    let arr = []
-    arr = selecRows.value.map((item: any) => {
-      return {
-        yq: formData.value.yq,
-        xmid: item.xmid,
-      }
-    })
-    delBatch(arr).then((res: any) => {
+    delBatch(arr).then((res) => {
       if (res.code == 0) {
         ElMessage.success('操作成功！')
+        selecRows.value = []
         getList()
       }
     })
diff --git a/src/views/liswork/labItem/index.vue b/src/views/liswork/labItem/index.vue
index 8b4b6fc..7f59538 100644
--- a/src/views/liswork/labItem/index.vue
+++ b/src/views/liswork/labItem/index.vue
@@ -26,8 +26,9 @@
               value="value" objKey="value" :border="true" width="8.75rem" size="small" @getDataValue="getList" />
           </el-form-item>
           <el-form-item label="项目ID：">
-            <el-input clearable placeholder="项目ID" prefix-icon="Search" v-model="queryParams.xmid"
-              style="width: 8.75rem" @change="getList" />
+            <el-input clearable placeholder="项目ID" prefix-icon="Search" v-model="queryParams.xmid" @input="(val) => {
+              queryParams.xmid = val.replace(/[^0-9]/g, '');
+            }" style="width: 8.75rem" @change="getList" />
           </el-form-item>
           <el-form-item>
             <el-radio-group v-model="queryParams.uflag" fill="primary" :size="autoSize" @change="changeStauts">
@@ -358,6 +359,9 @@ const handleSave = async (flag: any) => {
   }
   const flagCommon = modelParam.value.commonlyValuesData.every((item: any) => item.qz && item.srm && item.jgbz)
   if (!flagCommon) return ElMessage.warning('请完整填写常用取值项！');
+  const flagUserInstr = modelParam.value.userInstrData.every((item: any) => item.yq)
+  if (!flagUserInstr) return ElMessage.warning('请完整选择对应的仪器！');
+
   saveDataService({
     xmInfoNew: modelParam.value.basicData,
     xmDoubleRows: [],
diff --git a/src/views/liswork/micro/index.vue b/src/views/liswork/micro/index.vue
index fe3ce03..104fb09 100644
--- a/src/views/liswork/micro/index.vue
+++ b/src/views/liswork/micro/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
-      <el-col :span="13">
+    <el-splitter>
+      <el-splitter-panel size="55%">
         <div class="box-shadow">
           <el-form :model="queryParams" ref="queryRef" :inline="true" :size="aotuSize" :rules="rules"
             class="compact-form">
@@ -68,10 +68,10 @@
             </el-col>
           </el-row>
         </div>
-      </el-col>
+      </el-splitter-panel>
 
-      <el-col :span="11">
-        <div>
+      <el-splitter-panel :min="300">
+        <div style="margin-left: 10px;">
           <tabView :tabList="tabList" v-model:activeTab="activeTab" />
           <div class="box-shadow right_box">
             <template v-if="activeTab == 'LabPatList'">
@@ -92,9 +92,9 @@
                       @click="handleNext"></el-button>
                   </el-tooltip>
                   <PatientQueryForm :initial-params="initialParams" @query="handleQueryResult" @reset="handleReset"
-                    width="14rem" :size="aotuSize" placeholder="查询条件" :dict-data="dictData" :clearable="true" />
+                    width="12rem" :size="aotuSize" placeholder="查询条件" :dict-data="dictData" :clearable="true" />
                   <el-input v-model="searchText" clearable :size="aotuSize" @keyup.enter="searchQuery" class="ml10"
-                    @clear="clearSearch" style="width: 10rem" />
+                    @clear="clearSearch" style="width: 9rem" />
                 </div>
                 <div>
                   <el-checkbox v-model="lbFlag" :size="aotuSize"> 列表翻页 </el-checkbox>
@@ -132,8 +132,8 @@
 
           </div>
         </div>
-      </el-col>
-    </el-row>
+      </el-splitter-panel>
+    </el-splitter>
     <!-- 校验用户 -->
     <CheckUser ref="checkUserRef" @onConfirm="handleCheckUserConfirm" @onCancel="checkUserCancel" />
     <!-- 批量扫码弹窗 -->
diff --git a/src/views/liswork/micro/labpatlist.vue b/src/views/liswork/micro/labpatlist.vue
index fa64fcb..3dbe737 100644
--- a/src/views/liswork/micro/labpatlist.vue
+++ b/src/views/liswork/micro/labpatlist.vue
@@ -130,10 +130,13 @@ const handleMenuSelect = ((item: ContextMenuItem) => {
   show.value = true
   fcYq.value = props.tableKey.yq
 })
+
+const tableColumns = ref<any[]>([])
+
 // 表格列配置
-const tableColumns = ref([
+const defaultTableColumns = [
   { field: 'jyrq', title: '录入时间', width: 80, align: 'center', resizable: true },
-  { field: 'finish', title: '药敏', width: 30, align: 'center', slotName: 'finish', resizable: true },
+  { field: 'finish', title: '药敏', width: 40, align: 'center', slotName: 'finish', resizable: true },
   { field: 'alarmflag', title: '警', width: 30, align: 'center', slotName: 'alarmflag', resizable: true },
   { field: 'cp_pyzq', title: '培养周期', width: 60, align: 'center', resizable: true },
   { field: 'jgbz', title: '状态', width: 50, align: 'center', resizable: true, slotName: 'jgbz' },
@@ -152,7 +155,25 @@ const tableColumns = ref([
   { field: 'brly', title: '类型', width: 50, align: 'center', slotName: 'brly', resizable: true },
   { field: 'dybz', title: '印', width: 30, align: 'center', slotName: 'dybz', resizable: true },
   { field: 'shcs', title: '次数', width: 40, align: 'center', resizable: true },
-])
+]
+
+const TABLE_COLUMN_KEY = 'wswList_column_config' // 唯一标识当前表格的列配置
+
+const initTableColumns = () => {
+  try {
+    const savedColumns = localStorage.getItem(TABLE_COLUMN_KEY)
+    if (savedColumns) {
+      // 解析本地存储的列配置
+      const parsedColumns = JSON.parse(savedColumns)
+      tableColumns.value = parsedColumns
+      return
+    }
+  } catch (e) {
+    console.error('读取列配置失败', e)
+  }
+  // 无本地配置则使用默认配置
+  tableColumns.value = [...defaultTableColumns]
+}
 
 const getLableType = (type: string) => {
   switch (type) {
@@ -179,7 +200,24 @@ const handleColumnDragEnd = (data: any) => {
   tableColumns.value = [];
   // 使用nextTick确保DOM更新后再设置新值
   nextTick(() => {
-    tableColumns.value = [...data.columns];
+    const newColumns = [...data.columns];
+    tableColumns.value = newColumns;
+
+    try {
+      const saveData = newColumns.map(col => ({
+        field: col.field,
+        title: col.title,
+        width: col.width,
+        align: col.align,
+        resizable: col.resizable,
+        slotName: col.slotName,
+      }))
+      localStorage.setItem(TABLE_COLUMN_KEY, JSON.stringify(saveData))
+    } catch (e) {
+      console.error('保存列配置失败', e)
+    }
+
+
   });
 }
 const handleRowClick = (row: any) => {
@@ -240,6 +278,8 @@ const formatDict = (v: string, dictType: string) => {
   return props.dictData[dictType]?.find((item: any) => item.value == v)?.label || v;
 }
 onMounted(() => {
+  initTableColumns()
+
   const row = props.labPatList.find((item: any) => item.ybh == props.tableKey.ybh)
   if (!row) return
   setTimeout(() => { setCurrentRow(row) }, 100)
diff --git a/src/views/liswork/qualityControl/qcgraph/index.vue b/src/views/liswork/qualityControl/qcgraph/index.vue
index a654fa0..7ba5039 100644
--- a/src/views/liswork/qualityControl/qcgraph/index.vue
+++ b/src/views/liswork/qualityControl/qcgraph/index.vue
@@ -54,7 +54,7 @@
           <el-tab-pane label="有效数据" name="2" />
         </el-tabs>
 
-        <div v-if="activeName == '1'">
+        <div v-if="activeName == '1'" style="height: 100%;">
           <div class="tips">
             仪器：{{ yqmc }} &nbsp; 质控项目：{{ xmInfo.xmdh }} {{ xmInfo.xmmc }} &nbsp;
             区间：{{ queryParams.st }} - {{ queryParams.et }}
@@ -444,7 +444,7 @@ onMounted(async () => {
 }
 
 .echarts-box {
-  height: calc(100% - 50px);
+  height: calc(100% - 60px);
   overflow: auto;
 }
 
diff --git a/src/views/liswork/work/index.vue b/src/views/liswork/work/index.vue
index 2123e4e..586b448 100644
--- a/src/views/liswork/work/index.vue
+++ b/src/views/liswork/work/index.vue
@@ -1,7 +1,7 @@
 <template>
   <div class="app-container">
-    <el-row :gutter="10">
-      <el-col :span="13">
+    <el-splitter>
+      <el-splitter-panel size="55%">
         <div class="box-shadow">
           <el-form :model="queryParams" ref="queryRef" :inline="true" :size="aotuSize" :rules="rules"
             class="compact-form">
@@ -54,10 +54,10 @@
             </el-col>
           </el-row>
         </div>
-      </el-col>
 
-      <el-col :span="11">
-        <div>
+      </el-splitter-panel>
+      <el-splitter-panel :min="300">
+        <div style="margin-left: 10px;">
           <tabView :tabList="tabList" v-model:activeTab="activeTab" />
           <div class="box-shadow right_box">
             <template v-if="activeTab == 'LabPatList'">
@@ -78,9 +78,9 @@
                       @click="handleNext"></el-button>
                   </el-tooltip>
                   <PatientQueryForm :initial-params="initialParams" @query="handleQueryResult" @reset="handleReset"
-                    width="14rem" :size="aotuSize" placeholder="查询条件" :dict-data="dictData" :clearable="true" />
+                    width="12rem" :size="aotuSize" placeholder="查询条件" :dict-data="dictData" :clearable="true" />
                   <el-input v-model="searchText" clearable :size="aotuSize" @keyup.enter="searchQuery" class="ml10"
-                    @clear="clearSearch" style="width: 10rem" />
+                    @clear="clearSearch" style="width: 9rem" />
                 </div>
 
                 <div>
@@ -103,8 +103,11 @@
 
           </div>
         </div>
-      </el-col>
-    </el-row>
+
+      </el-splitter-panel>
+    </el-splitter>
+
+
     <!-- 批量扫码弹窗 -->
     <BatchCode ref="batchRef" v-model:labPat="labPat" :labPatKey="queryParams" :dictData="dictData"
       :totalCount="labPatList.length" @goNext="handleNext" @goPrev="handlePrev" @goLast="handleLast"
@@ -772,6 +775,7 @@ const sendMessage = () => {
 
   .flex-between {
     margin-bottom: .5rem;
+    flex-shrink: 0;
   }
 }
 
diff --git a/src/views/liswork/work/labpatlist.vue b/src/views/liswork/work/labpatlist.vue
index 90c5bcf..d257eb8 100644
--- a/src/views/liswork/work/labpatlist.vue
+++ b/src/views/liswork/work/labpatlist.vue
@@ -137,8 +137,10 @@ const handleMenuSelect = ((item: ContextMenuItem) => {
   show.value = true
   fcYq.value = props.tableKey.yq
 })
+
+const tableColumns = ref<any[]>([])
 // 表格列配置
-const tableColumns = ref([
+const defaultTableColumns = [
   { field: 'finish', title: '完', width: 30, align: 'center', slotName: 'finish', resizable: true },
   { field: 'jgbz', title: '审', width: 30, align: 'center', slotName: 'jgbz', resizable: true },
   { field: 'alarmflag', title: '警', width: 30, align: 'center', slotName: 'alarmflag', resizable: true },
@@ -160,7 +162,26 @@ const tableColumns = ref([
   { 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, }
-])
+]
+
+
+const TABLE_COLUMN_KEY = 'cgjyList_column_config' // 唯一标识当前表格的列配置
+
+const initTableColumns = () => {
+  try {
+    const savedColumns = localStorage.getItem(TABLE_COLUMN_KEY)
+    if (savedColumns) {
+      // 解析本地存储的列配置
+      const parsedColumns = JSON.parse(savedColumns)
+      tableColumns.value = parsedColumns
+      return
+    }
+  } catch (e) {
+    console.error('读取列配置失败', e)
+  }
+  // 无本地配置则使用默认配置
+  tableColumns.value = [...defaultTableColumns]
+}
 
 // 更新列配置
 const handleColumnDragEnd = (data: any) => {
@@ -168,7 +189,22 @@ const handleColumnDragEnd = (data: any) => {
   tableColumns.value = [];
   // 使用nextTick确保DOM更新后再设置新值
   nextTick(() => {
-    tableColumns.value = [...data.columns];
+    const newColumns = [...data.columns];
+    tableColumns.value = newColumns;
+
+    try {
+      const saveData = newColumns.map(col => ({
+        field: col.field,
+        title: col.title,
+        width: col.width,
+        align: col.align,
+        resizable: col.resizable,
+        slotName: col.slotName,
+      }))
+      localStorage.setItem(TABLE_COLUMN_KEY, JSON.stringify(saveData))
+    } catch (e) {
+      console.error('保存列配置失败', e)
+    }
   });
 }
 const handleRowClick = (row: any) => {
@@ -220,6 +256,8 @@ const formatDict = (v: string, dictType: string) => {
   return props.dictData[dictType]?.find((item: any) => item.value == v)?.label || v;
 }
 onMounted(() => {
+  initTableColumns()
+
   const row = props.labPatList.find((item: any) => item.ybh == props.tableKey.ybh)
   if (!row) return
   setTimeout(() => { setCurrentRow(row) }, 100)
diff --git a/src/views/liswork/xmKnowledge/Modify.vue b/src/views/liswork/xmKnowledge/Modify.vue
index 2b99e09..0a30b17 100644
--- a/src/views/liswork/xmKnowledge/Modify.vue
+++ b/src/views/liswork/xmKnowledge/Modify.vue
@@ -1,12 +1,10 @@
 <!-- 修改界面 -->
 <template>
-  <el-dialog v-model="visible" width="600px" @open="open">
-    <template #header>
-      {{ title }}
-    </template>
+  <el-dialog v-model="visible" :title="title" width="35vw" @open="open">
+
     <span class="text-span">项目信息：</span>
     <el-divider style="margin: 5px 0;" />
-    <el-form ref="form" :model="formData" size="small" class="form-inline" inline label-width="70px">
+    <el-form ref="form" :model="formData" class="form-inline" inline label-width="70px">
       <el-form-item label="项目代号" prop="xmdh">
         <el-input placeholder="项目代号" v-model="formData.xmdh"></el-input>
       </el-form-item>
@@ -113,7 +111,7 @@ const formData = ref({
 const columnsRight = ref([
   { prop: 'reserve', label: '类别', visible: true, align: 'center', slot: 'reserve', width: 50, showOverflowTooltip: false },
   { prop: 'textresult', label: '说明', visible: true, align: 'center', slot: 'textresult', width: 300, showOverflowTooltip: false },
-  { prop: 'zd', label: '指导建议', visible: true, align: 'center', slot: 'zd', width: 200, showOverflowTooltip: false },
+  { prop: 'zd', label: '指导建议', visible: true, align: 'center', slot: 'zd', showOverflowTooltip: false },
 ])
 
 const tableConfig = ref({
@@ -194,14 +192,17 @@ const open = () => {
 </script>
 
 <style scoped lang="scss">
+.text-span {
+  font-size: 16px;
+  font-weight: bold;
+  color: #1f6dd3;
+}
+
 .form-inline {
   padding: 10px;
   background-color: #f5f7fa;
   height: auto;
 
-  .el-input {
-    width: 150px;
-  }
 
   .el-form-item {
     margin-right: 10px;
diff --git a/src/views/liswork/xmKnowledge/index.vue b/src/views/liswork/xmKnowledge/index.vue
index 74026cd..aff7b9f 100644
--- a/src/views/liswork/xmKnowledge/index.vue
+++ b/src/views/liswork/xmKnowledge/index.vue
@@ -74,7 +74,7 @@ const modifyVisible = ref(false)
 const modifyTitle = ref('')
 const modifyType = ref('')
 const modifyRef = ref()
-const selectRow = ref()
+const selectRow: any = ref(null)
 
 //退拽属性
 const handleColumnDragEnd = (data: any) => {
@@ -118,7 +118,8 @@ const onClick = async (row: any) => {
   selectRow.value = row
 }
 
-const onDBClick = () => {
+const onDBClick = (info) => {
+
 
 }
 
@@ -129,16 +130,21 @@ const onAddClick = () => {
 
 }
 
-const onDelClick = async () => {
-  if (selectRow.value) {
-    await ElMessageBox.confirm('是否要删除选中的数据?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', });
-    await delService(selectRow.value.xmid)
-    ElMessage.success('删除成功！')
-  }
-
+const onDelClick = () => {
+  if (!selectRow.value) return ElMessage.warning('请先选择要删除的数据！')
+  ElMessageBox.confirm('是否要删除选中的数据?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', }).then(() => {
+    delService(selectRow.value.xmid).then((res) => {
+      if (res.code == 0) {
+        ElMessage.success('删除成功！')
+        getList()
+        selectRow.value = null
+      }
+    })
+  })
 }
 
 const onQueryClick = () => {
+  pagination.value.currentPage = 1
   getList()
 }
 
@@ -147,9 +153,7 @@ const getList = async () => {
   const res = await queryService(data);
   dataListLeft.value = res.rows
   pagination.value.total = res.total
-
   dataListRight.value = []
-
 }
 
 
diff --git a/src/views/liswork/xtwh/comopt/index.vue b/src/views/liswork/xtwh/comopt/index.vue
index a946592..f153461 100644
--- a/src/views/liswork/xtwh/comopt/index.vue
+++ b/src/views/liswork/xtwh/comopt/index.vue
@@ -115,7 +115,7 @@ const tabList = [
   { key: 'SysSort', label: '项目排序', component: SysSort },
   { key: 'SysReport', label: '报告单设置', component: SysReport },
 ]
-const activeName = ref('SysDefaultParams')
+const activeName = ref('SysGlobal')
 
 // 计算当前要渲染的组件
 const currentComponent = computed(() => {