From 6f1770fd35eb8864353edca7741fecf3fd036879 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Wed, 24 Dec 2025 17:42:44 +0800
Subject: [PATCH 1/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/liswork/xmmb/index.ts                 |  20 ++
 src/api/liswork/xtwh/xmReqItemVsApi.ts        |  33 +++
 src/components/SelectTable/index.vue          |   9 +-
 src/hooks/lisData/dictData.ts                 |   4 +-
 src/types/SelectTable.d.ts                    |   1 +
 src/views/liswork/xmKnowledge/TableData.vue   |  33 ++-
 src/views/liswork/xmKnowledge/index.vue       |  28 +--
 src/views/liswork/xmmb/index.vue              | 192 ++++++++++++++++++
 src/views/liswork/xtwh/xmFeeInstr/index.vue   |  55 ++---
 src/views/liswork/xtwh/xmReqItemVs/index.vue  | 105 ++++++++--
 src/views/regional/circulation/bbcx/index.vue |  30 +--
 src/views/regional/circulation/bbqs/index.vue |  32 +--
 src/views/regional/circulation/bbth/index.vue |  30 +--
 src/views/regional/circulation/sjdj/index.vue |  32 +--
 src/views/regional/statistics/bbtj/index.vue  |  12 +-
 src/views/regional/statistics/fytj/index.vue  |  12 +-
 16 files changed, 490 insertions(+), 138 deletions(-)
 create mode 100644 src/api/liswork/xmmb/index.ts
 create mode 100644 src/views/liswork/xmmb/index.vue

diff --git a/src/api/liswork/xmmb/index.ts b/src/api/liswork/xmmb/index.ts
new file mode 100644
index 0000000..76fbe21
--- /dev/null
+++ b/src/api/liswork/xmmb/index.ts
@@ -0,0 +1,20 @@
+//@ts-ignore js语法检查忽略
+import request from '@/utils/request';
+
+
+// 查询模板列表
+export function queryMbList(query?: Object) {
+  return request({
+    url: '/labInputmdl/query',
+    method: 'get',
+    params: query,
+  });
+}
+// 查询明细数据
+export function queryDetail(query?: Object) {
+  return request({
+    url: '/labInputmdl/queryDetail',
+    method: 'get',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/liswork/xtwh/xmReqItemVsApi.ts b/src/api/liswork/xtwh/xmReqItemVsApi.ts
index 2d7abeb..61d52dd 100644
--- a/src/api/liswork/xtwh/xmReqItemVsApi.ts
+++ b/src/api/liswork/xtwh/xmReqItemVsApi.ts
@@ -19,3 +19,36 @@ export function queryDetailService(params: any) {
     params,
   });
 }
+//查询项目明细 old
+export function queryOldxminfo(params: any) {
+  return request({
+    url: "/oldxminfo/query",
+    method: "get",
+    params,
+  });
+}
+//搜索项目 
+export function searchxminfo(params: any) {
+  return request({
+    url: "/vsReportitem/search",
+    method: "get",
+    params,
+  });
+}
+
+//添加收费项目报告项目对照
+export function addXminfo(data: Object) {
+  return request({
+    url: "/vsReportitem/add",
+    method: "post",
+    data,
+  });
+}
+//删除收费项目报告项目对照
+export function delXminfo(data: Object) {
+  return request({
+    url: "/vsReportitem/del",
+    method: "delete",
+    params: data,
+  });
+}
diff --git a/src/components/SelectTable/index.vue b/src/components/SelectTable/index.vue
index 8053e7d..cd31dd5 100644
--- a/src/components/SelectTable/index.vue
+++ b/src/components/SelectTable/index.vue
@@ -61,6 +61,7 @@ const props = withDefaults(defineProps<Props>(), {
   dictType: '',
   clearable: true,
   objKey: 'value',
+  keyValue: false,
   fields: () => [
     { prop: 'value', label: '代号', width: 80, enablePinyinSearch: true },
     { prop: 'label', label: '名称', width: 150, enablePinyinSearch: true },
@@ -116,7 +117,7 @@ const visibleChange = (val: any) => {
       currentIndex.value = filterData.value.findIndex(item => item[props.value!] === props.data);
       if (currentIndex.value >= 0) {
         tableRef.value.setCurrentRow(filterData.value[currentIndex.value]);
-        tableRef.value.setScrollTop(currentIndex.value);
+        tableRef.value.setScrollTop(currentIndex.value * 30);
       }
     }, 10);
   }
@@ -140,7 +141,7 @@ const handleDataEcho = () => {
     } else if (props.tableData) {
       row = props.tableData?.find((item: any) => props.objKey && item[props.objKey] === props.data)
     }
-    selectShowValue.value = row ? (props.label ? row[props.label] : (props.value ? row[props.value] : '')) : '';
+    selectShowValue.value = row ? (props.keyValue ? `${row[props.value]} ${row[props.label]}` : (props.label ? row[props.label] : (props.value ? row[props.value] : ''))) : '';
   }
 };
 
@@ -238,7 +239,7 @@ const handleKeydown = (e: any) => {
   tableRef.value.setCurrentRow(filterData.value[currentIndex.value]);
 
   // 滚动到当前行
-  tableRef.value.setScrollTop(currentIndex.value);
+  tableRef.value.setScrollTop(currentIndex.value * 30);
 
   // 回车确认
   if (e.key === "Enter") {
@@ -301,6 +302,8 @@ const setLabel = (val: any) => {
     selectShowValue.value = val[props.label];
   } else if (props.value) {
     selectShowValue.value = val[props.value];
+  } else if (props.keyValue) {
+    selectShowValue.value = `${val[props.value]} ${val[props.label]}`;
   }
   if (props.objKey) {
     // 返回值objKey对应的对象数据
diff --git a/src/hooks/lisData/dictData.ts b/src/hooks/lisData/dictData.ts
index d12369f..10db473 100644
--- a/src/hooks/lisData/dictData.ts
+++ b/src/hooks/lisData/dictData.ts
@@ -33,12 +33,12 @@ export const getDictData = async (...args: string[]) => {
 //字典数据格式化方法
 export const formatDict = (v: string, dictType: string) => {
   if (v == undefined) return;
-  return dictData.value[dictType]?.find((item: any) => item.value == v.trim())?.label;
+  return dictData.value[dictType]?.find((item: any) => item.value == v.trim())?.label || v;
 }
 
 //仪器格式化方法
 export const formatInstr = (v: string) => {
-  return instrOptions.value.find((item: any) => item.yq == v.trim())?.yqmc;
+  return instrOptions.value.find((item: any) => item.yq == v.trim())?.yqmc || v;
 }
 
 export { dictData, instrOptions }
\ No newline at end of file
diff --git a/src/types/SelectTable.d.ts b/src/types/SelectTable.d.ts
index c076b43..dbb78eb 100644
--- a/src/types/SelectTable.d.ts
+++ b/src/types/SelectTable.d.ts
@@ -18,6 +18,7 @@ export interface Props {
   disabled?: boolean;
   dictType?: string;
   clearable?: boolean;
+  keyValue?: boolean; //是否使用键值对模式
 }
 
 
diff --git a/src/views/liswork/xmKnowledge/TableData.vue b/src/views/liswork/xmKnowledge/TableData.vue
index 7dd295c..51617b8 100644
--- a/src/views/liswork/xmKnowledge/TableData.vue
+++ b/src/views/liswork/xmKnowledge/TableData.vue
@@ -1,17 +1,17 @@
 <template>
-<CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-      :config="tableConfig">
-  <template #reserve="{row}">
-    {{ reserve(row.reserve) }}
-  </template>    
-</CustomTable>  
+  <CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true"
+    @column-drag-end="handleColumnDragEnd" :config="tableConfig">
+    <template #reserve="{ row }">
+      {{ reserve(row.reserve) }}
+    </template>
+  </CustomTable>
 </template>
 
 <script setup lang="ts">
 import CustomTable from '@/components/elTable/index.vue'
 
 const props = defineProps({
-  dataList:{
+  dataList: {
     type: Array,
     required: false,
     default: []
@@ -23,17 +23,17 @@ const props = defineProps({
       reserveWidth: 50,
       textresultWidth: 200,
       zdWidth: 100,
-      tableHeight: '85vh'
+      tableHeight: '100%'
     }
-   
+
   }
 })
 
 //const dataListRight = ref([]);
 const columnsRight = ref([
-  { prop: 'reserve', label: '类别', visible: true, align: 'center',slot: 'reserve', width: props.styleConfig.reserveWidth },
-  { prop: 'textresult', label: '说明', visible: true, align: 'center', width: props.styleConfig.textresultWidth ,showOverflowTooltip: false},
-  { prop: 'zd', label: '指导建议', visible: true, align: 'center', width: props.styleConfig.zdWidth,showOverflowTooltip: false },
+  { prop: 'reserve', label: '类别', visible: true, align: 'center', slot: 'reserve', },
+  { prop: 'textresult', label: '说明', visible: true, align: 'center', showOverflowTooltip: false },
+  { prop: 'zd', label: '指导建议', visible: true, align: 'center', showOverflowTooltip: false },
 ])
 
 const tableConfig = ref({
@@ -50,13 +50,13 @@ const handleColumnDragEnd = (data: any) => {
 }
 
 
-const reserve = (reserve:string) => {
-  switch(reserve){
+const reserve = (reserve: string) => {
+  switch (reserve) {
     case '1':
       return '综述'
     case 'H':
       return '偏高'
-    case 'L':  
+    case 'L':
       return '偏低'
     case 'P':
       return '阳性'
@@ -72,5 +72,4 @@ const reserve = (reserve:string) => {
 
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/liswork/xmKnowledge/index.vue b/src/views/liswork/xmKnowledge/index.vue
index a638940..74026cd 100644
--- a/src/views/liswork/xmKnowledge/index.vue
+++ b/src/views/liswork/xmKnowledge/index.vue
@@ -1,20 +1,22 @@
 <template>
   <div class="app-container">
     <div class="topForm">
-      <el-form ref="formRef" :model="formData" inline label-width="80px" class="mb8" @submit.prevent="handleSubmit">
+      <el-form ref="formRef" :model="formData" inline label-width="80px" @submit.prevent="handleSubmit">
         <el-form-item label="检索" prop="js">
           <el-input placeholder="项目代号，名称，简拼" v-model="formData.js" style="width: 200px;"
             @keyup.enter="getList"></el-input>
         </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onQueryClick">查询</el-button>
+        </el-form-item>
       </el-form>
     </div>
     <el-row>
-      <el-button type="primary" @click="onQueryClick">查询</el-button>
       <el-button type="primary" @click="onAddClick">新增</el-button>
-      <el-button type="primary" @click="onDelClick">删除</el-button>
+      <el-button type="danger" @click="onDelClick">删除</el-button>
     </el-row>
-    <el-row>
-      <el-col :span="17">
+    <el-row :gutter="20" class="table-row">
+      <el-col :span="17" class="table-col">
         <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
           @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClick" @row-click="onClick"
           :pagination="pagination" @size-change="sizeChange" @page-change="currentChange">
@@ -23,7 +25,7 @@
           </template>
         </CustomTable>
       </el-col>
-      <el-col :span="7">
+      <el-col :span="7" class="table-col">
         <TableRight :data-list="dataListRight" />
       </el-col>
     </el-row>
@@ -63,7 +65,7 @@ const columnsLeft = ref([
 
 const tableConfig = ref({
   border: true, // 边框
-  height: '85vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // cellStyle: cellStyleHd
 })
@@ -158,12 +160,12 @@ onMounted(() => {
 </script>
 
 <style scoped lang="scss">
-.el-row {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-.topForm {
+.table-row {
+  height: calc(100% - 150px);
   margin-top: 10px;
+
+  .table-col {
+    height: 100%;
+  }
 }
 </style>
diff --git a/src/views/liswork/xmmb/index.vue b/src/views/liswork/xmmb/index.vue
new file mode 100644
index 0000000..676948a
--- /dev/null
+++ b/src/views/liswork/xmmb/index.vue
@@ -0,0 +1,192 @@
+/**
+* @file index.vue
+* @author: w
+* @since: 2025-12-24
+*/
+
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-col :span="12">
+        <el-button type="primary" @click="handleAdd">新增</el-button>
+        <el-button type="danger" @click="handleDel">删除</el-button>
+      </el-col>
+    </el-row>
+    <el-row class="table-row" style="margin-top: 10px;">
+      <el-col :span="24" class="table-col">
+        <CustomTable ref="tableRef" v-model:data="tableData" :columns="columns" :config="tableConfig"
+          @row-dblclick="handleRowDblclick">
+          <template #yq="{ row }">
+            {{ formatInstr(row.yq) }}
+          </template>
+          <template #yblx="{ row }">
+            {{ formatYblx(row.yblx) }}
+          </template>
+          <template #zdsr="{ row }">
+            <el-checkbox :model-value="row.zdsr == 'Y'" />
+          </template>
+        </CustomTable>
+      </el-col>
+      <el-dialog :title="title" v-model="visible" width="50vw" :close-on-click-modal="false" :draggable="true">
+        <el-row :gutter="15">
+          <el-col :span="10">
+            <el-form ref="formRef" :model="formData" label-width="150px">
+              <el-form-item label="仪器" prop="yq">
+                <YQSelectTable v-model:data="formData.yq" :disabled="disabled" />
+              </el-form-item>
+              <el-form-item label="模板名称" prop="mbmc">
+                <el-input v-model="formData.mbmc" />
+              </el-form-item>
+              <el-form-item label="输入编号" prop="srbh">
+                <el-input v-model="formData.srbh" />
+              </el-form-item>
+              <el-form-item label="标本类型" prop="yblx">
+                <SelectTable v-model:data="formData.yblx" :tableData="regdictList" />
+              </el-form-item>
+              <el-form-item label="" prop="zdsr">
+                <el-checkbox v-model="formData.zdsr" label="自动输入" true-value="Y" false-value="N" />
+              </el-form-item>
+              <el-form-item label="自动输入起始标本号" prop="qsybh">
+                <el-input v-model="formData.qsybh" />
+              </el-form-item>
+              <el-form-item label="自动输入结束标本号" prop="jsybh">
+                <el-input v-model="formData.jsybh" />
+              </el-form-item>
+            </el-form>
+          </el-col>
+          <el-col :span="14">
+            <div class="mb10">
+              <el-button type="primary" @click="handleSave">保存</el-button>
+              <el-button type="primary" @click="handleAdd">新增</el-button>
+              <el-button type="danger" @click="handleDel">删除</el-button>
+            </div>
+            <div style="height: 400px">
+              <CustomTable ref="tableRefRight" :data="rightTableData" :columns="rightColumns" :config="tableConfig">
+                <template #xmdh="{ row }">
+                  {{ row.xmdh }} {{ row.xmmc }}
+                </template>
+              </CustomTable>
+            </div>
+          </el-col>
+        </el-row>
+
+
+      </el-dialog>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
+// @ts-ignore
+import { listregdict } from "@/api/regional/dict/regdict.js";
+import { queryMbList, queryDetail } from '@/api/liswork/xmmb';
+import { formatInstr, getYqData } from '@/hooks'
+
+const disabled = ref(false)
+const formData = ref({
+  yq: '',
+  mbmc: '',
+  srbh: '',
+  yblx: '',
+  zdsr: '',
+  qsybh: '',
+  jsybh: '',
+})
+const title = ref('')
+const visible = ref(false)
+const tableData = ref([])
+const columns = ref([
+  { prop: 'yq', label: '仪器', visible: true, align: 'center', slot: 'yq' },
+  { prop: 'mbmc', label: '输入模板', visible: true, align: 'center', },
+  { prop: 'srbh', label: '输入编号', visible: true, align: 'center', },
+  { prop: 'yblx', label: '样本类型', visible: true, align: 'center', slot: 'yblx' },
+  { prop: 'zdsr', label: '自动输入', visible: true, align: 'center', slot: 'zdsr' },
+  { prop: 'qsybh', label: '起始号', visible: true, align: 'center', },
+  { prop: 'jsybh', label: '结束号', visible: true, align: 'center', },
+])
+
+const tableConfig = ref({
+  height: '100%', // 高度
+  border: true, // 边框
+  highlightCurrentRow: true, // 当前行高亮
+})
+
+const regdictList = ref<Array<{ value: string, label: string }>>([])
+const rightTableData = ref([])
+const rightColumns = ref([
+  { prop: 'xmdh', label: '检验项目', visible: true, align: 'center', slot: 'xmdh' },
+  { prop: 'mrz', label: '默认值', visible: true, align: 'center', },
+])
+
+const handleAdd = () => {
+  formData.value = {
+    yq: '',
+    mbmc: '',
+    srbh: '',
+    yblx: '',
+    zdsr: '',
+    qsybh: '',
+    jsybh: '',
+  }
+  disabled.value = false
+  rightTableData.value = []
+  title.value = '新增模板'
+  visible.value = true
+}
+
+const handleRowDblclick = (row: any) => {
+  queryDetail(row).then((res: any) => {
+    rightTableData.value = res.data
+  })
+  row.yq = row.yq.trim()
+  formData.value = row
+  disabled.value = true
+  title.value = '编辑模板'
+  visible.value = true
+}
+const handleSave = () => { }
+const handleDel = () => { }
+const getList = () => {
+  queryMbList().then((res: any) => {
+    tableData.value = res.data
+  })
+}
+
+getList()
+onMounted(() => {
+  getYqData()
+  // 获取标本类型
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'BT' }).then((res: any) => {
+    regdictList.value = res.rows.map((item: any) => {
+      return {
+        label: item.dictName,
+        value: item.dictCode
+      }
+    })
+  })
+})
+
+const formatYblx = (v: string) => {
+  return regdictList.value.find((item: any) => item.value == v)?.label || v
+}
+</script>
+
+<style scoped lang="scss">
+.table-row {
+  height: calc(100% - 60px);
+
+  .table-col {
+    height: 100%;
+  }
+
+  .right-col {
+    padding-top: 5px;
+    border: 1px solid #ccc;
+  }
+}
+
+.el-form-item {
+  margin-bottom: 10px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/xmFeeInstr/index.vue b/src/views/liswork/xtwh/xmFeeInstr/index.vue
index b4d138b..6b4cbf3 100644
--- a/src/views/liswork/xtwh/xmFeeInstr/index.vue
+++ b/src/views/liswork/xtwh/xmFeeInstr/index.vue
@@ -13,16 +13,16 @@
           <el-button type="primary" @click="onQueryClick">查询</el-button>
         </el-form-item>
         <el-form-item>
-          <span>说明：双击左侧列表，能删除对照数据，双击右边列表能新增数据到对照当中</span>
+          <span class="tips">说明：双击左侧列表，能删除对照数据，双击右边列表能新增数据到对照当中</span>
         </el-form-item>
       </el-form>
     </el-row>
-    <el-row>
-      <el-col :span="5">
-        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
-          @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClickLeft" />
+    <el-row :gutter="20" class="table-row">
+      <el-col :span="6" class="table-col">
+        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :config="tableConfig"
+          @row-dblclick="onDBClickLeft" />
       </el-col>
-      <el-col :span="19">
+      <el-col :span="18" class="table-col">
         <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true"
           @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClickRight" />
       </el-col>
@@ -42,36 +42,31 @@ import { ElMessage } from 'element-plus';
 
 const tableConfig = ref({
   border: true, // 边框
-  height: '76vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
-  // cellStyle: cellStyleHd
 })
 
 //退拽属性
 const handleColumnDragEnd = (data: any) => {
-  // 更新列配置
-  columnsLeft.value = data.columns;
   columnsRight.value = data.columns;
 }
 
 const columnsLeft = ref([
-  { prop: 'sfxmmc', label: '当前仪器对应的收费项目', visible: true, align: 'center', width: 300 },
+  { prop: 'sfxmmc', label: '当前仪器对应的收费项目', visible: true, },
   { prop: 'yq', label: '仪器', visible: false, align: 'center', width: 100 },
 ]);
 const columnsRight = ref([
-  { prop: 'xmlb', label: '类别', visible: true, align: 'center', width: 100 },
-  { prop: 'sfxmdh', label: '收费项目代号', visible: true, align: 'center', width: 200 },
-  { prop: 'sfxmmc', label: '收费项目名称', visible: true, align: 'center', width: 300 },
-  { prop: 'dj', label: '单价', visible: true, align: 'center', width: 100 },
-  { prop: 'cp_yq', label: '分配了仪器', visible: true, align: 'center', width: 400 }
+  { prop: 'xmlb', label: '类别', visible: true, align: 'center', },
+  { prop: 'sfxmdh', label: '收费项目代号', visible: true, align: 'center', },
+  { prop: 'sfxmmc', label: '收费项目名称', visible: true, align: 'center', },
+  { prop: 'dj', label: '单价', visible: true, align: 'center', },
+  { prop: 'cp_yq', label: '分配了仪器', visible: true, align: 'center', }
 ]);
 
-const dataListLeft = ref([
-  { 'sfxmdh': '', 'yq': '' }
-])
+const dataListLeft = ref([])
 const dataListRight = ref([])
 const formData = ref({
-  yq: '',
+  yq: '46',
   item: ''
 })
 
@@ -115,9 +110,23 @@ const onQueryClick = () => {
   getList()
 }
 
-
-
+getList()
 
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.tips {
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-size: 16px;
+  color: #409eff;
+  font-weight: 600;
+}
+
+.table-row {
+  height: calc(100% - 58px);
+
+  .table-col {
+    height: 100%;
+  }
+}
+</style>
diff --git a/src/views/liswork/xtwh/xmReqItemVs/index.vue b/src/views/liswork/xtwh/xmReqItemVs/index.vue
index 3018786..c92c63a 100644
--- a/src/views/liswork/xtwh/xmReqItemVs/index.vue
+++ b/src/views/liswork/xtwh/xmReqItemVs/index.vue
@@ -3,10 +3,10 @@
   <div class="app-container">
     <el-form ref="form" :model="formData" label-width="80px" inline>
       <el-form-item label="仪器" prop="yq">
-        <YQSelectTable v-model:data="formData.yq" width="200px" placeholder="请输入仪器名称" @get-data-value="getList" />
+        <YQSelectTable v-model:data="formData.yq" width="200px" placeholder="请输入仪器名称" @get-data-value="getDataValue" />
       </el-form-item>
       <el-form-item label="项目" prop="xmdh">
-        <el-input placeholder="请输入项目名称" v-model="formData.xmdh" style="width: 200px;"></el-input>
+        <el-input placeholder="请输入项目名称" v-model="formData.sqxmmc" style="width: 200px;" @keyup.enter="getList" />
       </el-form-item>
       <el-form-item>
         <el-checkbox v-model="formData.sl" label="只看仪器对照收费项目" true-value="1" false-value="" @change="getList" />
@@ -15,7 +15,8 @@
 
     <el-row>
       <el-button type="primary" icon="Plus" @click="onClickAdd">新增</el-button>
-      <el-button type="primary" icon="Delete" @click="onClickDel">删除</el-button>
+      <el-button type="danger" icon="Delete" @click="onClickDel">删除</el-button>
+      <el-button type="primary" icon="Edit" @click="searchHandle">搜索申请项目</el-button>
       <el-button type="primary" icon="Edit" @click="onClickSave">保存</el-button>
     </el-row>
 
@@ -26,10 +27,9 @@
       </el-col>
       <el-col :span="16" class="table-col">
         <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true"
-          @column-drag-end="handleColumnDragEnd" :config="tableConfig">
+          @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-click="rowHandle">
           <template #xmdh="{ row }">
-            {{ row.xmdh }} {{ row.xmmc }}
-            <!-- <SelectTable v-model:data="row.xmdh" :tableData="dataListLeft" class="full-width-input" /> -->
+            <SelectTable v-model:data="row.xmdh" :tableData="xmList" class="full-width-input" :keyValue="true" />
           </template>
           <template #tdh="{ row }">
             <el-input placeholder="" v-model="row.tdh" class="full-width-input"></el-input>
@@ -37,6 +37,9 @@
           <template #mrz="{ row }">
             <el-input v-model="row.mrz" class="full-width-input"></el-input>
           </template>
+          <template #seq="{ row }">
+            <el-input v-model="row.seq" class="full-width-input"></el-input>
+          </template>
           <template #def="{ row }">
             <el-checkbox v-model="row.def" true-value="1" false-value="0" />
           </template>
@@ -48,17 +51,28 @@
 </template>
 
 <script setup lang="ts">
-import { queryListService, queryDetailService } from '@/api/liswork/xtwh/xmReqItemVsApi';
+import { queryListService, queryDetailService, queryOldxminfo, addXminfo, delXminfo, searchxminfo } from '@/api/liswork/xtwh/xmReqItemVsApi';
 import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
 import CustomTable from '@/components/elTable/index.vue'
+import { ElMessage } from 'element-plus';
 
 const formData = ref({
   yq: '46',
-  xmdh: '',
+  sqxmmc: '',
   sl: ''
 })
+
+interface tableItem {
+  xmdh: string;
+  tdh: string;
+  mrz: string;
+  seq: number;
+  def: string;
+}
 const dataListLeft = ref([])
-const dataListRight = ref([])
+const dataListRight = ref<tableItem[]>([])
+const xmList = ref([])
+const selectRow = ref<any>(null)
 
 //退拽属性
 const handleColumnDragEnd = (data: any) => {
@@ -81,34 +95,95 @@ const columnsRight = ref([
   { prop: 'xmdh', label: '报告项目', visible: true, align: 'center', width: 250, slot: 'xmdh', showOverflowTooltip: false },
   { prop: 'tdh', label: '双工代号', visible: true, align: 'center', slot: 'tdh' },
   { prop: 'mrz', label: '默认值', visible: true, align: 'center', slot: 'mrz' },
-  { prop: 'seq', label: '序号', visible: true, align: 'center', },
+  { prop: 'seq', label: '序号', visible: true, align: 'center', slot: 'seq' },
   { prop: 'def', label: '非必做', visible: true, align: 'center', slot: 'def' },
 ]);
-
+const tableRefLeft = ref()
 // 获取数据列表
 const getList = async () => {
   const res = await queryListService(formData.value)
   dataListLeft.value = res.data
-  rowClickLeft(dataListLeft.value[0] || { sqxmdh: '', sqxmmc: '' })
+  if (dataListLeft.value.length) {
+    rowClickLeft(dataListLeft.value[0])
+    tableRefLeft.value?.setCurrentRow(dataListLeft.value[0])
+  } else {
+    dataListRight.value = []
+    selectRow.value = null
+  }
+}
+
+const rowHandle = (row: any) => {
+  selectRow.value = row
 }
 
 const onClickAdd = () => {
-  // TODO 新增
+  dataListRight.value.push({
+    xmdh: '',
+    tdh: '',
+    mrz: '',
+    seq: dataListRight.value.length + 1,
+    def: '0',
+  })
 }
 
 const onClickDel = () => {
-  // TODO 删除
+  if (!selectRow.value) return ElMessage.warning('请选择要删除的行！')
+
+  if (selectRow.value.sqxmdh) {
+    delXminfo(selectRow.value)
+    rowClickLeft(xmInfo.value)
+  } else {
+    dataListRight.value = dataListRight.value.filter(item => item.xmdh != selectRow.value.xmdh)
+  }
+  selectRow.value = null
 }
 
 const onClickSave = () => {
-  // TODO 保存    
+  dataListRight.value = dataListRight.value.filter(item => item.xmdh)
+  const arr = dataListRight.value.map(item => {
+    return {
+      ...item,
+      sqxmdh: xmInfo.value.sqxmdh,
+      sqxmmc: xmInfo.value.sqxmmc,
+      yq: formData.value.yq,
+    }
+  })
+
+  addXminfo(arr).then(() => {
+    ElMessage.success('保存成功')
+    rowClickLeft(xmInfo.value)
+  })
 }
 
+const searchHandle = () => {
+  searchxminfo({ yq: formData.value.yq })
+}
+const getDataValue = (value: any) => {
+  getOldXminfoList()
+  getList()
+}
+
+const xmInfo: any = ref({})
 //点击事件
 const rowClickLeft = async (row: any) => {
+  selectRow.value = null
+  xmInfo.value = row
   const res = await queryDetailService({ sqxmdh: row.sqxmdh, sqxmmc: row.sqxmmc, yq: formData.value.yq })
   dataListRight.value = res.rows
 }
+
+const getOldXminfoList = async () => {
+  const res = await queryOldxminfo({ yq: formData.value.yq })
+  xmList.value = res.data.map((item: any) => {
+    return {
+      label: item.xmmc,
+      value: item.xmdh,
+    }
+  })
+
+}
+
+getOldXminfoList()
 getList()
 </script>
 
diff --git a/src/views/regional/circulation/bbcx/index.vue b/src/views/regional/circulation/bbcx/index.vue
index 3636695..6afbf4c 100644
--- a/src/views/regional/circulation/bbcx/index.vue
+++ b/src/views/regional/circulation/bbcx/index.vue
@@ -71,20 +71,20 @@
         </el-row>
       </el-form>
     </div>
-
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange" @row-click="rowHandle">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
-
+    <div>
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange" @row-click="rowHandle">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
     <!-- 样本流程 -->
     <div class="time-line-box">
       <div v-for="(item, i) in timelineItems" :key="i" class="time-line-item">
@@ -258,6 +258,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 80px;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/circulation/bbqs/index.vue b/src/views/regional/circulation/bbqs/index.vue
index 8cc8f7c..cc059b6 100644
--- a/src/views/regional/circulation/bbqs/index.vue
+++ b/src/views/regional/circulation/bbqs/index.vue
@@ -60,20 +60,20 @@
       <el-button type="primary" @click="qsHandle(110)">标本拒签</el-button>
       <el-button type="primary" plain @click="bbThHandle">标本退回</el-button>
     </div>
-
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
-
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -113,7 +113,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '68vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // fit: true, // 列宽自适应
 })
@@ -228,6 +228,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 80px;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/circulation/bbth/index.vue b/src/views/regional/circulation/bbth/index.vue
index 845cc23..1c8881c 100644
--- a/src/views/regional/circulation/bbth/index.vue
+++ b/src/views/regional/circulation/bbth/index.vue
@@ -60,18 +60,20 @@
       <el-button type="primary" @click="thHandle(90)">申请作废</el-button>
 
     </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -109,7 +111,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '68vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // fit: true, // 列宽自适应
 })
@@ -200,6 +202,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 80px;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/circulation/sjdj/index.vue b/src/views/regional/circulation/sjdj/index.vue
index 73860e6..e88b2b5 100644
--- a/src/views/regional/circulation/sjdj/index.vue
+++ b/src/views/regional/circulation/sjdj/index.vue
@@ -69,20 +69,20 @@
         <el-col :span="1.5"> <el-button type="primary" :size="aotuSize" @click="sjHandle(20)">取消送检</el-button></el-col>
       </el-row>
     </div>
-
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
-
+    <div style="height: calc(100% - 180px);">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -121,7 +121,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '70vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // fit: true, // 列宽自适应
 })
@@ -229,6 +229,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 80px;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/statistics/bbtj/index.vue b/src/views/regional/statistics/bbtj/index.vue
index 66619c8..b272ab9 100644
--- a/src/views/regional/statistics/bbtj/index.vue
+++ b/src/views/regional/statistics/bbtj/index.vue
@@ -35,10 +35,12 @@
       <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
       <el-button type="primary" @click="thHandle(90)">申请作废</el-button> -->
     </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange">
+    <div style="height: calc(100% - 100px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange">
 
-    </CustomTable>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -70,7 +72,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '75vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   summary: true,
   summaryField: ['sl'],//计算列总和
@@ -156,6 +158,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 40px;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/statistics/fytj/index.vue b/src/views/regional/statistics/fytj/index.vue
index 0763c95..dfcbf7c 100644
--- a/src/views/regional/statistics/fytj/index.vue
+++ b/src/views/regional/statistics/fytj/index.vue
@@ -35,10 +35,12 @@
       <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
       <el-button type="primary" @click="thHandle(90)">申请作废</el-button> -->
     </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange">
+    <div style="height: calc(100% - 100px);">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange">
 
-    </CustomTable>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -71,7 +73,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '75vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   summary: true,
   summaryField: ['sl', 'cost'],//计算列总和
@@ -165,6 +167,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 40px;
+
   .el-form-item {
     margin-bottom: 5px;
   }

From be6b3623449b127e6e1c6a53d6cf4e10e66bb850 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Thu, 25 Dec 2025 16:34:51 +0800
Subject: [PATCH 2/7] =?UTF-8?q?=E7=B3=BB=E7=BB=9F=E6=89=93=E5=8D=B0?=
 =?UTF-8?q?=E6=A8=A1=E6=9D=BF=E7=AE=A1=E7=90=86?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/liswork/xtwh/reportdictApi.ts         |  54 ++
 src/views/liswork/xtwh/reportdict/index.vue   | 493 ++++++++++++++++++
 .../liswork/xtwh/reportsetting/reportlist.vue | 272 ++++++++++
 3 files changed, 819 insertions(+)
 create mode 100644 src/api/liswork/xtwh/reportdictApi.ts
 create mode 100644 src/views/liswork/xtwh/reportdict/index.vue
 create mode 100644 src/views/liswork/xtwh/reportsetting/reportlist.vue

diff --git a/src/api/liswork/xtwh/reportdictApi.ts b/src/api/liswork/xtwh/reportdictApi.ts
new file mode 100644
index 0000000..9bb1f7f
--- /dev/null
+++ b/src/api/liswork/xtwh/reportdictApi.ts
@@ -0,0 +1,54 @@
+//参数设置字典
+// @ts-ignore
+import request from '@/utils/request'
+
+// 查询字典列表
+export function listreportdict(params:any) {
+    return request({
+        url: '/reportdict/list',
+        method: 'get',
+        params
+    })
+}
+
+// 查询字典详细
+export function getreportdict(id:number) {
+    return request({
+        url: `/reportdict/${id}`,
+        method: 'get'
+    })
+}
+
+// 新增字典
+export function addreportdict(params:any) {
+    return request({
+        url: '/reportdict',
+        method: 'post',
+        data:params
+    })
+}
+
+// 修改字典
+export function updatereportdict(params:any) {
+    return request({
+        url: '/reportdict',
+        method: 'put',
+        data:params
+    })
+}
+
+// 删除字典
+export function delreportdict(id:any) {
+    return request({
+        url: `/reportdict/${id}`,
+        method: 'delete'
+    })
+
+}
+// 自动加载
+export function autoload() {
+    return request({
+        url: '/reportdict/autoload',
+        method: 'get'
+    })
+}
diff --git a/src/views/liswork/xtwh/reportdict/index.vue b/src/views/liswork/xtwh/reportdict/index.vue
new file mode 100644
index 0000000..871f2db
--- /dev/null
+++ b/src/views/liswork/xtwh/reportdict/index.vue
@@ -0,0 +1,493 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item :label="menuname + '类别'"  prop="reportType">
+        <el-select
+            v-model="queryParams.reportType"
+            :placeholder="`请选择${menuname}类别`"
+            clearable
+            style="width: 200px"
+            @change="handleQuery"
+        >
+          <el-option
+              v-for="item in reportTypeOptions"
+              :key="item.value"
+              :label="item.label"
+              :value="item.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item  label="模板文件名(.jrxml)"  prop="reportCode">
+        <el-input
+            v-model="queryParams.reportCode"
+            :placeholder="`请输入${menuname}编码`"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item :label="`${menuname}名称`" prop="reportName">
+        <el-input
+            v-model="queryParams.reportName"
+            :placeholder="`请输入${menuname}名称`"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="status">
+        <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
+          <el-option
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+        >新增模板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+        >删除模板</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="autoloading"
+        >自动加载</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+    <el-row :gutter="5" class="table-container">
+    <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange" class="report-table" height="100%">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column :label="`${menuname}类别`" align="center" prop="reportType" width="100" show-overflow-tooltip>
+        <template #default="scope">
+          <span
+              class="report-type-cell"
+              :style="{
+              backgroundColor: getreportTypeColor(scope.row.reportType),
+              color: '#fff' // 文字白色，保证对比
+            }"
+          >
+          {{ reportTypeOptions.find(item => item.value === scope.row.reportType)?.label || scope.row.reportType }}
+          </span>
+        </template>
+      </el-table-column>
+      <el-table-column label="编号" align="center" prop="reportId"  width="50" show-overflow-tooltip/>
+      <el-table-column label="模板文件名" align="center" prop="reportCode" width="150" show-overflow-tooltip />
+      <el-table-column :label="`${menuname}名称`" align="left" prop="reportName"  show-overflow-tooltip />
+      <el-table-column label="排版类别" align="center" prop="reportOptiontype"width="80">
+        <template #default="scope">
+           <span>
+          {{ reportOptiontypeOptions.find(item => item.value === scope.row.reportOptiontype)?.label || scope.row.reportOptiontype }}
+           </span>
+        </template>
+
+      </el-table-column>
+      <el-table-column label="参数" align="center" prop="reportDefvalue"  show-overflow-tooltip />
+      <el-table-column label="备注" align="left" prop="remark"  show-overflow-tooltip />
+      <el-table-column label="排序" align="center" prop="reportSort" width="80" />
+      <el-table-column label="状态" align="center" prop="status" width="80">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="150" show-overflow-tooltip>
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="400" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" >修改</el-button>
+          <el-button link type="primary" icon="Link" @click="handleDelete(scope.row)" >预览模板</el-button>
+          <el-button link type="primary" icon="Upload" @click="uploadfile(scope.row)" >更替模板</el-button>
+          <el-button link type="primary" icon="Download" @click="downloadfile(scope.row)" >下载模板</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+      </el-row>
+    <!-- 添加或修改模板对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+
+      <el-form ref="reportdictRef" :model="form" :rules="rules" label-width="150px">
+        <el-form-item :label="`${menuname}类别`" prop="reportType">
+          <el-select
+              v-model="form.reportType"
+              :placeholder="`请选择${menuname}类别`"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in reportTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item label="模板文件名(.jrxml)" prop="reportCode">
+          <el-input v-model="form.reportCode" :placeholder="`请输入${menuname}编码`" disabled class="disabled-input-gray"/>
+        </el-form-item>
+        <el-form-item :label="`${menuname}名称`" prop="reportName">
+          <el-input v-model="form.reportName" :placeholder="`请输入${menuname}名称`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}排版类别`" prop="reportOptiontype">
+          <el-select
+              v-model="form.reportOptiontype"
+              :placeholder="`请选择${menuname}排版类别`"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in reportOptiontypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}参数`" prop="reportDefvalue">
+          <el-input v-model="form.reportDefvalue" :placeholder="`请输入${menuname}参数`" />
+        </el-form-item>
+
+        <el-form-item label="顺序" prop="reportSort">
+          <el-input-number v-model="form.reportSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+                v-for="dict in sys_normal_disable"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+    <!-- 用户导入对话框 -->
+    <el-dialog :title="upload.title" v-model="upload.open" width="400px" append-to-body>
+      <el-upload ref="uploadRef" :limit="1" accept=".jrxml" :headers="upload.headers"
+                 :action="upload.url + '?reportId=' + upload.reportId" :disabled="upload.isUploading"
+                 :on-progress="handleFileUploadProgress" :on-success="handleFileSuccess" :auto-upload="false" drag>
+        <el-icon class="el-icon--upload"><upload-filled /></el-icon>
+        <div class="el-upload__text">将文件拖到此处，或<em>点击上传</em></div>
+        <template #tip>
+          <div class="el-upload__tip text-center">
+            <span>仅允许导入jrxml格式文件。</span>
+          </div>
+        </template>
+      </el-upload>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitFileForm">确 定</el-button>
+          <el-button @click="upload.open = false">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="reportdict">
+import { getToken } from "@/utils/auth";
+import {
+  addreportdict, delreportdict,
+  getreportdict,
+  listreportdict,
+  updatereportdict,autoload
+} from "@/api/liswork/xtwh/reportdictApi.ts";
+// 1. 定义类别下拉选项（根据实际业务调整）
+const reportTypeOptions = ref([
+  { label: "检验报告", value: "0",color: "#56BBBD" },
+  { label: "条码标签", value: "1",color: "#67C23A" },
+  { label: "回单标签", value: "2",color: "#7E84F7" },
+  { label: "统计报表", value: "3",color: "#F08784" },
+  { label: "其他报表", value: "4",color: "#909399" },
+]);
+// 2. 定义获取类别对应颜色的方法
+function getreportTypeColor(type) {
+  // 匹配对应类别的颜色，无匹配时用默认色
+  const item = reportTypeOptions.value.find(item => item.value === type);
+  return item?.color || "#909399"; // 默认灰色
+}
+// 2. 定义参数类别下拉选项（根据实际业务调整）
+const reportOptiontypeOptions = ref([
+  { label: "默认", value: "0",color: "#56BBBD" },
+  { label: "单列", value: "1",color: "#67C23A" },
+  { label: "双列", value: "2",color: "#FF443F" },
+  { label: "单列带图", value: "3",color: "#F08784" },
+  { label: "双列带图", value: "4",color: "#909399" },
+  { label: "细菌阳性", value: "5",color: "#3282F6" },
+  { label: "细菌阴性", value: "6",color: "#507F80" },
+  { label: "标签", value: "7",color: "#7E84F7" },
+  { label: "回单", value: "8",color: "#377D22" },
+]);
+function getreportOptionTypeColor(type) {
+  // 匹配对应类别的颜色，无匹配时用默认色
+  const item = reportOptiontypeOptions.value.find(item => item.value === type);
+  return item?.color || "#909399"; // 默认灰色
+}
+/*** 用户导入参数 */
+const upload = reactive({
+  // 是否显示弹出层（用户导入）
+  open: false,
+  // 弹出层标题（用户导入）
+  title: "",
+  // 是否禁用上传
+  isUploading: false,
+  // 更新的模板号
+  reportId: 0,
+  // 设置上传的请求头部
+  headers: { Authorization: "Bearer " + getToken() },
+  // 上传的地址
+  url: import.meta.env.VITE_APP_BASE_API + "/reportdict/importfile"
+});
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+const regdictList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+const menuname = ref("报表模板");
+const data = reactive({
+  form: {},
+  queryParams: {
+    reportCode: undefined,
+    reportName: undefined,
+    reportType:"0",
+    status: undefined
+  },
+  rules: {
+    reportType: [{ required: true, message: menuname.value+"类别不能为空", trigger: "blur" }],
+    reportName: [{ required: true, message: menuname.value+"名称不能为空", trigger: "blur" }],
+    reportCode: [{ required: true, message: menuname.value+"编码不能为空", trigger: "blur" }],
+    reportSort: [{ required: true, message: menuname.value+"顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询模板列表 */
+function getList() {
+  loading.value = true;
+  listreportdict(queryParams.value).then(response => {
+    console.log('response:', response);
+    regdictList.value = response.data;
+    total.value = response.data.length;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    reportId: undefined,
+    reportCode: undefined,
+    reportName: undefined,
+    reportType: reportTypeOptions.value[0]?.value || "",
+    reportOptiontype: reportOptiontypeOptions.value[0]?.value || "",
+    reportDefvalue:undefined,
+    reportSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("reportdictRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.reportId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  upload.reportId=0;
+  upload.title = "新增模板";
+  upload.open = true;
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const reportId = row.reportId || ids.value;
+  getreportdict(reportId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改"+menuname.value;
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["reportdictRef"].validate(valid => {
+    if (valid) {
+
+      if (form.value.reportId != undefined) {
+        updatereportdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        addreportdict(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/**文件上传中处理 */
+const handleFileUploadProgress = (event, file, fileList) => {
+  upload.isUploading = true;
+};
+/** 文件上传成功处理 */
+const handleFileSuccess = (response, file, fileList) => {
+  upload.open = false;
+  upload.isUploading = false;
+  proxy.$refs["uploadRef"].handleRemove(file);
+  proxy.$alert("<div style='overflow: auto;overflow-x: hidden;max-height: 70vh;padding: 10px 20px 0;'>" + response.msg + "</div>", "导入结果", { dangerouslyUseHTMLString: true });
+  handleQuery()
+};
+/** 提交上传文件 */
+function submitFileForm() {
+  proxy.$refs["uploadRef"].submit();
+};
+/** 导入按钮操作 */
+function uploadfile(row) {
+  upload.reportId= row.reportId;
+  upload.title = "模板上传";
+  upload.open = true;
+};
+/** 下载模板操作 */
+function downloadfile(row) {
+  const params = {
+    filename: row.reportCode
+  };
+  proxy.download("reportdict/downloadfile", params, `${row.reportCode}.jrxml`);
+};
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const reportIds = row.reportId || ids.value;
+  proxy.$modal.confirm('是否确认删除"' + menuname.value + '"编号为"' + reportIds + '"的数据项？').then(function() {
+
+    return delreportdict(reportIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("delreportdict/export", {
+    ...queryParams.value
+  }, `dict_${new Date().getTime()}.xlsx`);
+}
+
+function  autoloading(){
+  loading.value = true;
+    autoload().then(response => {
+    getList();
+    loading.value = false;
+  });
+}
+getList();
+</script>
+<style scoped>
+.app-container {
+  display: flex;
+  flex-direction: column;
+  height: 90vh;
+  /* 容器高度等于窗口高度 */
+  overflow: hidden;
+}
+.mb8 {
+  height: 30px;
+  /* 固定高度 */
+}
+.table-container {
+  flex: 1;
+  /* 占满剩余高度 */
+  overflow: hidden;
+  /* 避免表格超出容器 */
+}
+/* 1. 减小表格行高（核心） */
+:deep(.report-table .el-table__row) {
+  height: 30px !important; /* 原默认行高约40px，按需调整（建议28-35px） */
+  line-height: 30px !important; /* 行高与height一致，保证垂直居中 */
+}
+
+/* 2. 减小单元格内边距（配合行高优化） */
+:deep(.report-table .el-table__cell) {
+  padding: 2px 4px !important;
+  height: 30px !important; /* 单元格高度与行高一致 */
+  line-height: 1.2 !important; /* 文字行高适配矮行 */
+  vertical-align: middle !important; /* 强制垂直居中 */
+}
+
+/* 3. 类别单元格适配矮行高 */
+.report-type-cell {
+  width: 100%;
+  height: 100%;
+  min-height: 26px; /* 适配30px行高，略小一点 */
+  display: flex;
+  align-items: center;
+  justify-content: center;
+  padding: 0;
+  font-size: 12px;
+}
+
+/* 可选：优化操作列按钮大小，适配矮行 */
+:deep(.report-table .el-button--link) {
+  padding: 0 4px !important;
+  font-size: 12px !important;
+}
+.disabled-input-gray :deep(.el-input__inner){
+  background-color: #e9e9e9 !important;  /* 灰色底色（可根据需求调整色值） */
+  color: #666 !important;                /* 文字颜色加深，提升可读性 */
+  cursor: not-allowed !important;        /* 鼠标悬浮显示禁止图标 */
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/reportsetting/reportlist.vue b/src/views/liswork/xtwh/reportsetting/reportlist.vue
new file mode 100644
index 0000000..fa60482
--- /dev/null
+++ b/src/views/liswork/xtwh/reportsetting/reportlist.vue
@@ -0,0 +1,272 @@
+<template>
+  <div class="app-container">
+    <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
+      <el-form-item label="模板编码" prop="zddh">
+        <el-input
+            v-model="queryParams.zddh"
+            placeholder="请输入模板编码"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="模板名称" prop="zdmc">
+        <el-input
+            v-model="queryParams.zdmc"
+            placeholder="请输入模板名称"
+            clearable
+            style="width: 200px"
+            @keyup.enter="handleQuery"
+        />
+      </el-form-item>
+      <el-form-item label="状态" prop="userflag">
+        <el-select v-model="queryParams.userflag" placeholder="模板状态" clearable style="width: 200px">
+          <el-option
+              v-for="dict in sys_normal_disable"
+              :key="dict.value"
+              :label="dict.label"
+              :value="dict.value"
+          />
+        </el-select>
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" icon="Search" @click="handleQuery">搜索</el-button>
+        <el-button icon="Refresh" @click="resetQuery">重置</el-button>
+      </el-form-item>
+    </el-form>
+
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button
+            type="primary"
+            plain
+            icon="Plus"
+            @click="handleAdd"
+        >新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="success"
+            plain
+            icon="Edit"
+            :disabled="single"
+            @click="handleUpdate"
+        >修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="danger"
+            plain
+            icon="Delete"
+            :disabled="multiple"
+            @click="handleDelete"
+        >删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button
+            type="warning"
+            plain
+            icon="Download"
+            @click="handleExport"
+        >导出</el-button>
+      </el-col>
+      <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
+    </el-row>
+
+    <el-table v-loading="loading" :data="diagnosisList" @selection-change="handleSelectionChange">
+      <el-table-column type="selection" width="55" align="center" />
+      <el-table-column label="模板编码" align="center" prop="zddh" />
+      <el-table-column label="模板名称" align="center" prop="zdmc" />
+      <el-table-column label="模板排序" align="center" prop="diagSort" />
+      <el-table-column label="状态" align="center" prop="userflag">
+        <template #default="scope">
+          <dict-tag :options="sys_normal_disable" :value="scope.row.userflag" />
+        </template>
+      </el-table-column>
+      <el-table-column label="创建时间" align="center" prop="createTime" width="180">
+        <template #default="scope">
+          <span>{{ parseTime(scope.row.createTime) }}</span>
+        </template>
+      </el-table-column>
+      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+        <template #default="scope">
+          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" >修改</el-button>
+          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" >删除</el-button>
+        </template>
+      </el-table-column>
+    </el-table>
+
+    <pagination
+        v-show="total > 0"
+        :total="total"
+        v-model:page="queryParams.pageNum"
+        v-model:limit="queryParams.pageSize"
+        @pagination="getList"
+    />
+
+    <!-- 添加或修改模板对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="diagnosisRef" :model="form" :rules="rules" label-width="80px">
+        <el-form-item label="模板名称" prop="diagName">
+          <el-input v-model="form.diagName" placeholder="请输入模板名称" />
+        </el-form-item>
+        <el-form-item label="模板编码" prop="diagCode">
+          <el-input v-model="form.diagCode" placeholder="请输入编码名称" />
+        </el-form-item>
+        <el-form-item label="模板顺序" prop="diagSort">
+          <el-input-number v-model="form.diagSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="模板状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio
+                v-for="dict in sys_normal_disable"
+                :key="dict.value"
+                :label="dict.value"
+            >{{ dict.label }}</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup name="diagnosis">
+import { listdiagnosis, adddiagnosis, deldiagnosis, getdiagnosis, updatediagnosis } from "@/api/regional/dict/diagnosis";
+
+const { proxy } = getCurrentInstance();
+const { sys_normal_disable } = proxy.useDict("sys_normal_disable");
+
+const diagnosisList = ref([]);
+const open = ref(false);
+const loading = ref(true);
+const showSearch = ref(true);
+const ids = ref([]);
+const single = ref(true);
+const multiple = ref(true);
+const total = ref(0);
+const title = ref("");
+
+const data = reactive({
+  form: {},
+  queryParams: {
+    pageNum: 1,
+    pageSize: 15,
+    diagCode: undefined,
+    diagName: undefined,
+    status: undefined
+  },
+  rules: {
+    diagName: [{ required: true, message: "模板名称不能为空", trigger: "blur" }],
+    diagCode: [{ required: true, message: "模板编码不能为空", trigger: "blur" }],
+    diagSort: [{ required: true, message: "模板顺序不能为空", trigger: "blur" }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+
+/** 查询模板列表 */
+function getList() {
+  loading.value = true;
+  listdiagnosis(queryParams.value).then(response => {
+    diagnosisList.value = response.rows;
+    total.value = response.total;
+    loading.value = false;
+  });
+}
+/** 取消按钮 */
+function cancel() {
+  open.value = false;
+  reset();
+}
+/** 表单重置 */
+function reset() {
+  form.value = {
+    diagId: undefined,
+    diagCode: undefined,
+    diagName: undefined,
+    diagSort: 0,
+    status: "0",
+    remark: undefined
+  };
+  proxy.resetForm("diagnosisRef");
+}
+/** 搜索按钮操作 */
+function handleQuery() {
+  queryParams.value.pageNum = 1;
+  getList();
+}
+/** 重置按钮操作 */
+function resetQuery() {
+  proxy.resetForm("queryRef");
+  handleQuery();
+}
+/** 多选框选中数据 */
+function handleSelectionChange(selection) {
+  ids.value = selection.map(item => item.diagId);
+  single.value = selection.length != 1;
+  multiple.value = !selection.length;
+}
+/** 新增按钮操作 */
+function handleAdd() {
+  reset();
+  open.value = true;
+  title.value = "添加模板";
+}
+/** 修改按钮操作 */
+function handleUpdate(row) {
+  reset();
+  const diagId = row.diagId || ids.value;
+  getdiagnosis(diagId).then(response => {
+    form.value = response.data;
+    open.value = true;
+    title.value = "修改模板";
+  });
+}
+/** 提交按钮 */
+function submitForm() {
+  proxy.$refs["diagnosisRef"].validate(valid => {
+    if (valid) {
+      if (form.value.diagId != undefined) {
+        updatediagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess("修改成功");
+          open.value = false;
+          getList();
+        });
+      } else {
+        adddiagnosis(form.value).then(response => {
+          proxy.$modal.msgSuccess("新增成功");
+          open.value = false;
+          getList();
+        });
+      }
+    }
+  });
+}
+/** 删除按钮操作 */
+function handleDelete(row) {
+  const diagIds = row.diagId || ids.value;
+  proxy.$modal.confirm('是否确认删除模板编号为"' + diagIds + '"的数据项？').then(function() {
+    return deldiagnosis(diagIds);
+  }).then(() => {
+    getList();
+    proxy.$modal.msgSuccess("删除成功");
+  }).catch(() => {});
+}
+/** 导出按钮操作 */
+function handleExport() {
+  proxy.download("system/diagnosis/export", {
+    ...queryParams.value
+  }, `diag_${new Date().getTime()}.xlsx`);
+}
+
+getList();
+</script>

From 5f0d568cb7607eeb09cfbd5336c8792e9782416e Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Thu, 25 Dec 2025 17:34:36 +0800
Subject: [PATCH 3/7] =?UTF-8?q?=E9=A1=B9=E7=9B=AE=E6=A8=A1=E6=9D=BF?=
 =?UTF-8?q?=E6=8E=A5=E5=8F=A3=E8=81=94=E8=B0=83?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/liswork/advancedReview/index.ts       |  12 ++
 src/api/liswork/xmmb/index.ts                 |  36 ++++-
 .../SelectTable/YQSelectTable/index.vue       |   4 +-
 src/views/liswork/advancedReview/index.vue    |  75 +++++++++
 src/views/liswork/xmmb/index.vue              | 151 +++++++++++++++---
 src/views/regional/circulation/bbcx/index.vue |   2 +-
 src/views/regional/circulation/bbqs/index.vue |   2 +-
 src/views/regional/circulation/bbth/index.vue |   2 +-
 src/views/regional/circulation/sjdj/index.vue |   2 +-
 9 files changed, 258 insertions(+), 28 deletions(-)
 create mode 100644 src/api/liswork/advancedReview/index.ts
 create mode 100644 src/views/liswork/advancedReview/index.vue

diff --git a/src/api/liswork/advancedReview/index.ts b/src/api/liswork/advancedReview/index.ts
new file mode 100644
index 0000000..9d9d696
--- /dev/null
+++ b/src/api/liswork/advancedReview/index.ts
@@ -0,0 +1,12 @@
+//@ts-ignore js语法检查忽略
+import request from '@/utils/request';
+
+
+//获取报告列表
+export function queryList(query?: Object) {
+  return request({
+    url: '/labCheckrules/queryList',
+    method: 'get',
+    params: query,
+  });
+}
\ No newline at end of file
diff --git a/src/api/liswork/xmmb/index.ts b/src/api/liswork/xmmb/index.ts
index 76fbe21..f03e9ca 100644
--- a/src/api/liswork/xmmb/index.ts
+++ b/src/api/liswork/xmmb/index.ts
@@ -17,4 +17,38 @@ export function queryDetail(query?: Object) {
     method: 'get',
     params: query,
   });
-}
\ No newline at end of file
+}
+// 新增模板
+export function addXmInfo(query?: Object) {
+  return request({
+    url: '/labInputmdl/add',
+    method: 'post',
+    data: query,
+  });
+}
+// 修改模板
+export function updateXmInfo(query?: Object) {
+  return request({
+    url: '/labInputmdl/update',
+    method: 'post',
+    data: query,
+  });
+}
+
+// 删除模板
+export function deleteXmInfo(query?: Object) {
+  return request({
+    url: '/labInputmdl/delete',
+    method: 'get',
+    params: query,
+  });
+}
+// 删除明细数据
+export function deleteDetail(query?: Object) {
+  return request({
+    url: '/labInputmdl/deleteDetail',
+    method: 'post',
+    data: query,
+  });
+}
+
diff --git a/src/components/SelectTable/YQSelectTable/index.vue b/src/components/SelectTable/YQSelectTable/index.vue
index ba01c4e..b0483eb 100644
--- a/src/components/SelectTable/YQSelectTable/index.vue
+++ b/src/components/SelectTable/YQSelectTable/index.vue
@@ -54,8 +54,8 @@ const getYqConfig = () => {
 }
 
 const getDataValue = (val: any) => {
-  emits('update:data', val.yq);
-  emits('getDataValue', val);
+  emits('update:data', val?.yq || null);
+  emits('getDataValue', val || null);
 };
 
 watch(() => props.data, (val) => {
diff --git a/src/views/liswork/advancedReview/index.vue b/src/views/liswork/advancedReview/index.vue
new file mode 100644
index 0000000..e6f3a72
--- /dev/null
+++ b/src/views/liswork/advancedReview/index.vue
@@ -0,0 +1,75 @@
+/**
+* @file index.vue 高级审核条件
+* @author: w
+* @since: 2025-12-25
+*/
+
+<template>
+  <div class="app-container">
+    <el-form ref="form" :model="queryParams" label-width="80px" inline>
+      <el-form-item label="仪器" prop="yq">
+        <YQSelectTable v-model:data="queryParams.yq" width="200px" clearable @get-data-value="getList" />
+      </el-form-item>
+    </el-form>
+    <div class="mb10">
+      <el-button type="primary" @click="handleAdd">新增</el-button>
+      <el-button type="primary" @click="handleSave">保存</el-button>
+      <el-button type="danger" @click="handleDel">删除</el-button>
+    </div>
+    <div style="height: calc(100% - 110px);">
+      <CustomTable ref="tableRef" v-model:data="tableData" :columns="columns" :config="tableConfig">
+        <template #yq="{ row }">
+
+        </template>
+      </CustomTable>
+    </div>
+
+  </div>
+</template>
+
+<script setup lang="ts">
+import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
+import { queryList } from '@/api/liswork/advancedReview';
+
+const queryParams = ref({
+  yq: '46',
+});
+
+const tableData = ref<Array<any>>([]);
+const columns = ref([
+  { label: '规则ID', prop: 'ruleid', visible: true, align: 'center', width: '80' },
+  { label: '条件类型', prop: 'checktype', visible: true, align: 'center', width: '150' },
+  { label: '审核启用', prop: 'logflag', visible: true, align: 'center', width: '80' },
+  { label: '组合条件(双击弹窗编辑)', prop: 'ruledisplay', visible: true, align: 'center', },
+  { label: '记录备注信息', prop: 'logcontent', visible: true, align: 'center', width: '300' },
+  { label: '组合条件', prop: 'checkrules', visible: true, align: 'center', },
+  { label: '自动审核', prop: 'autocheck', visible: true, align: 'center', width: '80' },
+]);
+
+const tableConfig = ref({
+  highlightCurrentRow: true,
+  border: true,
+  height: '100%'
+});
+
+const options = [
+  { label: '审核条件', value: '0' },
+  { label: '绝对禁止审核', value: '3' },
+  { label: '审核生成报告备注', value: '4' },
+]
+
+const handleAdd = () => {
+};
+const handleSave = () => {
+};
+const handleDel = () => {
+};
+const getList = () => {
+  queryList(queryParams.value).then((res: any) => {
+    tableData.value = res.data;
+  });
+};
+getList()
+</script>
+
+<style scoped lang="scss"></style>
diff --git a/src/views/liswork/xmmb/index.vue b/src/views/liswork/xmmb/index.vue
index 676948a..96b90d5 100644
--- a/src/views/liswork/xmmb/index.vue
+++ b/src/views/liswork/xmmb/index.vue
@@ -6,6 +6,18 @@
 
 <template>
   <div class="app-container">
+    <el-form ref="form" :model="queryParams" label-width="80px" inline>
+      <el-form-item label="仪器" prop="yq">
+        <YQSelectTable v-model:data="queryParams.yq" width="200px" clearable @get-data-value="getList" />
+      </el-form-item>
+      <el-form-item label="模板名称" prop="xmdh">
+        <el-input placeholder="请输入模板名称" v-model="queryParams.mbmc" style="width: 200px;" clearable
+          @keyup.enter="getList" />
+      </el-form-item>
+      <el-form-item>
+        <el-button type="primary" @click="getList">查询</el-button>
+      </el-form-item>
+    </el-form>
     <el-row>
       <el-col :span="12">
         <el-button type="primary" @click="handleAdd">新增</el-button>
@@ -15,7 +27,7 @@
     <el-row class="table-row" style="margin-top: 10px;">
       <el-col :span="24" class="table-col">
         <CustomTable ref="tableRef" v-model:data="tableData" :columns="columns" :config="tableConfig"
-          @row-dblclick="handleRowDblclick">
+          @row-dblclick="handleRowDblclick" @row-click="selectedRows = $event">
           <template #yq="{ row }">
             {{ formatInstr(row.yq) }}
           </template>
@@ -32,7 +44,7 @@
           <el-col :span="10">
             <el-form ref="formRef" :model="formData" label-width="150px">
               <el-form-item label="仪器" prop="yq">
-                <YQSelectTable v-model:data="formData.yq" :disabled="disabled" />
+                <YQSelectTable v-model:data="formData.yq" :disabled="disabled" @get-data-value="getOldXminfoList()" />
               </el-form-item>
               <el-form-item label="模板名称" prop="mbmc">
                 <el-input v-model="formData.mbmc" />
@@ -57,20 +69,23 @@
           <el-col :span="14">
             <div class="mb10">
               <el-button type="primary" @click="handleSave">保存</el-button>
-              <el-button type="primary" @click="handleAdd">新增</el-button>
-              <el-button type="danger" @click="handleDel">删除</el-button>
+              <el-button type="primary" @click="addItem">新增</el-button>
+              <el-button type="danger" @click="delItem">删除</el-button>
             </div>
             <div style="height: 400px">
-              <CustomTable ref="tableRefRight" :data="rightTableData" :columns="rightColumns" :config="tableConfig">
-                <template #xmdh="{ row }">
-                  {{ row.xmdh }} {{ row.xmmc }}
+              <CustomTable ref="tableRefRight" :data="rightTableData" :columns="rightColumns" :config="tableConfig"
+                @row-click="xmrowHandle">
+                <template #xmdh="{ row, $index }">
+                  <SelectTable v-model:data="row.xmdh" :tableData="xmList" class="full-width-input" :keyValue="true"
+                    @get-data-value="getXmInfo(row, $index)" />
+                </template>
+                <template #mrz="{ row }">
+                  <el-input v-model="row.mrz" class="full-width-input" />
                 </template>
               </CustomTable>
             </div>
           </el-col>
         </el-row>
-
-
       </el-dialog>
     </el-row>
   </div>
@@ -80,9 +95,16 @@
 import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
 // @ts-ignore
 import { listregdict } from "@/api/regional/dict/regdict.js";
-import { queryMbList, queryDetail } from '@/api/liswork/xmmb';
+import { queryMbList, queryDetail, addXmInfo, deleteDetail, updateXmInfo, deleteXmInfo } from '@/api/liswork/xmmb';
 import { formatInstr, getYqData } from '@/hooks'
+import { queryOldxminfo } from '@/api/liswork/xtwh/xmReqItemVsApi'
+import { ElMessage, ElMessageBox } from 'element-plus';
 
+
+const queryParams = ref({
+  yq: '',
+  mbmc: '',
+})
 const disabled = ref(false)
 const formData = ref({
   yq: '',
@@ -92,7 +114,9 @@ const formData = ref({
   zdsr: '',
   qsybh: '',
   jsybh: '',
+  oldMbmc: '',
 })
+const xmList = ref([])
 const title = ref('')
 const visible = ref(false)
 const tableData = ref([])
@@ -111,13 +135,22 @@ const tableConfig = ref({
   border: true, // 边框
   highlightCurrentRow: true, // 当前行高亮
 })
-
+const selectedRows: any = ref(null)
 const regdictList = ref<Array<{ value: string, label: string }>>([])
-const rightTableData = ref([])
+const rightTableData = ref<Array<{ xmdh: string, mrz: string }>>([])
 const rightColumns = ref([
-  { prop: 'xmdh', label: '检验项目', visible: true, align: 'center', slot: 'xmdh' },
-  { prop: 'mrz', label: '默认值', visible: true, align: 'center', },
+  { prop: 'xmdh', label: '检验项目', visible: true, align: 'center', slot: 'xmdh', showOverflowTooltip: false },
+  { prop: 'mrz', label: '默认值', visible: true, align: 'center', slot: 'mrz', showOverflowTooltip: false },
 ])
+const getOldXminfoList = async () => {
+  const res = await queryOldxminfo({ yq: formData.value.yq })
+  xmList.value = res.data.map((item: any) => {
+    return {
+      label: item.xmmc,
+      value: item.xmdh,
+    }
+  })
+}
 
 const handleAdd = () => {
   formData.value = {
@@ -128,6 +161,7 @@ const handleAdd = () => {
     zdsr: '',
     qsybh: '',
     jsybh: '',
+    oldMbmc: '',
   }
   disabled.value = false
   rightTableData.value = []
@@ -136,19 +170,94 @@ const handleAdd = () => {
 }
 
 const handleRowDblclick = (row: any) => {
-  queryDetail(row).then((res: any) => {
-    rightTableData.value = res.data
-  })
+  getDetailsList(row)
   row.yq = row.yq.trim()
+  row.oldMbmc = row.mbmc
   formData.value = row
+  getOldXminfoList()
   disabled.value = true
   title.value = '编辑模板'
   visible.value = true
 }
-const handleSave = () => { }
-const handleDel = () => { }
+
+const getDetailsList = (row: any) => {
+  queryDetail({ yq: row.yq, mbmc: row.mbmc }).then((res: any) => {
+    rightTableData.value = res.data
+  })
+}
+const handleSave = () => {
+  rightTableData.value = rightTableData.value.filter((item: any) => item.xmdh)
+  const arr = rightTableData.value.map((item: any, index: number) => {
+    return {
+      ...item,
+      mbmc: formData.value.mbmc,
+      oldMbmc: formData.value.oldMbmc,
+      yq: formData.value.yq,
+      xh: item.xh ? item.xh : index + 1,
+    }
+  })
+  if (disabled.value) {
+    updateXmInfo({ labInputmdl: formData.value, labInputmdlDetailList: arr }).then(() => {
+      ElMessage.success('修改成功')
+      getList()
+      visible.value = false
+    })
+  } else {
+    addXmInfo({ labInputmdl: formData.value, labInputmdlDetailList: arr }).then(() => {
+      ElMessage.success('新增成功')
+      getList()
+      visible.value = false
+    })
+  }
+}
+const xmInfo = ref<any>(null)
+const xmrowHandle = (row: any) => {
+  xmInfo.value = row
+}
+
+const getXmInfo = (row: any, currentIndex: any) => {
+  const prevXmdhList = rightTableData.value
+    .filter((_, index) => index < currentIndex)
+    .map(row => row.xmdh)
+    .filter(xmdh => !!xmdh);
+
+
+  if (prevXmdhList.includes(row.xmdh)) {
+    ElMessage.error(`当前项目编号【${row.xmdh}】与前面行重复，请重新选择！`);
+    rightTableData.value[currentIndex].xmdh = '';
+  }
+}
+
+const addItem = () => {
+  rightTableData.value.push({ xmdh: '', mrz: '', })
+}
+const delItem = () => {
+  if (!xmInfo.value) return ElMessage.warning('请选择要删除的行！')
+  if (xmInfo.value.yq) {
+    deleteDetail([xmInfo.value]).then((res: any) => {
+      if (res.code == 0) {
+        getDetailsList(formData.value)
+      }
+    })
+  } else {
+    rightTableData.value = rightTableData.value.filter(item => item.xmdh != xmInfo.value.xmdh)
+  }
+  xmInfo.value = null
+}
+const handleDel = () => {
+  if (!selectedRows.value) return ElMessage.warning('请选择要删除的记录')
+  ElMessageBox.confirm('确定要删除选中的数据吗？', '提示', {
+    type: 'warning'
+  }).then(() => {
+    deleteXmInfo(selectedRows.value).then(() => {
+      ElMessage.success('删除成功')
+      getList()
+      selectedRows.value = null
+    })
+  })
+}
 const getList = () => {
-  queryMbList().then((res: any) => {
+  queryMbList(queryParams.value).then((res: any) => {
     tableData.value = res.data
   })
 }
@@ -174,7 +283,7 @@ const formatYblx = (v: string) => {
 
 <style scoped lang="scss">
 .table-row {
-  height: calc(100% - 60px);
+  height: calc(100% - 100px);
 
   .table-col {
     height: 100%;
diff --git a/src/views/regional/circulation/bbcx/index.vue b/src/views/regional/circulation/bbcx/index.vue
index 6afbf4c..ba30d9b 100644
--- a/src/views/regional/circulation/bbcx/index.vue
+++ b/src/views/regional/circulation/bbcx/index.vue
@@ -258,7 +258,7 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
-  height: 80px;
+  height: 5rem;
 
   .el-form-item {
     margin-bottom: 5px;
diff --git a/src/views/regional/circulation/bbqs/index.vue b/src/views/regional/circulation/bbqs/index.vue
index cc059b6..23eeb61 100644
--- a/src/views/regional/circulation/bbqs/index.vue
+++ b/src/views/regional/circulation/bbqs/index.vue
@@ -228,7 +228,7 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
-  height: 80px;
+  height: 5rem;
 
   .el-form-item {
     margin-bottom: 5px;
diff --git a/src/views/regional/circulation/bbth/index.vue b/src/views/regional/circulation/bbth/index.vue
index 1c8881c..7de86a5 100644
--- a/src/views/regional/circulation/bbth/index.vue
+++ b/src/views/regional/circulation/bbth/index.vue
@@ -202,7 +202,7 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
-  height: 80px;
+  height: 5rem;
 
   .el-form-item {
     margin-bottom: 5px;
diff --git a/src/views/regional/circulation/sjdj/index.vue b/src/views/regional/circulation/sjdj/index.vue
index e88b2b5..42a4c59 100644
--- a/src/views/regional/circulation/sjdj/index.vue
+++ b/src/views/regional/circulation/sjdj/index.vue
@@ -229,7 +229,7 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
-  height: 80px;
+  height: 5rem;
 
   .el-form-item {
     margin-bottom: 5px;

From d2e810ad98f127babce4d68b43fd951bae23e859 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Thu, 25 Dec 2025 18:13:21 +0800
Subject: [PATCH 4/7] 1

---
 src/assets/styles/index.scss                  |   2 +-
 src/views/liswork/xmKnowledge/Modify.vue      | 182 ++++----
 src/views/liswork/xmKnowledge/TableData.vue   |  33 +-
 src/views/liswork/xmKnowledge/index.vue       | 100 ++---
 .../comopt-1/components/sysChannel/index.vue  | 108 +++++
 .../comopt-1/components/sysGlobal/index.vue   | 330 +++++++++++++++
 .../comopt-1/components/sysInput/index.vue    | 330 +++++++++++++++
 .../components/sysParameter/index.vue         | 389 ++++++++++++++++++
 .../comopt-1/components/sysReport/index.vue   |  12 +
 .../comopt-1/components/sysSort/index.vue     | 164 ++++++++
 src/views/liswork/xtwh/comopt-1/index.vue     | 352 ++++++++++++++++
 .../comopt/components/sysChannel/index.vue    | 118 ++++--
 .../comopt/components/sysParameter/index.vue  | 346 +++++++++-------
 .../xtwh/comopt/components/sysSort/index.vue  | 153 ++++---
 src/views/liswork/xtwh/comopt/index.vue       |   2 +-
 src/views/liswork/xtwh/xmFeeInstr/index.vue   | 136 +++---
 .../{xmReqItemVsApi => xmReqItemVs}/index.vue |   0
 17 files changed, 2272 insertions(+), 485 deletions(-)
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
 create mode 100644 src/views/liswork/xtwh/comopt-1/index.vue
 rename src/views/liswork/xtwh/{xmReqItemVsApi => xmReqItemVs}/index.vue (100%)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2109434..641e6c8 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -124,7 +124,7 @@ aside {
 //main-container全局样式
 .app-container {
   padding: 10px 10px 0 10px;
-  min-height: calc(100vh - 5.25rem);
+  height: calc(100vh - 5.25rem);
 }
 
 .components-container {
diff --git a/src/views/liswork/xmKnowledge/Modify.vue b/src/views/liswork/xmKnowledge/Modify.vue
index f20b381..2b99e09 100644
--- a/src/views/liswork/xmKnowledge/Modify.vue
+++ b/src/views/liswork/xmKnowledge/Modify.vue
@@ -1,76 +1,76 @@
+<!-- 修改界面 -->
 <template>
-  <!-- 修改界面 -->
-<el-dialog v-model="visible" width="600px" @open="open">
-  <template #header>
-    {{ title }}
-  </template>
-  <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-item label="项目代号" prop="xmdh">
-      <el-input placeholder="项目代号" v-model="formData.xmdh"></el-input>
-    </el-form-item>
-    <el-form-item label="项目名称" prop="xmmc">
-      <el-input placeholder="项目名称" v-model="formData.xmmc"></el-input>
-    </el-form-item>
-    <el-form-item label="助记符" prop="zjf">
-      <el-input placeholder="助记符" v-model="formData.zjf"></el-input>
-    </el-form-item>
-    <el-form-item label="项目类别" prop="xmlb">
-      <el-input placeholder="项目类别" v-model="formData.xmlb"></el-input>
-    </el-form-item>
-    <el-form-item label="所属组" prop="xmz">
-      <el-input placeholder="所属组" v-model="formData.xmz"></el-input>
-    </el-form-item>
-    <el-form-item label="单位" prop="dw">
-      <el-input placeholder="单位" v-model="formData.dw"></el-input>
-    </el-form-item>
-    <el-form-item label="参考上限" prop="cksx">
-      <el-input placeholder="参考上限" v-model="formData.cksx"></el-input>
-    </el-form-item>
-    <el-form-item label="参考下限" prop="ckxx">
-      <el-input placeholder="参考下限" v-model="formData.ckxx"></el-input>
-    </el-form-item>
-    <el-form-item label="打印参考值" prop="dyckz">
-      <el-input placeholder="打印参考值" v-model="formData.dyckz"></el-input>
-    </el-form-item>
-    <el-form-item label="打印序号" prop="dyxh">
-      <el-input placeholder="打印序号" v-model="formData.dyxh"></el-input>
-    </el-form-item>
-    <el-form-item label="计算公式" prop="jsgs">
-      <el-input placeholder="计算公式" v-model="formData.jsgs"></el-input>
-    </el-form-item>
-    <el-form-item label="临床意义" prop="lcyy">
-      <el-input placeholder="临床意义" v-model="formData.lcyy"></el-input>
-    </el-form-item>
-    <el-form-item label="备注" prop="bz">
-      <el-input placeholder="备注" v-model="formData.bz"></el-input>
-    </el-form-item>
-    <el-form-item prop="xsbz">
-      <el-checkbox v-model="xsbzCheck" label="显示标志"></el-checkbox> 
-    </el-form-item> 
-  </el-form>
-  <span class="text-span">知识库条目：</span>
-  <el-divider style="margin: 5px 0;"/>
-  <CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-      :config="tableConfig" :show-overflow-tooltip="true">
-    <template #reserve="{row}">
-      {{ reserve(row.reserve) }}
-    </template>    
-    <template #textresult="{row}">
-      <el-input v-model="row.textresult" type="textarea" class="full-width-input"></el-input>
+  <el-dialog v-model="visible" width="600px" @open="open">
+    <template #header>
+      {{ title }}
     </template>
-    <template #zd="{row}">
-      <el-input v-model="row.zd" type="textarea" class="full-width-input"></el-input>
+    <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-item label="项目代号" prop="xmdh">
+        <el-input placeholder="项目代号" v-model="formData.xmdh"></el-input>
+      </el-form-item>
+      <el-form-item label="项目名称" prop="xmmc">
+        <el-input placeholder="项目名称" v-model="formData.xmmc"></el-input>
+      </el-form-item>
+      <el-form-item label="助记符" prop="zjf">
+        <el-input placeholder="助记符" v-model="formData.zjf"></el-input>
+      </el-form-item>
+      <el-form-item label="项目类别" prop="xmlb">
+        <el-input placeholder="项目类别" v-model="formData.xmlb"></el-input>
+      </el-form-item>
+      <el-form-item label="所属组" prop="xmz">
+        <el-input placeholder="所属组" v-model="formData.xmz"></el-input>
+      </el-form-item>
+      <el-form-item label="单位" prop="dw">
+        <el-input placeholder="单位" v-model="formData.dw"></el-input>
+      </el-form-item>
+      <el-form-item label="参考上限" prop="cksx">
+        <el-input placeholder="参考上限" v-model="formData.cksx"></el-input>
+      </el-form-item>
+      <el-form-item label="参考下限" prop="ckxx">
+        <el-input placeholder="参考下限" v-model="formData.ckxx"></el-input>
+      </el-form-item>
+      <el-form-item label="打印参考值" prop="dyckz">
+        <el-input placeholder="打印参考值" v-model="formData.dyckz"></el-input>
+      </el-form-item>
+      <el-form-item label="打印序号" prop="dyxh">
+        <el-input placeholder="打印序号" v-model="formData.dyxh"></el-input>
+      </el-form-item>
+      <el-form-item label="计算公式" prop="jsgs">
+        <el-input placeholder="计算公式" v-model="formData.jsgs"></el-input>
+      </el-form-item>
+      <el-form-item label="临床意义" prop="lcyy">
+        <el-input placeholder="临床意义" v-model="formData.lcyy"></el-input>
+      </el-form-item>
+      <el-form-item label="备注" prop="bz">
+        <el-input placeholder="备注" v-model="formData.bz"></el-input>
+      </el-form-item>
+      <el-form-item prop="xsbz">
+        <el-checkbox v-model="xsbzCheck" label="显示标志"></el-checkbox>
+      </el-form-item>
+    </el-form>
+    <span class="text-span">知识库条目：</span>
+    <el-divider style="margin: 5px 0;" />
+    <CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true"
+      @column-drag-end="handleColumnDragEnd" :config="tableConfig" :show-overflow-tooltip="true">
+      <template #reserve="{ row }">
+        {{ reserve(row.reserve) }}
+      </template>
+      <template #textresult="{ row }">
+        <el-input v-model="row.textresult" type="textarea" class="full-width-input"></el-input>
+      </template>
+      <template #zd="{ row }">
+        <el-input v-model="row.zd" type="textarea" class="full-width-input"></el-input>
+      </template>
+    </CustomTable>
+    <template #footer>
+      <div class="dialog-footer">
+        <el-button @click="handleCancel">取 消</el-button>
+        <el-button type="primary" @click="handleOk">确 定</el-button>
+      </div>
     </template>
-  </CustomTable>  
-  <template #footer>
-    <div class="dialog-footer">
-       <el-button @click="handleCancel">取 消</el-button>
-       <el-button type="primary" @click="handleOk">确 定</el-button>
-    </div>
-  </template>
-</el-dialog>   
+  </el-dialog>
 
 </template>
 
@@ -80,7 +80,7 @@ import { addService } from '@/api/liswork/xmKnowledge/xmKnowledgeApi'
 import { ElMessage } from 'element-plus'
 
 const props = defineProps({
-  title:{
+  title: {
     type: String,
     default: ''
   },
@@ -96,7 +96,7 @@ const formData = ref({
   xmdh: '',
   xmmc: '',
   zjf: '',
-  xmlb: '' ,
+  xmlb: '',
   xmz: '',
   dw: '',
   cksx: '',
@@ -105,15 +105,15 @@ const formData = ref({
   dyxh: '',
   jsgs: '',
   lcyy: '',
-  bz:'',
+  bz: '',
   xsbz: ''
 })
 
 
 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: '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 },
 ])
 
 const tableConfig = ref({
@@ -127,7 +127,7 @@ const xsbzCheck = computed({
   get() {
     return formData.value.xsbz === '1'
   },
-  set(checked){
+  set(checked) {
     formData.value.xsbz = checked ? '1' : '0';
   }
 })
@@ -142,13 +142,13 @@ const handleColumnDragEnd = (data: any) => {
 const dataList = ref<any>([])
 
 
-const reserve = (reserve:string) => {
-  switch(reserve){
+const reserve = (reserve: string) => {
+  switch (reserve) {
     case '1':
       return '综述'
     case 'H':
       return '偏高'
-    case 'L':  
+    case 'L':
       return '偏低'
     case 'P':
       return '阳性'
@@ -175,20 +175,20 @@ const handleOk = async () => {
 }
 
 const open = () => {
-  if(props.type === '新增'){
+  if (props.type === '新增') {
     dataList.value = [
-      {reserve:'1',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'H',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'L',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'P',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'Q',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'J',textresult:'',yxjs:'',cjyy:'',zd:''},
-      {reserve:'N',textresult:'',yxjs:'',cjyy:'',zd:''},
+      { reserve: '1', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'H', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'L', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'P', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'Q', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'J', textresult: '', yxjs: '', cjyy: '', zd: '' },
+      { reserve: 'N', textresult: '', yxjs: '', cjyy: '', zd: '' },
     ]
-  }else{
+  } else {
 
   }
-    
+
 }
 
 </script>
@@ -198,9 +198,11 @@ const open = () => {
   padding: 10px;
   background-color: #f5f7fa;
   height: auto;
+
   .el-input {
     width: 150px;
   }
+
   .el-form-item {
     margin-right: 10px;
     margin-bottom: 2px;
diff --git a/src/views/liswork/xmKnowledge/TableData.vue b/src/views/liswork/xmKnowledge/TableData.vue
index 7dd295c..51617b8 100644
--- a/src/views/liswork/xmKnowledge/TableData.vue
+++ b/src/views/liswork/xmKnowledge/TableData.vue
@@ -1,17 +1,17 @@
 <template>
-<CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-      :config="tableConfig">
-  <template #reserve="{row}">
-    {{ reserve(row.reserve) }}
-  </template>    
-</CustomTable>  
+  <CustomTable ref="tableRefRight" :data="dataList" :columns="columnsRight" :enable-column-drag="true"
+    @column-drag-end="handleColumnDragEnd" :config="tableConfig">
+    <template #reserve="{ row }">
+      {{ reserve(row.reserve) }}
+    </template>
+  </CustomTable>
 </template>
 
 <script setup lang="ts">
 import CustomTable from '@/components/elTable/index.vue'
 
 const props = defineProps({
-  dataList:{
+  dataList: {
     type: Array,
     required: false,
     default: []
@@ -23,17 +23,17 @@ const props = defineProps({
       reserveWidth: 50,
       textresultWidth: 200,
       zdWidth: 100,
-      tableHeight: '85vh'
+      tableHeight: '100%'
     }
-   
+
   }
 })
 
 //const dataListRight = ref([]);
 const columnsRight = ref([
-  { prop: 'reserve', label: '类别', visible: true, align: 'center',slot: 'reserve', width: props.styleConfig.reserveWidth },
-  { prop: 'textresult', label: '说明', visible: true, align: 'center', width: props.styleConfig.textresultWidth ,showOverflowTooltip: false},
-  { prop: 'zd', label: '指导建议', visible: true, align: 'center', width: props.styleConfig.zdWidth,showOverflowTooltip: false },
+  { prop: 'reserve', label: '类别', visible: true, align: 'center', slot: 'reserve', },
+  { prop: 'textresult', label: '说明', visible: true, align: 'center', showOverflowTooltip: false },
+  { prop: 'zd', label: '指导建议', visible: true, align: 'center', showOverflowTooltip: false },
 ])
 
 const tableConfig = ref({
@@ -50,13 +50,13 @@ const handleColumnDragEnd = (data: any) => {
 }
 
 
-const reserve = (reserve:string) => {
-  switch(reserve){
+const reserve = (reserve: string) => {
+  switch (reserve) {
     case '1':
       return '综述'
     case 'H':
       return '偏高'
-    case 'L':  
+    case 'L':
       return '偏低'
     case 'P':
       return '阳性'
@@ -72,5 +72,4 @@ const reserve = (reserve:string) => {
 
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/liswork/xmKnowledge/index.vue b/src/views/liswork/xmKnowledge/index.vue
index c5e024f..74026cd 100644
--- a/src/views/liswork/xmKnowledge/index.vue
+++ b/src/views/liswork/xmKnowledge/index.vue
@@ -1,46 +1,54 @@
 <template>
-<div class="topForm">
-  <el-form ref="formRef" :model="formData" inline label-width="80px" class="mb8" @submit.prevent="handleSubmit">
-    <el-form-item label="检索" prop="js">
-      <el-input placeholder="项目代号，名称，简拼" v-model="formData.js" style="width: 200px;" @keyup.enter="getList"></el-input>
-    </el-form-item>
-  </el-form>
-</div>
-<el-row>
-  <el-button type="primary" @click="onQueryClick">查询</el-button>
-  <el-button type="primary" @click="onAddClick">新增</el-button>
-  <el-button type="primary" @click="onDelClick">删除</el-button>
-</el-row>
-<el-row>
-  <el-col :span="17">
-    <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-          :config="tableConfig" @row-dblclick="onDBClick" @row-click="onClick" :pagination="pagination" @size-change="sizeChange" @page-change="currentChange">
-      <template #xsbz="{row}">
-        <el-checkbox :model-value="row.xsbz === '1'"/>   
-      </template>
-    </CustomTable>
-  </el-col>
-  <el-col :span="7">
-    <TableRight :data-list="dataListRight"/>
-  </el-col>
-</el-row>
+  <div class="app-container">
+    <div class="topForm">
+      <el-form ref="formRef" :model="formData" inline label-width="80px" @submit.prevent="handleSubmit">
+        <el-form-item label="检索" prop="js">
+          <el-input placeholder="项目代号，名称，简拼" v-model="formData.js" style="width: 200px;"
+            @keyup.enter="getList"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onQueryClick">查询</el-button>
+        </el-form-item>
+      </el-form>
+    </div>
+    <el-row>
+      <el-button type="primary" @click="onAddClick">新增</el-button>
+      <el-button type="danger" @click="onDelClick">删除</el-button>
+    </el-row>
+    <el-row :gutter="20" class="table-row">
+      <el-col :span="17" class="table-col">
+        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
+          @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClick" @row-click="onClick"
+          :pagination="pagination" @size-change="sizeChange" @page-change="currentChange">
+          <template #xsbz="{ row }">
+            <el-checkbox :model-value="row.xsbz === '1'" />
+          </template>
+        </CustomTable>
+      </el-col>
+      <el-col :span="7" class="table-col">
+        <TableRight :data-list="dataListRight" />
+      </el-col>
+    </el-row>
+
+    <Modify ref="modifyRef" v-model="modifyVisible" :title="modifyTitle" :type="modifyType"
+      @close-with-return="closeWithReturn" />
+  </div>
 
-<Modify ref="modifyRef" v-model="modifyVisible" :title="modifyTitle" :type="modifyType" @close-with-return="closeWithReturn"/>
 </template>
 
 <script setup lang="ts">
 import CustomTable from '@/components/elTable/index.vue'
-import {queryService,queryDetailService,delService} from '@/api/liswork/xmKnowledge/xmKnowledgeApi'
+import { queryService, queryDetailService, delService } from '@/api/liswork/xmKnowledge/xmKnowledgeApi'
 import TableRight from './TableData.vue'
 import Modify from './Modify.vue'
-import { ElMessage,ElMessageBox } from 'element-plus';
+import { ElMessage, ElMessageBox } from 'element-plus';
 
 const dataListLeft = ref([]);
 const dataListRight = ref([]);
 const columnsLeft = ref([
   { prop: 'xmid', label: '知识库ID', visible: true, align: 'center', width: 100 },
   { prop: 'xmdh', label: '项目代号', visible: true, align: 'center', width: 100 },
-  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center',  width: 200 },
+  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center', width: 200 },
   { prop: 'xsbz', label: '显示标志', visible: true, align: 'center', slot: 'xsbz', width: 100 },
   { prop: 'xmlb', label: '类别', visible: true, align: 'center', width: 100 },
   { prop: 'xmz', label: '所属组', visible: true, align: 'center', width: 100 },
@@ -57,7 +65,7 @@ const columnsLeft = ref([
 
 const tableConfig = ref({
   border: true, // 边框
-  height: '85vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // cellStyle: cellStyleHd
 })
@@ -96,7 +104,7 @@ const formData = ref({
   js: ''
 })
 
-const closeWithReturn = () =>{
+const closeWithReturn = () => {
   getList()
 }
 
@@ -104,17 +112,17 @@ const handleSubmit = (event: any) => {
   event.preventDefault();
 }
 
-const onClick = async (row:any) => {
+const onClick = async (row: any) => {
   const res = await queryDetailService(row.xmid);
   dataListRight.value = res.data
   selectRow.value = row
 }
 
-const onDBClick = ()=>{
+const onDBClick = () => {
 
 }
 
-const onAddClick = ()=> {
+const onAddClick = () => {
   modifyVisible.value = true
   modifyTitle.value = '新增'
   modifyType.value = '新增'
@@ -122,12 +130,12 @@ const onAddClick = ()=> {
 }
 
 const onDelClick = async () => {
-  if(selectRow.value){
-    await ElMessageBox.confirm('是否要删除选中的数据?','警告',{confirmButtonText: '确定',cancelButtonText: '取消',});
+  if (selectRow.value) {
+    await ElMessageBox.confirm('是否要删除选中的数据?', '警告', { confirmButtonText: '确定', cancelButtonText: '取消', });
     await delService(selectRow.value.xmid)
     ElMessage.success('删除成功！')
   }
- 
+
 }
 
 const onQueryClick = () => {
@@ -135,29 +143,29 @@ const onQueryClick = () => {
 }
 
 const getList = async () => {
-  const data = {pageSize: pagination.value.pageSize, pageNum: pagination.value.currentPage,inputData: formData.value.js }
+  const data = { pageSize: pagination.value.pageSize, pageNum: pagination.value.currentPage, inputData: formData.value.js }
   const res = await queryService(data);
   dataListLeft.value = res.rows
   pagination.value.total = res.total
 
   dataListRight.value = []
-  
+
 }
 
 
-onMounted(()=>{
+onMounted(() => {
   getList()
 })
 
 </script>
 
 <style scoped lang="scss">
-.el-row {
-  margin-top: 5px;
-  margin-bottom: 5px;
-}
-
-.topForm {
+.table-row {
+  height: calc(100% - 150px);
   margin-top: 10px;
+
+  .table-col {
+    height: 100%;
+  }
 }
 </style>
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
new file mode 100644
index 0000000..e8f367c
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
@@ -0,0 +1,108 @@
+<template>
+  <!-- 通道号配置 -->
+  <div class="table-container">
+    <el-row :gutter="10" class="table-toolbar">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" @click="addItem">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" @click="delItem">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" @click="allClear">清除所有项目接口号</el-button>
+      </el-col>
+    </el-row>
+
+    <el-row :gutter="10" class="table-row">
+      <el-col :span="12" class="table-box">
+        <el-table :data="tableData" height="100%" border highlight-current-row>
+          <el-table-column label="通道号" align="center">
+            <template #default="scope">
+              <el-input v-model="scope.row.channel" placeholder="请输入通道号" class="full-width-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="项目" align="center">
+            <template #default="scope">
+              <SelectTable v-model:data="scope.row.xmid" :tableData="xmList" class="full-width-input" />
+            </template>
+          </el-table-column>
+        </el-table>
+      </el-col>
+      <el-col :span="6">
+        <div class="tips">
+          说明：
+          “通道号”又称“接口代号”，是指仪器向电脑传送结果时项目的
+          标识符
+          接口代号对于一个仪器不可重复。
+        </div>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { queryXmInfoNewService } from '@/api/liswork/labItem/labItemApi';
+const yq = defineModel<string>();
+
+const tableData = ref<Array<{ channel: string }>>([]);
+const handleSave = () => {
+};
+
+const addItem = () => {
+  tableData.value.push({ channel: '' })
+};
+
+const delItem = () => {
+}
+
+const allClear = () => {
+}
+const xmList = ref<Array<{ xmmc: string, xmid: string }>>([]);
+const getXmList = () => {
+  queryXmInfoNewService({ yq: yq.value }).then((res: any) => {
+    xmList.value = res.rows.map((item: any) => {
+      return {
+        label: item.xmmc,
+        value: item.xmid.toString(),
+      }
+    })
+  })
+};
+
+watch(() => yq.value, (val) => {
+  if (val) {
+    getXmList();
+  }
+}, { immediate: true });
+</script>
+
+<style scoped lang="scss">
+.table-container {
+  height: calc(100% - 58px);
+}
+
+.table-toolbar {
+  margin-bottom: 8px;
+  height: 36px;
+  line-height: 36px;
+}
+
+.tips {
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-size: 16px;
+  color: #409eff;
+  font-weight: 600;
+}
+
+.table-row {
+  height: calc(100% - 45px);
+
+  .table-box {
+    height: 100%;
+
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
new file mode 100644
index 0000000..3b0a308
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
@@ -0,0 +1,330 @@
+<!-- 系统全局选项 -->
+<template>
+  <div class="sys_box">
+    <el-row :gutter="10" class="table-toolbar">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
+      </el-col>
+    </el-row>
+
+    <!-- 三列表格容器 -->
+    <div class="triple-table-wrapper">
+      <!-- 第一列表格 -->
+      <div class="table-panel table-1">
+        <el-table v-loading="loading" :data="tableData1" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+
+      <!-- 第二列表格 -->
+      <div class="table-panel table-2">
+        <el-table v-loading="loading" :data="tableData2" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+
+      <!-- 第三列表格 -->
+      <div class="table-panel table-3">
+        <el-table v-loading="loading" :data="tableData3" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
+import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
+import { getFirstLetter } from '@/utils/pinyin'
+// @ts-ignore
+import DynamicInput from "@/views/liswork/xtwh/localconfig/components/DynamicInput.vue"
+const emits = defineEmits(['updateTree'])
+const yq = defineModel<string>()
+
+interface RegDictItem {
+  configId: string | number
+  configSort: number
+  configCode: string
+  configName: string
+  configDefvalue: string | number
+  configOptiontype: string
+  remark: string
+}
+// 列表相关
+const optiontype = ref<string>("SYSTEM")
+const menuname = ref<string>("系统全局")
+const regdictList = ref<RegDictItem[]>([])
+const originRegdictList = ref<RegDictItem[]>([])
+const loading = ref<boolean>(false)
+const total = ref<number>(0)
+
+// 选择相关
+const ids = ref<(string | number)[]>([])
+const single = ref<boolean>(true)
+const multiple = ref<boolean>(true)
+
+// ========== 核心：拆分三列表格数据 ==========
+const tableData1 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3) // 每列基础行数
+  return regdictList.value.slice(0, splitSize)
+})
+
+const tableData2 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3)
+  return regdictList.value.slice(splitSize, splitSize * 2)
+})
+
+const tableData3 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3)
+  return regdictList.value.slice(splitSize * 2)
+})
+
+
+const getList = async (): Promise<void> => {
+  loading.value = true
+  try {
+    const response = await paramList({ yq: yq.value, optiontype: optiontype.value })
+    regdictList.value = JSON.parse(JSON.stringify(response.data))
+    originRegdictList.value = JSON.parse(JSON.stringify(response.data))
+    total.value = response.data.length
+  } catch (error) {
+    ElMessage.error(`获取列表异常：${(error as Error).message}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleSelectionChange = (val: RegDictItem[]): void => {
+  ids.value = val.map(item => item.configId)
+  single.value = val.length === 1
+  multiple.value = val.length > 1
+}
+
+const handleSave = async (): Promise<void> => {
+  try {
+    loading.value = true
+    // 合并三列表格数据提交
+    const allData = [...tableData1.value, ...tableData2.value, ...tableData3.value]
+    const res = await updateParam(allData)
+    if (res.code == 0) {
+      ElMessage.success(res.msg || "保存成功")
+      originRegdictList.value = JSON.parse(JSON.stringify(allData))
+      // 更新树结构状态
+      emits('updateTree')
+    }
+  } catch (error) {
+    ElMessage.error(`保存失败：${(error as Error).message}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleCancelEdit = (): void => {
+  ElMessageBox.confirm(
+    "是否确认取消所有修改，恢复原始数据？",
+    "提示",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    }
+  ).then(() => {
+    regdictList.value = JSON.parse(JSON.stringify(originRegdictList.value))
+    ElMessage.success("已恢复原始数据！")
+  })
+}
+
+const handleRestoreDefault = async (): Promise<void> => {
+  ElMessageBox.confirm(
+    "是否确认还原所有默认值？此操作会覆盖当前修改！",
+    "警告",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "error"
+    }
+  ).then(async () => {
+    loading.value = true
+    try {
+      const res = await getdef({ optiontype: optiontype.value })
+      regdictList.value = JSON.parse(JSON.stringify(res.data))
+      originRegdictList.value = JSON.parse(JSON.stringify(res.data))
+      total.value = res.data.length
+      ElMessage.success("还原默认值成功！")
+    } catch (error) {
+      ElMessage.error(`还原失败：${(error as Error).message}`)
+    } finally {
+      loading.value = false
+    }
+  })
+}
+
+
+watch(yq, (newVal) => {
+  if (newVal !== undefined) {
+    getList()
+  }
+}, {
+  immediate: true,
+  deep: true
+})
+</script>
+
+<style scoped lang="scss">
+.sys_box {
+  height: calc(100% - 58px);
+}
+
+.table-toolbar {
+  margin-bottom: 8px;
+  height: 36px;
+  line-height: 36px;
+}
+
+// 三列表格容器
+.triple-table-wrapper {
+  flex: 1;
+  height: calc(100% - 45px); // 减去标题行+工具栏高度
+  display: flex;
+  gap: 0px; // 表格间间距
+  overflow: hidden;
+
+  // 单个表格面板
+  .table-panel {
+    flex: 1; // 三列均等分
+    height: 100%;
+    overflow: hidden;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    border-radius: 4px;
+
+    // 细微间距优化
+    &.table-1 {
+      margin-right: 0px;
+    }
+
+    &.table-2 {
+      margin: 0 0px;
+    }
+
+    &.table-3 {
+      margin-left: 0px;
+    }
+  }
+}
+
+
+// 核心：清除表格内上下间隙
+:deep(.config-table) {
+  // 清除表格整体的边框间距
+  border-collapse: collapse !important;
+  border-spacing: 0 !important;
+
+  // 清除表格头部间距
+  .el-table__header {
+    padding: 0 !important;
+
+    th {
+      padding: 0 !important;
+      border-bottom: 1px solid #e6e6e6 !important;
+      line-height: 25px !important;
+      height: 25px !important;
+    }
+  }
+
+  // 清除表格内容区间距
+  .el-table__body {
+    padding: 0 !important;
+
+    // 清除行间距
+    .el-table__row {
+      height: 25px !important;
+      line-height: 25px !important;
+      margin: 0 !important;
+      padding: 0 !important;
+    }
+
+    // 清除单元格内边距和间距
+    .el-table__cell {
+      padding: 0 4px !important; // 仅保留左右内边距，上下清零
+      height: 25px !important;
+      line-height: 25px !important;
+      vertical-align: middle !important;
+      font-size: 12px;
+      border-bottom: 1px solid #e6e6e6 !important;
+      border-right: 1px solid #e6e6e6 !important;
+    }
+
+    // 最后一列清除右侧边框
+    .el-table__cell:last-child {
+      border-right: none !important;
+    }
+  }
+
+  // 清除表格底部间距
+  .el-table__footer {
+    padding: 0 !important;
+  }
+
+  // 编辑输入框适配紧凑布局
+  .edit-input {
+    width: 95%;
+    margin: 0 !important;
+    padding: 0 !important;
+
+    :deep(.el-input__inner) {
+      padding: 0 5px;
+      height: 25px !important; // 缩小输入框高度适配紧凑行高
+      line-height: 25px !important;
+      font-size: 12px;
+      border: 1px solid #dcdfe6;
+      margin: 0 !important;
+
+      &:focus {
+        border-color: #409eff;
+        outline: none;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
new file mode 100644
index 0000000..e1bac06
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
@@ -0,0 +1,330 @@
+<!-- 系统全局选项 -->
+<template>
+  <div class="sys_box">
+    <el-row :gutter="10" class="table-toolbar">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
+      </el-col>
+    </el-row>
+
+    <!-- 三列表格容器 -->
+    <div class="triple-table-wrapper">
+      <!-- 第一列表格 -->
+      <div class="table-panel table-1">
+        <el-table v-loading="loading" :data="tableData1" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+
+      <!-- 第二列表格 -->
+      <div class="table-panel table-2">
+        <el-table v-loading="loading" :data="tableData2" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+
+      <!-- 第三列表格 -->
+      <div class="table-panel table-3">
+        <el-table v-loading="loading" :data="tableData3" @selection-change="handleSelectionChange" class="config-table"
+          fit border height="100%" :cell-spacing="0">
+          <el-table-column label="序号" align="center" prop="configSort" width="50" />
+          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
+            min-width="150" />
+          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
+            <template #default="scope">
+              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+            </template>
+          </el-table-column>
+          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
+            min-width="100" />
+        </el-table>
+      </div>
+    </div>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
+import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
+import { getFirstLetter } from '@/utils/pinyin'
+// @ts-ignore
+import DynamicInput from "@/views/liswork/xtwh/localconfig/components/DynamicInput.vue"
+const emits = defineEmits(['updateTree'])
+const yq = defineModel<string>()
+
+interface RegDictItem {
+  configId: string | number
+  configSort: number
+  configCode: string
+  configName: string
+  configDefvalue: string | number
+  configOptiontype: string
+  remark: string
+}
+// 列表相关
+const optiontype = ref<string>("INPUT")
+const menuname = ref<string>("界面设定")
+const regdictList = ref<RegDictItem[]>([])
+const originRegdictList = ref<RegDictItem[]>([])
+const loading = ref<boolean>(false)
+const total = ref<number>(0)
+
+// 选择相关
+const ids = ref<(string | number)[]>([])
+const single = ref<boolean>(true)
+const multiple = ref<boolean>(true)
+
+// ========== 核心：拆分三列表格数据 ==========
+const tableData1 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3) // 每列基础行数
+  return regdictList.value.slice(0, splitSize)
+})
+
+const tableData2 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3)
+  return regdictList.value.slice(splitSize, splitSize * 2)
+})
+
+const tableData3 = computed<RegDictItem[]>(() => {
+  const splitSize = Math.ceil(total.value / 3)
+  return regdictList.value.slice(splitSize * 2)
+})
+
+
+const getList = async (): Promise<void> => {
+  loading.value = true
+  try {
+    const response = await paramList({ yq: yq.value, optiontype: optiontype.value })
+    regdictList.value = JSON.parse(JSON.stringify(response.data))
+    originRegdictList.value = JSON.parse(JSON.stringify(response.data))
+    total.value = response.data.length
+  } catch (error) {
+    ElMessage.error(`获取列表异常：${(error as Error).message}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleSelectionChange = (val: RegDictItem[]): void => {
+  ids.value = val.map(item => item.configId)
+  single.value = val.length === 1
+  multiple.value = val.length > 1
+}
+
+const handleSave = async (): Promise<void> => {
+  try {
+    loading.value = true
+    // 合并三列表格数据提交
+    const allData = [...tableData1.value, ...tableData2.value, ...tableData3.value]
+    const res = await updateParam(allData)
+    if (res.code == 0) {
+      ElMessage.success(res.msg || "保存成功")
+      originRegdictList.value = JSON.parse(JSON.stringify(allData))
+      // 更新树结构状态
+      emits('updateTree')
+    }
+  } catch (error) {
+    ElMessage.error(`保存失败：${(error as Error).message}`)
+  } finally {
+    loading.value = false
+  }
+}
+
+const handleCancelEdit = (): void => {
+  ElMessageBox.confirm(
+    "是否确认取消所有修改，恢复原始数据？",
+    "提示",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "warning"
+    }
+  ).then(() => {
+    regdictList.value = JSON.parse(JSON.stringify(originRegdictList.value))
+    ElMessage.success("已恢复原始数据！")
+  })
+}
+
+const handleRestoreDefault = async (): Promise<void> => {
+  ElMessageBox.confirm(
+    "是否确认还原所有默认值？此操作会覆盖当前修改！",
+    "警告",
+    {
+      confirmButtonText: "确定",
+      cancelButtonText: "取消",
+      type: "error"
+    }
+  ).then(async () => {
+    loading.value = true
+    try {
+      const res = await getdef({ optiontype: optiontype.value })
+      regdictList.value = JSON.parse(JSON.stringify(res.data))
+      originRegdictList.value = JSON.parse(JSON.stringify(res.data))
+      total.value = res.data.length
+      ElMessage.success("还原默认值成功！")
+    } catch (error) {
+      ElMessage.error(`还原失败：${(error as Error).message}`)
+    } finally {
+      loading.value = false
+    }
+  })
+}
+
+
+watch(yq, (newVal) => {
+  if (newVal !== undefined) {
+    getList()
+  }
+}, {
+  immediate: true,
+  deep: true
+})
+</script>
+
+<style scoped lang="scss">
+.sys_box {
+  height: calc(100% - 58px);
+}
+
+.table-toolbar {
+  margin-bottom: 8px;
+  height: 36px;
+  line-height: 36px;
+}
+
+// 三列表格容器
+.triple-table-wrapper {
+  flex: 1;
+  height: calc(100% - 45px); // 减去标题行+工具栏高度
+  display: flex;
+  gap: 0px; // 表格间间距
+  overflow: hidden;
+
+  // 单个表格面板
+  .table-panel {
+    flex: 1; // 三列均等分
+    height: 100%;
+    overflow: hidden;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    border-radius: 4px;
+
+    // 细微间距优化
+    &.table-1 {
+      margin-right: 0px;
+    }
+
+    &.table-2 {
+      margin: 0 0px;
+    }
+
+    &.table-3 {
+      margin-left: 0px;
+    }
+  }
+}
+
+
+// 核心：清除表格内上下间隙
+:deep(.config-table) {
+  // 清除表格整体的边框间距
+  border-collapse: collapse !important;
+  border-spacing: 0 !important;
+
+  // 清除表格头部间距
+  .el-table__header {
+    padding: 0 !important;
+
+    th {
+      padding: 0 !important;
+      border-bottom: 1px solid #e6e6e6 !important;
+      line-height: 25px !important;
+      height: 25px !important;
+    }
+  }
+
+  // 清除表格内容区间距
+  .el-table__body {
+    padding: 0 !important;
+
+    // 清除行间距
+    .el-table__row {
+      height: 25px !important;
+      line-height: 25px !important;
+      margin: 0 !important;
+      padding: 0 !important;
+    }
+
+    // 清除单元格内边距和间距
+    .el-table__cell {
+      padding: 0 4px !important; // 仅保留左右内边距，上下清零
+      height: 25px !important;
+      line-height: 25px !important;
+      vertical-align: middle !important;
+      font-size: 12px;
+      border-bottom: 1px solid #e6e6e6 !important;
+      border-right: 1px solid #e6e6e6 !important;
+    }
+
+    // 最后一列清除右侧边框
+    .el-table__cell:last-child {
+      border-right: none !important;
+    }
+  }
+
+  // 清除表格底部间距
+  .el-table__footer {
+    padding: 0 !important;
+  }
+
+  // 编辑输入框适配紧凑布局
+  .edit-input {
+    width: 95%;
+    margin: 0 !important;
+    padding: 0 !important;
+
+    :deep(.el-input__inner) {
+      padding: 0 5px;
+      height: 25px !important; // 缩小输入框高度适配紧凑行高
+      line-height: 25px !important;
+      font-size: 12px;
+      border: 1px solid #dcdfe6;
+      margin: 0 !important;
+
+      &:focus {
+        border-color: #409eff;
+        outline: none;
+      }
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
new file mode 100644
index 0000000..5c19ce5
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
@@ -0,0 +1,389 @@
+<template>
+  <!-- 参数列表 -->
+  <div>
+    <el-row :gutter="10" class="table-toolbar">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
+      </el-col>
+    </el-row>
+
+    <el-form ref="form" :model="formData" :rules="rules" label-width="120px" class="form-inline" inline>
+      <div class="title">说明：公式中阴阳对照请用NC,PC表示</div>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="测试波长" prop="csbc">
+            <el-select v-model="formData.csbc" style="width: 12rem;">
+              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="display: flex;">
+          <el-form-item label="参考波长" prop="ckbc">
+            <el-select v-model="formData.ckbc" style="width: 12rem;">
+              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
+            </el-select>
+          </el-form-item>
+          <el-button type="primary" @click="openDz">滤光片波长对照表</el-button>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="阳性判断公式" prop="yxgs">
+            <el-input v-model="formData.yxgs" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="上灰区" prop="shq">
+            <el-input v-model="formData.shq">
+              <template #append>% </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="下灰区" prop="xhq">
+            <el-input v-model="formData.xhq">
+              <template #append>% </template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="阴性对照下限" prop="negxx">
+            <el-input v-model="formData.negxx" />
+          </el-form-item>
+        </el-col>
+      </el-row>
+
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="阳性对照下限" prop="posxx">
+            <el-input v-model="formData.posxx" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="阴性对照上限" prop="negsx">
+            <el-input v-model="formData.negsx" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="阳性对照上限" prop="possx">
+            <el-input v-model="formData.possx" />
+          </el-form-item>
+        </el-col>
+        <el-col :span="6">
+
+        </el-col>
+      </el-row>
+
+      <el-divider></el-divider>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="项目性质" prop="xmxz">
+            <el-radio-group v-model="formData.xmxz">
+              <el-radio value="1">定性</el-radio>
+              <el-radio value="2">定量</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="移动模式" prop="ydfs">
+            <el-radio-group v-model="formData.ydfs">
+              <el-radio value="1">连续</el-radio>
+              <el-radio value="2">步进</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+
+          <el-form-item label="测试模式" prop="csms">
+            <el-radio-group v-model="formData.csms">
+              <el-radio value="1">终点法</el-radio>
+              <el-radio value="2">两点法</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="振板频率" prop="zbpl">
+            <el-radio-group v-model="formData.zbpl">
+              <el-radio value="1">高</el-radio>
+              <el-radio value="2">中</el-radio>
+              <el-radio value="3">低</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="空白形式" prop="kbms">
+            <el-radio-group v-model="formData.kbms">
+              <el-radio value="1">空气</el-radio>
+              <el-radio value="2">试剂</el-radio>
+            </el-radio-group>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8">
+          <el-form-item label="振板时间" prop="zbsj">
+            <el-input v-model="formData.zbsj">
+              <template #append>秒</template>
+            </el-input>
+          </el-form-item>
+        </el-col>
+      </el-row>
+      <el-divider></el-divider>
+      <el-row>
+        <el-col :span="8">
+          <el-form-item label="默认模板" prop="mrmb">
+            <el-select v-model="formData.mrmb" style="width: 12rem;">
+              <!-- <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" /> -->
+            </el-select>
+          </el-form-item>
+        </el-col>
+        <el-col :span="8" style="display: flex;">
+          <el-form-item label="默认试剂" prop="mrsjph">
+            <el-select v-model="formData.mrsjph" style="width: 12rem;">
+              <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" />
+            </el-select>
+          </el-form-item>
+          <el-button type="primary" @click="sjHandle">试剂维护</el-button>
+        </el-col>
+      </el-row>
+    </el-form>
+
+    <!-- 波长对照表 -->
+    <el-dialog v-model="dialogVisible" title="滤光波长对照表" draggable :close-on-click-modal="false" width="500px">
+      <div class="mb5">
+        <el-button type="primary" @click="savaItem">保存</el-button>
+        <el-button type="primary" @click="addItem">新增</el-button>
+        <el-button type="danger" @click="delItem">删除</el-button>
+      </div>
+
+      <el-table :data="dzList" style="width: 100%" height="450" border highlight-current-row
+        @row-click="handleRowClick">
+        <el-table-column type="index" width="50" label="No" align="center" />
+        <el-table-column label="滤光片号" prop="lgph">
+          <template #default="scope">
+            <el-input v-model="scope.row.lgph" class="full-width-input" />
+          </template>
+        </el-table-column>
+        <el-table-column label="波长" prop="bc">
+          <template #default="scope">
+            <el-input v-model="scope.row.bc" class="full-width-input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+
+
+    <!-- 试剂维护 -->
+    <el-dialog v-model="sjShow" title="试剂维护" draggable :close-on-click-modal="false" width="700px">
+      <div class="mb5">
+        <el-button type="primary" @click="sjsavaItem">保存</el-button>
+        <el-button type="primary" @click="sjaddItem">新增</el-button>
+        <el-button type="danger" @click="sjdelItem">删除</el-button>
+      </div>
+      <el-table :data="sjtableData" height="400px" border highlight-current-row @row-click="sjRowClick">
+        <el-table-column label="试剂批号" prop="sjph" width="120">
+          <template #default="scope">
+            <el-input v-model="scope.row.sjph" class="full-width-input" />
+          </template>
+        </el-table-column>
+        <el-table-column label="厂商" prop="sjcs">
+          <template #default="scope">
+            <el-select v-model="scope.row.sjcs" class="full-width-input" filterable allow-create>
+              <el-option v-for="item in cjList" :label="item.na" :value="item.no" />
+            </el-select>
+          </template>
+        </el-table-column>
+        <el-table-column label="有效期" prop="yxq">
+          <template #default="scope">
+            <el-date-picker v-model="scope.row.yxq" type="datetime" placeholder="0000:00:00 00:00:00"
+              format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width:100%" />
+          </template>
+        </el-table-column>
+        <el-table-column label="方法" prop="csff">
+          <template #default="scope">
+            <SelectTable v-model:data="scope.row.csff" :tableData="dictData.MD" class="full-width-input" />
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-dialog>
+  </div>
+</template>
+
+<script setup lang="ts">
+import { queryFilter, addXmFilter, delXmFilter, addXmLot, delXmLot, queryXmLot, querySjcs } from '@/api/liswork/xtwh/ComOpt'
+import { ElMessage } from 'element-plus';
+import { formatDict, dictData } from '@/hooks'
+import { get } from 'lodash';
+
+const yq = defineModel<string>()
+
+const dialogVisible = ref(false)
+const formData = ref({
+  csbc: '',
+  ckbc: '',
+  yxgs: '',
+  shq: '',
+  xhq: '',
+  negxx: '',
+  posxx: '',
+  negsx: '',
+  possx: '',
+  xmxz: '1',
+  ydfs: '1',
+  csms: '1',
+  zbpl: '1',
+  kbms: '1',
+  zbsj: '',
+  mrmb: '',
+  mrsjph: ''
+});
+const rules = ref({
+  csbc: [
+    { required: true, message: '请选择测试波长', trigger: 'change' }
+  ],
+  yxgs: [
+    { required: true, message: '请输入阳性判断公式', trigger: 'blur' }
+  ]
+});
+
+const form = ref();
+const handleSave = () => {
+  form.value.validate((valid: boolean) => {
+    if (valid) {
+      console.log('submit!')
+    }
+  })
+}
+const handleCancelEdit = () => {
+  console.log('取消修改')
+}
+const handleRestoreDefault = () => {
+  console.log('还原默认')
+}
+const dzList = ref<Array<{ lgph: string, bc: string, yq?: string }>>([])
+const getDzList = () => {
+  selectRow.value = null
+  queryFilter({ yq: yq.value }).then((res: any) => {
+    dzList.value = res.data
+  })
+}
+
+const selectRow = ref()
+const handleRowClick = (row: any) => {
+  selectRow.value = row
+}
+const openDz = () => {
+  getDzList()
+  dialogVisible.value = true
+}
+
+const savaItem = () => {
+  const flag = dzList.value.every(item => item.bc && item.lgph)
+  if (!flag) return ElMessage.warning('请检查滤光片号和波长填写！')
+  addXmFilter(dzList.value).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('保存成功！')
+      getDzList()
+    }
+  })
+}
+const addItem = () => {
+  dzList.value.push({ lgph: '', bc: '', yq: yq.value })
+}
+const delItem = () => {
+  if (!selectRow.value) return ElMessage.warning('请选择要删除的行！')
+  if (selectRow.value.lgph) {
+    delXmFilter(selectRow.value)
+  }
+  dzList.value = dzList.value.filter(item => item.lgph != selectRow.value.lgph)
+  selectRow.value = null
+}
+
+interface sjList {
+  sjcs: string, sjph: string, yq: string, yxq: string, csff: string
+}
+const sjShow = ref(false)
+const sjtableData = ref<sjList[]>([])
+const sjHandle = () => {
+  getSjList()
+  getSjcjList()
+  sjShow.value = true
+}
+
+const sjRowClick = (row: any) => {
+  selectRow.value = row
+}
+const getSjList = () => {
+  selectRow.value = null
+  queryXmLot({ yq: yq.value }).then((res: any) => {
+    sjtableData.value = res.data
+  })
+}
+
+const sjsavaItem = () => {
+  sjtableData.value.forEach(item => {
+    item.yq = yq.value || ''
+  })
+  addXmLot(sjtableData.value).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('保存成功！')
+      getSjList()
+      getSjcjList()
+    }
+  })
+}
+const sjaddItem = () => {
+  sjtableData.value.push({
+    sjcs: '',
+    sjph: '',
+    yxq: '',
+    csff: '',
+    yq: yq.value || '',
+  })
+}
+const sjdelItem = () => {
+  if (!selectRow.value) return ElMessage.warning('请选择要删除的行！')
+  if (selectRow.value.sjph) {
+    delXmLot(selectRow.value)
+  }
+  sjtableData.value = sjtableData.value.filter(item => item.sjph != selectRow.value.sjph)
+  selectRow.value = null
+}
+const cjList = ref<Array<{ no: string, na: string }>>([])
+const getSjcjList = () => {
+  querySjcs({ yq: yq.value }).then((res: any) => {
+    cjList.value = res.data
+  })
+}
+
+watch(yq, (newVal) => {
+  getDzList()
+  getSjList()
+}, {
+  immediate: true,
+  deep: true
+})
+</script>
+
+<style scoped lang="scss">
+.table-toolbar {
+  margin-bottom: 8px;
+  height: 36px;
+  line-height: 36px;
+}
+
+.title {
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-size: 16px;
+  color: #409eff;
+  font-weight: 600;
+  margin-bottom: 8px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
new file mode 100644
index 0000000..1ed106b
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
@@ -0,0 +1,12 @@
+<!-- 报告界面参数 -->
+<template>
+  <div>
+    报告界面参数
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped></style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
new file mode 100644
index 0000000..81db88d
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
@@ -0,0 +1,164 @@
+<template>
+  <!-- 整体排序 -->
+  <div class="sort_box">
+    <el-row :gutter="10" class="table-row">
+      <el-col :span="20" class="table-box">
+        <CustomTable ref="tableRef" :data="dataList" :columns="columns" :config="tableConfig"
+          @row-click="handleRowClick">
+          <template #sort="{ row }">
+            <el-input v-model="row.sort" class="full-width-input" />
+          </template>
+        </CustomTable>
+      </el-col>
+      <el-col :span="4">
+        <el-row :gutter="10" class="table-toolbar">
+          <!-- <el-col :span="1.5">
+            <el-radio-group v-model="radio" @change="radioChange">
+              <el-radio value="1">上下移动调整</el-radio>
+              <el-radio value="2">手工输入工号</el-radio>
+            </el-radio-group>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="primary" @click="refresh">刷新</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" @click="cpHandle">存盘</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" :disabled="radio == '2'" @click="firstHandle">首位</el-button>
+          </el-col>
+          <!-- <el-col :span="1.5">
+            <el-button type="primary" icon="top" :disabled="radio == '2'" @click="prevHandle">上移</el-button>
+          </el-col>
+          <el-col :span="1.5">
+            <el-button type="primary" icon="bottom" :disabled="radio == '2'" @click="nextHandle">下移</el-button>
+          </el-col> -->
+          <el-col :span="1.5">
+            <el-button type="primary" :disabled="radio == '2'" @click="lastHadnle">末位</el-button>
+          </el-col>
+        </el-row>
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+
+<script setup lang="ts">
+import { ref } from 'vue';
+import { formatDict, dictData } from '@/hooks';
+
+
+const props = defineProps({
+  dataList: {
+    type: Array,
+    default: []
+  }
+});
+
+interface DataItem {
+  xmid: string | number;
+  xmmc: string | number;
+  sort: string | number;
+}
+const currentIndex = ref(0);
+const radio = ref('1');
+const tableRef = ref();
+const dataList = ref<DataItem[]>([]);
+const columns = ref([
+  { prop: 'xmid', label: '项目ID', visible: true, align: 'center', },
+  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center', },
+  { prop: 'sort', label: '整体排序', visible: true, align: 'center', slot: "sort" },
+]);
+const tableConfig = ref({
+  border: true, // 边框
+  height: '100%', // 高度
+  highlightCurrentRow: true, // 高亮当前行
+  key: 'xmid'
+})
+
+
+//退拽属性
+const handleColumnDragEnd = (data: any) => {
+  // 更新列配置
+  dataList.value = data.list;
+}
+
+const handleRowClick = (row: DataItem) => {
+  currentIndex.value = dataList.value.indexOf(row);
+}
+
+
+
+const getList = () => {
+
+}
+
+const refresh = () => {
+  getList();
+}
+
+const cpHandle = () => {
+
+}
+const firstHandle = () => {
+  currentIndex.value = 0;
+  tableRef.value.setCurrentRow(dataList.value[0]);
+  tableRef.value.setScrollTop(0)
+}
+
+const lastHadnle = () => {
+  currentIndex.value = dataList.value.length - 1;
+  tableRef.value.setCurrentRow(dataList.value[currentIndex.value]);
+  tableRef.value.setScrollTop(dataList.value.length)
+}
+
+onMounted(() => {
+  for (let index = 0; index < 20; index++) {
+    dataList.value.push(
+      { xmid: 'ID' + index, xmmc: 'xmmc' + index, sort: '', }
+    )
+  }
+})
+</script>
+
+<style scoped lang="scss">
+.sort_box {
+  height: calc(100% - 58px);
+  padding-top: 8px;
+}
+
+.table-toolbar {
+  flex: 1;
+  display: flex;
+  flex-direction: column;
+  align-items: center;
+
+  .el-col {
+    width: 50%;
+  }
+
+  .el-button {
+    width: 80%;
+    margin-top: 20px;
+  }
+}
+
+
+
+.table-row {
+  height: 100%;
+  flex: 3;
+
+  .table-box {
+    height: 100%;
+  }
+}
+
+
+/* 可拖拽表格行样式提示 */
+:deep(.drag-table .el-table__row) {
+  cursor: move;
+  /* 鼠标移入行显示拖拽光标 */
+  transition: background-color 0.2s;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/index.vue b/src/views/liswork/xtwh/comopt-1/index.vue
new file mode 100644
index 0000000..d774bda
--- /dev/null
+++ b/src/views/liswork/xtwh/comopt-1/index.vue
@@ -0,0 +1,352 @@
+<template>
+  <div class="app-container">
+    <el-row :gutter="20" class="main-row">
+      <!-- 左侧树区域 -->
+      <el-col :span="4" :xs="24" class="tree-col">
+        <el-input v-model="deptName" placeholder="请输入仪器名称" clearable prefix-icon="Search" class="tree-search-input" />
+        <el-radio-group v-model="radiotype" @change="radioChange">
+          <el-radio value="1" size="large">仪器组</el-radio>
+          <el-radio value="2" size="large">所有仪器</el-radio>
+        </el-radio-group>
+        <div class="tree-container">
+          <el-tree :data="deptOptions" :props="treeProps" expand-on-click-node :filter-node-method="filterNode"
+            ref="deptTreeRef" node-key="id" highlight-current :expanded-keys="expandedKeys"
+            @node-click="handleNodeClick">
+            <!-- 自定义树节点模板：新增newflag徽章 -->
+            <template #default="{ node, data }">
+              <span class="tree-node-content">
+                {{ node.label }}
+                <!-- 新节点徽章：newflag=1时显示黄色"新"标 -->
+                <el-badge v-if="data.newflag === '1'" value="new" class="new-node-badge" />
+              </span>
+            </template>
+          </el-tree>
+        </div>
+      </el-col>
+
+      <!-- 右侧列表区域  -->
+      <el-col :span="20" :xs="24" class="table-col">
+        <el-row :gutter="10" class="yq-title-row">
+          <h1 class="yq-title">仪器: {{ yqmc }}</h1>
+        </el-row>
+        <el-tabs v-model="activeName" type="card" class="tabs_box">
+          <el-tab-pane v-for="tab in tabList" :key="tab.key" :label="tab.label" :name="tab.key" />
+        </el-tabs>
+        <!-- 动态组件渲染 -->
+        <component :is="currentComponent" :key="activeName" v-model="queryParams.yq" @updateTree="getDeptTree" />
+      </el-col>
+    </el-row>
+  </div>
+</template>
+
+<script setup name="ComOpt" lang="ts">
+import { ref, watch, nextTick, computed } from 'vue'
+import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
+import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
+import { getFirstLetter } from '@/utils/pinyin'
+import { formatDict, getDictData, dictData } from '@/hooks';
+import SysGlobal from './components/sysGlobal/index.vue'
+import SysInput from './components/sysInput/index.vue'
+import SysReport from './components/sysReport/index.vue'
+import SysParameter from './components/sysParameter/index.vue'
+import SysChannel from './components/sysChannel/index.vue'
+import SysSort from './components/sysSort/index.vue'
+
+// ========== TypeScript 类型定义 ==========
+interface InstrTreeNode {
+  id: string
+  label: string
+  lx: string
+  newflag: string  // 新增newflag字段
+  children?: InstrTreeNode[]
+}
+
+interface ParamTreeResponse {
+  code: string
+  msg: string
+  data: InstrTreeNode[]
+  url: null | string
+  method: null | string
+  params: null | any
+  problemId: null | string
+}
+
+interface QueryParams {
+  yq?: string | undefined
+  xxdh?: string | undefined
+  xxqz?: string | undefined
+  groupId?: string | undefined
+}
+
+
+const radiotype = ref<string>("1")
+// ========== 响应式变量 ==========
+// 树相关
+const deptTreeRef = ref<InstanceType<typeof ElTree>>()
+const deptOptions = ref<InstrTreeNode[]>([])
+const deptName = ref<string>("")
+const yqmc = ref<string>("")
+const expandedKeys = ref<string[]>([])
+const isFiltering = ref<boolean>(false)
+const treeProps = ref({
+  label: 'label',
+  children: 'children',
+  isLeaf: (data: Record<string, any>) => !data.children || data.children.length === 0
+})
+
+// 查询参数
+const queryParams = ref<QueryParams>({
+  yq: undefined,
+  xxdh: undefined,
+  xxqz: undefined,
+  groupId: undefined
+})
+
+
+
+const tabList = [
+  { key: 'SysGlobal', label: '全局设定', component: SysGlobal },
+  { key: 'SysInput', label: '界面设定', component: SysInput },
+  { key: 'SysParameter', label: '参数', component: SysParameter },
+  { key: 'SysChannel', label: '通道号', component: SysChannel },
+  { key: 'SysSort', label: '项目排序', component: SysSort },
+  { key: 'SysReport', label: '报告单设置', component: SysReport },
+]
+const activeName = ref('SysSort')
+
+// 计算当前要渲染的组件
+const currentComponent = computed(() => {
+  return tabList.find(tab => tab.key === activeName.value)?.component || 'SysGlobal'
+})
+
+
+const treeData = ref<InstrTreeNode[]>([])
+const radioChange = (val: string) => {
+  if (val == "1") {
+    deptOptions.value = treeData.value
+  } else {
+    const result = [];
+    // 遍历外层数组的每个分组
+    for (let i = 0; i < treeData.value.length; i++) {
+      const group = treeData.value[i];
+      if (group.children && Array.isArray(group.children)) {
+        for (let j = 0; j < group.children.length; j++) {
+          result.push(group.children[j]);
+        }
+      }
+    }
+    deptOptions.value = result
+  }
+}
+
+// ========== 树操作核心方法 ==========
+const forceExpandSingleNode = (nodeId: string): void => {
+  expandedKeys.value = []
+  nextTick(() => {
+    expandedKeys.value = [nodeId]
+    // deptTreeRef.value?.expand(nodeId, false)
+  })
+}
+
+const handleNodeClick = (data: InstrTreeNode): void => {
+  if (isFiltering.value) {
+    queryParams.value.groupId = data.id === "-1" ? undefined : data.id
+    return
+  }
+
+  if (data.children && data.children.length > 0) {
+    const isExpanded = expandedKeys.value.includes(data.id)
+    expandedKeys.value = isExpanded ? [] : [data.id]
+    !isExpanded && forceExpandSingleNode(data.id)
+  } else {
+    queryParams.value.yq = data.id
+    yqmc.value = data.label
+  }
+}
+// ========== 检索过滤逻辑 ==========
+const filterNode = (value: string, data: any, _node: TreeNode): boolean => {
+  if (!value) return true
+
+  const keyword = value.trim().toUpperCase()
+  const nodeLabel = data.label?.toLowerCase() || ''
+  const nodePinyinFirst = data.label ? getFirstLetter(data.label).toUpperCase() : ''
+
+  const currentMatch = nodeLabel.includes(keyword.toLowerCase()) || nodePinyinFirst.includes(keyword)
+  const childrenMatch = (data.children || []).some((child: any) => filterNode(value, child, _node))
+  return currentMatch || childrenMatch
+}
+
+const debounceFilter = (() => {
+  let timer: number | undefined
+  return (val: string): void => {
+    clearTimeout(timer)
+    timer = setTimeout(() => {
+      isFiltering.value = true
+      deptTreeRef.value?.filter(val)
+
+      if (val) {
+        expandedKeys.value = []
+        const expandMatched = (nodes: InstrTreeNode[]) => {
+          nodes.forEach(node => {
+            if (filterNode(val, node, {} as TreeNode) && node.children?.length) {
+              expandedKeys.value.push(node.id)
+            }
+            node.children && expandMatched(node.children)
+          })
+        }
+        expandMatched(deptOptions.value)
+      } else {
+        expandedKeys.value = []
+      }
+      isFiltering.value = false
+    }, 300)
+  }
+})()
+
+watch(deptName, debounceFilter, { immediate: false })
+
+// ========== 业务逻辑 ==========
+const getDeptTree = async (): Promise<void> => {
+  try {
+    const response = await paramTree() as ParamTreeResponse
+    if (response.code === "0" && response.data) {
+      treeData.value = response.data
+      radioChange('1')
+      if (!expandedKeys.value.length) {
+        // 默认展开第一个一级节点的子级
+        nextTick(() => {
+          if (deptOptions.value.length > 0) {
+            const firstLevelNode = deptOptions.value[0]
+            if (firstLevelNode && firstLevelNode.children && firstLevelNode.children.length > 0) {
+              expandedKeys.value = [firstLevelNode.id]
+              const firstChildNode = firstLevelNode.children[0]
+              queryParams.value.yq = firstChildNode.id
+              yqmc.value = firstChildNode.label
+
+              deptTreeRef.value?.setCurrentKey(firstChildNode.id)
+            }
+          }
+        })
+      }
+    } else {
+      ElMessage.warning(response.msg || "获取树数据失败")
+    }
+  } catch (error) {
+    ElMessage.error(`获取树数据异常：${(error as Error).message}`)
+  }
+}
+
+
+
+
+onMounted(() => {
+  getDictData('XMGL', 'MD')
+})
+// ========== 初始化 ==========
+getDeptTree()
+</script>
+
+<style lang="scss" scoped>
+.app-container {
+  width: 100%;
+  height: 90vh;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+  padding: 8px;
+  box-sizing: border-box;
+}
+
+.main-row {
+  display: flex;
+  flex: 1;
+  height: 100%;
+  overflow: hidden;
+}
+
+.tree-col {
+  height: 100%;
+  display: flex;
+  flex-direction: column;
+  overflow: hidden;
+
+
+  .tree-container {
+    flex: 1;
+    height: 100%;
+    overflow: auto;
+    background: #fff;
+    border: 1px solid #e6e6e6;
+    border-radius: 4px;
+    padding: 8px;
+
+    // 核心：树选中节点样式
+    :deep(.el-tree) {
+      --el-tree-node-transition-duration: 0.2s;
+
+      .el-tree-node__children {
+        transition: all var(--el-tree-node-transition-duration) ease-in-out;
+      }
+
+      .el-tree-node__expand-icon.is-leaf {
+        display: none;
+      }
+
+      // 选中节点的背景色（蓝色）+ 文字白色
+      .el-tree-node.is-current>.el-tree-node__content {
+        background-color: #409eff !important;
+        color: #ffffff !important;
+      }
+
+      // 选中节点hover样式（加深蓝色）
+      .el-tree-node.is-current>.el-tree-node__content:hover {
+        background-color: #1e88e5 !important;
+      }
+
+      // 树节点内容容器样式
+      .tree-node-content {
+        display: inline-flex;
+        align-items: center;
+        gap: 4px; // 徽章和文字间距
+        height: 100%;
+      }
+
+      // 新节点徽章样式
+      .new-node-badge {
+        --el-badge-font-size: 10px !important;
+        --el-badge-height: 16px !important;
+        --el-badge-padding: 0 4px !important;
+        --el-badge-warning-color: #FFEC24 !important; // 黄色徽章
+        --el-badge-warning-bg-color: #fff7e6 !important; // 浅黄色背景
+        --el-badge-border-radius: 2px !important; // 圆角优化
+
+        // 徽章文字样式
+        .el-badge__content {
+          font-size: 10px !important;
+          line-height: 16px !important;
+          padding: 0 4px !important;
+          height: 16px !important;
+        }
+      }
+    }
+  }
+}
+
+.table-col {
+  height: 100%;
+
+  // 仪器标题行样式
+  .yq-title-row {
+    margin-bottom: 8px;
+
+    .yq-title {
+      font-family: SourceHanSansCN, SourceHanSansCN;
+      font-size: 16px; // 缩小h1字体（默认24px→16px）
+      color: #409eff; // 蓝色（Element Plus主题色）
+      font-weight: 600;
+      margin: 0; // 清除默认margin
+      line-height: 1.2;
+    }
+  }
+}
+</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue b/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
index e8f367c..bb13802 100644
--- a/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
+++ b/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
@@ -11,70 +11,114 @@
       <el-col :span="1.5">
         <el-button type="danger" plain icon="Delete" @click="delItem">删除</el-button>
       </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" @click="allClear">清除所有项目接口号</el-button>
-      </el-col>
     </el-row>
 
-    <el-row :gutter="10" class="table-row">
-      <el-col :span="12" class="table-box">
-        <el-table :data="tableData" height="100%" border highlight-current-row>
-          <el-table-column label="通道号" align="center">
-            <template #default="scope">
-              <el-input v-model="scope.row.channel" placeholder="请输入通道号" class="full-width-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="项目" align="center">
-            <template #default="scope">
-              <SelectTable v-model:data="scope.row.xmid" :tableData="xmList" class="full-width-input" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <el-col :span="6">
-        <div class="tips">
-          说明：
-          “通道号”又称“接口代号”，是指仪器向电脑传送结果时项目的
-          标识符
-          接口代号对于一个仪器不可重复。
-        </div>
-      </el-col>
-    </el-row>
+    <div class="table-row">
+      <CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig" :loading="loading"
+        @row-click="handleRowClick">
+        <template #tdh="{ row }">
+          <el-input v-model="row.tdh" placeholder="请输入通道号" class="full-width-input" />
+        </template>
+        <template #xmmc="{ row }">
+          <SelectTable v-model:data="row.xmdh" :tableData="xmList" class="full-width-input" />
+        </template>
+      </CustomTable>
+    </div>
+
   </div>
 </template>
 
 <script setup lang="ts">
-import { queryXmInfoNewService } from '@/api/liswork/labItem/labItemApi';
+import { queryXmInfo, } from '@/api/liswork/work/LisWork';
+import { getitemtdh, saveitemtdh, delitemtdh } from '@/api/liswork/xtwh/ComOpt';
+import { ElMessage } from 'element-plus';
 const yq = defineModel<string>();
-
-const tableData = ref<Array<{ channel: string }>>([]);
+const loading = ref(false);
+const tableRef = ref();
+const tableData = ref<Array<{ tdh: string, xmdh: string }>>([]);
+const columns = [
+  { label: '序号', type: 'index', visible: true, width: 50, align: 'center' },
+  { label: '通道号', prop: 'tdh', visible: true, align: 'center', slot: 'tdh' },
+  { label: '项目代号', prop: 'xmdh', visible: true, align: 'center' },
+  { label: '项目', prop: 'xmmc', visible: true, align: 'center', slot: 'xmmc', showOverflowTooltip: false, width: 250 },
+  { label: '项目id', prop: 'xmid', visible: true, align: 'center' },
+];
+const tableConfig = {
+  border: true,
+  height: '100%',
+  highlightCurrentRow: true,
+}
 const handleSave = () => {
-};
+  const flag = tableData.value.every(item => item.tdh)
+  if (!flag) return ElMessage.error('请检查填写参数，通道号不能为空！')
+  let index = -1;
+  tableData.value.forEach((item, i) => {
+    const tdhLower = item.tdh.trim().toUpperCase();
+    index = tableData.value.findIndex(i => i.tdh.trim().toUpperCase() === tdhLower && i.tdh !== item.tdh);
+    if (index !== -1) {
+      return ElMessage.error(`通道号 ${item.tdh} ${i + 1}行已存在！`)
+    }
+  })
+  if (index !== -1) return
+  const arr = tableData.value.map(item => {
+    return {
+      ...item,
+      tdh: item.tdh.trim().toUpperCase(),
+      yq: yq.value
+    }
+  })
 
+  saveitemtdh(arr).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('保存成功！')
+      getChannel()
+    }
+  })
+};
+const selectedRow = ref<any>(null);
+const handleRowClick = (row: any) => {
+  selectedRow.value = row;
+};
 const addItem = () => {
-  tableData.value.push({ channel: '' })
+  tableData.value.push({ tdh: '', xmdh: '' })
+  nextTick(() => {
+    tableRef.value.setScrollTop(tableData.value.length)
+  })
 };
 
 const delItem = () => {
+  if (!selectedRow.value) return ElMessage.error('请选择要删除的行！')
+  delitemtdh({ yq: yq.value, tdh: selectedRow.value.tdh })
+  tableData.value = tableData.value.filter(item => item.xmdh !== selectedRow.value.xmdh)
+  getChannel()
 }
 
 const allClear = () => {
 }
-const xmList = ref<Array<{ xmmc: string, xmid: string }>>([]);
+const xmList = ref<Array<{ xmmc: string, xmdh: string }>>([]);
 const getXmList = () => {
-  queryXmInfoNewService({ yq: yq.value }).then((res: any) => {
-    xmList.value = res.rows.map((item: any) => {
+  loading.value = true;
+  queryXmInfo({ yq: yq.value }).then((res: any) => {
+    loading.value = false;
+    xmList.value = res.data.map((item: any) => {
       return {
         label: item.xmmc,
-        value: item.xmid.toString(),
+        value: item.xmdh,
       }
     })
   })
 };
 
-watch(() => yq.value, (val) => {
+const getChannel = () => {
+  getitemtdh({ yq: yq.value }).then((res: any) => {
+    tableData.value = res.data
+  })
+}
+
+watch(yq, (val) => {
   if (val) {
     getXmList();
+    getChannel();
   }
 }, { immediate: true });
 </script>
diff --git a/src/views/liswork/xtwh/comopt/components/sysParameter/index.vue b/src/views/liswork/xtwh/comopt/components/sysParameter/index.vue
index 5c19ce5..b0faa43 100644
--- a/src/views/liswork/xtwh/comopt/components/sysParameter/index.vue
+++ b/src/views/liswork/xtwh/comopt/components/sysParameter/index.vue
@@ -1,159 +1,169 @@
 <template>
   <!-- 参数列表 -->
   <div>
-    <el-row :gutter="10" class="table-toolbar">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
+    <template v-if="paramsFlag">
+      <el-row :gutter="10" class="table-toolbar">
+        <el-col :span="1.5">
+          <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
+        </el-col>
+        <!-- <el-col :span="1.5">
         <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
       </el-col>
       <el-col :span="1.5">
         <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" :model="formData" :rules="rules" label-width="120px" class="form-inline" inline>
-      <div class="title">说明：公式中阴阳对照请用NC,PC表示</div>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="测试波长" prop="csbc">
-            <el-select v-model="formData.csbc" style="width: 12rem;">
-              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <el-form-item label="参考波长" prop="ckbc">
-            <el-select v-model="formData.ckbc" style="width: 12rem;">
-              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="openDz">滤光片波长对照表</el-button>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阳性判断公式" prop="yxgs">
-            <el-input v-model="formData.yxgs" />
-          </el-form-item>
-        </el-col>
+      </el-col> -->
       </el-row>
 
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="上灰区" prop="shq">
-            <el-input v-model="formData.shq">
-              <template #append>% </template>
-            </el-input>
+      <el-form ref="form" :model="formData" :rules="rules" label-width="120px" class="form-inline" inline>
+        <div style="display: flex;">
+          <el-form-item label="项目" prop="xmdh">
+            <SelectTable v-model:data="xmdh" :tableData="xmList" style="width: 12rem;" @getDataValue='getXmInfo' />
           </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="下灰区" prop="xhq">
-            <el-input v-model="formData.xhq">
-              <template #append>% </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阴性对照下限" prop="negxx">
-            <el-input v-model="formData.negxx" />
-          </el-form-item>
-        </el-col>
-      </el-row>
+          <div class="title">说明：公式中阴阳对照请用NC,PC表示</div>
+        </div>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="测试波长" prop="csbc">
+              <el-select v-model="formData.csbc" style="width: 12rem;">
+                <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="display: flex;">
+            <el-form-item label="参考波长" prop="ckbc">
+              <el-select v-model="formData.ckbc" style="width: 12rem;">
+                <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
+              </el-select>
+            </el-form-item>
+            <el-button type="primary" @click="openDz">滤光片波长对照表</el-button>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="阳性判断公式" prop="yxgs">
+              <el-input v-model="formData.yxgs" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="阳性对照下限" prop="posxx">
-            <el-input v-model="formData.posxx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阴性对照上限" prop="negsx">
-            <el-input v-model="formData.negsx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阳性对照上限" prop="possx">
-            <el-input v-model="formData.possx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="上灰区" prop="shq">
+              <el-input v-model="formData.shq">
+                <template #append>% </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="下灰区" prop="xhq">
+              <el-input v-model="formData.xhq">
+                <template #append>% </template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="阴性对照下限" prop="negxx">
+              <el-input v-model="formData.negxx" />
+            </el-form-item>
+          </el-col>
+        </el-row>
 
-        </el-col>
-      </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="阳性对照下限" prop="posxx">
+              <el-input v-model="formData.posxx" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="阴性对照上限" prop="negsx">
+              <el-input v-model="formData.negsx" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="阳性对照上限" prop="possx">
+              <el-input v-model="formData.possx" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="6">
 
-      <el-divider></el-divider>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="项目性质" prop="xmxz">
-            <el-radio-group v-model="formData.xmxz">
-              <el-radio value="1">定性</el-radio>
-              <el-radio value="2">定量</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="移动模式" prop="ydfs">
-            <el-radio-group v-model="formData.ydfs">
-              <el-radio value="1">连续</el-radio>
-              <el-radio value="2">步进</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
+          </el-col>
+        </el-row>
 
-          <el-form-item label="测试模式" prop="csms">
-            <el-radio-group v-model="formData.csms">
-              <el-radio value="1">终点法</el-radio>
-              <el-radio value="2">两点法</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="振板频率" prop="zbpl">
-            <el-radio-group v-model="formData.zbpl">
-              <el-radio value="1">高</el-radio>
-              <el-radio value="2">中</el-radio>
-              <el-radio value="3">低</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="空白形式" prop="kbms">
-            <el-radio-group v-model="formData.kbms">
-              <el-radio value="1">空气</el-radio>
-              <el-radio value="2">试剂</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="振板时间" prop="zbsj">
-            <el-input v-model="formData.zbsj">
-              <template #append>秒</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="默认模板" prop="mrmb">
-            <el-select v-model="formData.mrmb" style="width: 12rem;">
-              <!-- <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" /> -->
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <el-form-item label="默认试剂" prop="mrsjph">
-            <el-select v-model="formData.mrsjph" style="width: 12rem;">
-              <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="sjHandle">试剂维护</el-button>
-        </el-col>
-      </el-row>
-    </el-form>
+        <el-divider></el-divider>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="项目性质" prop="xmxz">
+              <el-radio-group v-model="formData.xmxz">
+                <el-radio value="1">定性</el-radio>
+                <el-radio value="2">定量</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="移动模式" prop="ydfs">
+              <el-radio-group v-model="formData.ydfs">
+                <el-radio value="1">连续</el-radio>
+                <el-radio value="2">步进</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+
+            <el-form-item label="测试模式" prop="csms">
+              <el-radio-group v-model="formData.csms">
+                <el-radio value="1">终点法</el-radio>
+                <el-radio value="2">两点法</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="振板频率" prop="zbpl">
+              <el-radio-group v-model="formData.zbpl">
+                <el-radio value="1">高</el-radio>
+                <el-radio value="2">中</el-radio>
+                <el-radio value="3">低</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="空白形式" prop="kbms">
+              <el-radio-group v-model="formData.kbms">
+                <el-radio value="1">空气</el-radio>
+                <el-radio value="2">试剂</el-radio>
+              </el-radio-group>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8">
+            <el-form-item label="振板时间" prop="zbsj">
+              <el-input v-model="formData.zbsj">
+                <template #append>秒</template>
+              </el-input>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-divider></el-divider>
+        <el-row>
+          <el-col :span="8">
+            <el-form-item label="默认模板" prop="mrmb">
+              <el-select v-model="formData.mrmb" style="width: 12rem;">
+                <el-option v-for="item in mbList" :key="item.no" :value="item.no" :label="item.na" />
+              </el-select>
+            </el-form-item>
+          </el-col>
+          <el-col :span="8" style="display: flex;">
+            <el-form-item label="默认试剂" prop="mrsjph">
+              <el-select v-model="formData.mrsjph" style="width: 12rem;">
+                <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" />
+              </el-select>
+            </el-form-item>
+            <el-button type="primary" @click="sjHandle">试剂维护</el-button>
+          </el-col>
+        </el-row>
+      </el-form>
+    </template>
+    <template v-else>
+      <el-empty :image-size="200" description="暂无参数配置" />
+    </template>
 
     <!-- 波长对照表 -->
     <el-dialog v-model="dialogVisible" title="滤光波长对照表" draggable :close-on-click-modal="false" width="500px">
@@ -217,14 +227,16 @@
 </template>
 
 <script setup lang="ts">
-import { queryFilter, addXmFilter, delXmFilter, addXmLot, delXmLot, queryXmLot, querySjcs } from '@/api/liswork/xtwh/ComOpt'
+import { queryFilter, addXmFilter, delXmFilter, addXmLot, delXmLot, queryXmLot, querySjcs, querydouble, savedouble, querymbmc } from '@/api/liswork/xtwh/ComOpt'
 import { ElMessage } from 'element-plus';
 import { formatDict, dictData } from '@/hooks'
-import { get } from 'lodash';
+import { queryXmInfo } from '@/api/liswork/work/LisWork';
+
 
 const yq = defineModel<string>()
 
 const dialogVisible = ref(false)
+const xmdh = ref('');
 const formData = ref({
   csbc: '',
   ckbc: '',
@@ -242,7 +254,8 @@ const formData = ref({
   kbms: '1',
   zbsj: '',
   mrmb: '',
-  mrsjph: ''
+  mrsjph: '',
+  xmdh: '',
 });
 const rules = ref({
   csbc: [
@@ -253,11 +266,18 @@ const rules = ref({
   ]
 });
 
+const paramsFlag = ref(true);
+
 const form = ref();
 const handleSave = () => {
   form.value.validate((valid: boolean) => {
     if (valid) {
-      console.log('submit!')
+      savedouble(formData.value).then((res: any) => {
+        if (res.code == 0) {
+          ElMessage.success('保存成功！')
+          getXmInfo()
+        }
+      })
     }
   })
 }
@@ -310,6 +330,7 @@ interface sjList {
   sjcs: string, sjph: string, yq: string, yxq: string, csff: string
 }
 const sjShow = ref(false)
+const mbList = ref<Array<{ na: string, no: string }>>([])
 const sjtableData = ref<sjList[]>([])
 const sjHandle = () => {
   getSjList()
@@ -363,9 +384,38 @@ const getSjcjList = () => {
   })
 }
 
+const getXmInfo = () => {
+  querydouble({ yq: yq.value, xmdh: xmdh.value }).then((res: any) => {
+    paramsFlag.value = res.code == 1 ? false : true;
+    formData.value = res.data || {}
+  })
+}
+const xmList = ref<Array<{ label: string, value: string }>>([])
+const getXmList = () => {
+  queryXmInfo({ yq: yq.value }).then((res: any) => {
+    xmList.value = res.data.map((item: any) => {
+      return {
+        label: item.xmmc,
+        value: item.xmdh,
+      }
+    })
+  })
+};
+
+onMounted(() => {
+  querymbmc().then((res: any) => {
+    mbList.value = res.data || []
+  })
+});
+
 watch(yq, (newVal) => {
-  getDzList()
-  getSjList()
+  if (newVal) {
+    getXmInfo()
+    getDzList()
+    getSjList()
+    getXmList()
+  }
+  xmdh.value = ''
 }, {
   immediate: true,
   deep: true
diff --git a/src/views/liswork/xtwh/comopt/components/sysSort/index.vue b/src/views/liswork/xtwh/comopt/components/sysSort/index.vue
index 81db88d..9d4bda5 100644
--- a/src/views/liswork/xtwh/comopt/components/sysSort/index.vue
+++ b/src/views/liswork/xtwh/comopt/components/sysSort/index.vue
@@ -1,44 +1,28 @@
 <template>
   <!-- 整体排序 -->
   <div class="sort_box">
-    <el-row :gutter="10" class="table-row">
-      <el-col :span="20" class="table-box">
-        <CustomTable ref="tableRef" :data="dataList" :columns="columns" :config="tableConfig"
-          @row-click="handleRowClick">
-          <template #sort="{ row }">
-            <el-input v-model="row.sort" class="full-width-input" />
-          </template>
-        </CustomTable>
+    <el-row :gutter="10" class="table-toolbar">
+      <el-col :span="1.5">
+        <el-button type="primary" @click="refresh">刷新</el-button>
       </el-col>
-      <el-col :span="4">
-        <el-row :gutter="10" class="table-toolbar">
-          <!-- <el-col :span="1.5">
-            <el-radio-group v-model="radio" @change="radioChange">
-              <el-radio value="1">上下移动调整</el-radio>
-              <el-radio value="2">手工输入工号</el-radio>
-            </el-radio-group>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="primary" @click="refresh">刷新</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" @click="cpHandle">存盘</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" :disabled="radio == '2'" @click="firstHandle">首位</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" icon="top" :disabled="radio == '2'" @click="prevHandle">上移</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" icon="bottom" :disabled="radio == '2'" @click="nextHandle">下移</el-button>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="primary" :disabled="radio == '2'" @click="lastHadnle">末位</el-button>
-          </el-col>
-        </el-row>
+      <el-col :span="1.5">
+        <el-button type="primary" @click="cpHandle">存盘</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" @click="firstHandle">首位</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="primary" @click="lastHadnle">末位</el-button>
       </el-col>
     </el-row>
+    <div class="table-row">
+      <CustomTable ref="tableRef" :data="dataList" :columns="columns" :config="tableConfig" :enableRowDrag="true"
+        @row-drag-end="handleRowDragEnd" @row-click="handleRowClick">
+        <!-- <template #dyxh="{ row }">
+          <el-input v-model="row.dyxh" class="full-width-input" />
+        </template> -->
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -46,28 +30,21 @@
 <script setup lang="ts">
 import { ref } from 'vue';
 import { formatDict, dictData } from '@/hooks';
+import { getitemsort, saveitemsort } from '@/api/liswork/xtwh/ComOpt';
 
-
-const props = defineProps({
-  dataList: {
-    type: Array,
-    default: []
-  }
-});
-
+const yq = defineModel<string>()
 interface DataItem {
   xmid: string | number;
   xmmc: string | number;
-  sort: string | number;
+  dyxh: string | number;
 }
-const currentIndex = ref(0);
-const radio = ref('1');
+const selectedRow = ref<DataItem | null>(null)
 const tableRef = ref();
 const dataList = ref<DataItem[]>([]);
 const columns = ref([
-  { prop: 'xmid', label: '项目ID', visible: true, align: 'center', },
-  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center', },
-  { prop: 'sort', label: '整体排序', visible: true, align: 'center', slot: "sort" },
+  { prop: 'xmid', label: '项目ID', visible: true, align: 'center' },
+  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center' },
+  { prop: 'dyxh', label: '排序', visible: true, align: 'center', },
 ]);
 const tableConfig = ref({
   border: true, // 边框
@@ -78,19 +55,26 @@ const tableConfig = ref({
 
 
 //退拽属性
-const handleColumnDragEnd = (data: any) => {
-  // 更新列配置
-  dataList.value = data.list;
+const handleRowDragEnd = (data: any) => {
+  // 更新行顺序
+  dataList.value = data.list.map((item: any) => {
+    return {
+      ...item,
+      dyxh: item.sort,
+    }
+  })
 }
 
 const handleRowClick = (row: DataItem) => {
-  currentIndex.value = dataList.value.indexOf(row);
+  selectedRow.value = row
 }
 
 
 
 const getList = () => {
-
+  getitemsort({ yq: yq.value }).then((res: any) => {
+    dataList.value = res.data;
+  })
 }
 
 const refresh = () => {
@@ -98,56 +82,59 @@ const refresh = () => {
 }
 
 const cpHandle = () => {
-
+  saveitemsort(dataList.value).then(() => {
+    getList();
+  })
 }
 const firstHandle = () => {
-  currentIndex.value = 0;
-  tableRef.value.setCurrentRow(dataList.value[0]);
+  if (!selectedRow.value) return
+  const currentIndex = dataList.value.findIndex(item => item.xmid === selectedRow.value!.xmid)
+  if (currentIndex === 0) return
+  const [movedRow] = dataList.value.splice(currentIndex, 1)
+  dataList.value.unshift(movedRow)
+  resetSortNumber()
   tableRef.value.setScrollTop(0)
 }
 
 const lastHadnle = () => {
-  currentIndex.value = dataList.value.length - 1;
-  tableRef.value.setCurrentRow(dataList.value[currentIndex.value]);
+  if (!selectedRow.value) return
+  const currentIndex = dataList.value.findIndex(item => item.xmid === selectedRow.value!.xmid)
+  if (currentIndex === dataList.value.length - 1) return
+  const [movedRow] = dataList.value.splice(currentIndex, 1)
+  dataList.value.push(movedRow)
+  resetSortNumber()
   tableRef.value.setScrollTop(dataList.value.length)
 }
 
-onMounted(() => {
-  for (let index = 0; index < 20; index++) {
-    dataList.value.push(
-      { xmid: 'ID' + index, xmmc: 'xmmc' + index, sort: '', }
-    )
-  }
-})
+const resetSortNumber = () => {
+  dataList.value.forEach((item, index) => {
+    item.dyxh = index + 1
+  })
+}
+
+
+watch(yq, (newVal) => {
+  getList();
+}, { immediate: true })
 </script>
 
 <style scoped lang="scss">
 .sort_box {
-  height: calc(100% - 58px);
-  padding-top: 8px;
+  height: calc(100% - 56px);
 }
 
 .table-toolbar {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .el-col {
-    width: 50%;
-  }
-
-  .el-button {
-    width: 80%;
-    margin-top: 20px;
-  }
+  margin-bottom: 8px;
+  height: 36px;
+  line-height: 36px;
 }
 
 
 
 .table-row {
-  height: 100%;
-  flex: 3;
+  width: 50%;
+  height: calc(100% - 45px);
+
 
   .table-box {
     height: 100%;
diff --git a/src/views/liswork/xtwh/comopt/index.vue b/src/views/liswork/xtwh/comopt/index.vue
index d774bda..598045f 100644
--- a/src/views/liswork/xtwh/comopt/index.vue
+++ b/src/views/liswork/xtwh/comopt/index.vue
@@ -112,7 +112,7 @@ const tabList = [
   { key: 'SysSort', label: '项目排序', component: SysSort },
   { key: 'SysReport', label: '报告单设置', component: SysReport },
 ]
-const activeName = ref('SysSort')
+const activeName = ref('SysGlobal')
 
 // 计算当前要渲染的组件
 const currentComponent = computed(() => {
diff --git a/src/views/liswork/xtwh/xmFeeInstr/index.vue b/src/views/liswork/xtwh/xmFeeInstr/index.vue
index e53cb18..6b4cbf3 100644
--- a/src/views/liswork/xtwh/xmFeeInstr/index.vue
+++ b/src/views/liswork/xtwh/xmFeeInstr/index.vue
@@ -1,31 +1,34 @@
-<template>
 <!--仪器收费项目对照-->
-<el-row>
-  <el-form ref="form" :model="formData" label-width="80px" inline>
-    <el-form-item label="仪器" prop="yq">
-      <YQSelectTable v-model:data="formData.yq" width="200px" @getDataValue="getList"/>
-    </el-form-item>
-    <el-form-item label="项目检索" prop="item">
-      <el-input placeholder="名称，简拼" v-model="formData.item" @change="getList"></el-input>
-    </el-form-item>
-    <el-form-item>
-      <el-button type="primary" @click="onQueryClick">查询</el-button>
-    </el-form-item>
-    <el-form-item>
-      <span>说明：双击左侧列表，能删除对照数据，双击右边列表能新增数据到对照当中</span>
-    </el-form-item>
-  </el-form>
-</el-row>
-<el-row>
-  <el-col :span="5">
-    <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-    :config="tableConfig" @row-dblclick="onDBClickLeft"/>
-  </el-col>
-  <el-col :span="19">
-    <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-    :config="tableConfig" @row-dblclick="onDBClickRight"/>
-  </el-col>
-</el-row>
+<template>
+  <div class="app-container">
+    <el-row>
+      <el-form ref="form" :model="formData" label-width="80px" inline>
+        <el-form-item label="仪器" prop="yq">
+          <YQSelectTable v-model:data="formData.yq" width="200px" @getDataValue="getList" />
+        </el-form-item>
+        <el-form-item label="项目检索" prop="item">
+          <el-input placeholder="名称，简拼" v-model="formData.item" @change="getList"></el-input>
+        </el-form-item>
+        <el-form-item>
+          <el-button type="primary" @click="onQueryClick">查询</el-button>
+        </el-form-item>
+        <el-form-item>
+          <span class="tips">说明：双击左侧列表，能删除对照数据，双击右边列表能新增数据到对照当中</span>
+        </el-form-item>
+      </el-form>
+    </el-row>
+    <el-row :gutter="20" class="table-row">
+      <el-col :span="6" class="table-col">
+        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :config="tableConfig"
+          @row-dblclick="onDBClickLeft" />
+      </el-col>
+      <el-col :span="18" class="table-col">
+        <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true"
+          @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-dblclick="onDBClickRight" />
+      </el-col>
+    </el-row>
+
+  </div>
 
 
 </template>
@@ -33,88 +36,97 @@
 <script setup lang="ts">
 import CustomTable from '@/components/elTable/index.vue'
 import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
-import { queryService,queryXmService,addService,delService } from '@/api/liswork/xtwh/xmFeeinstrApi';
+import { queryService, queryXmService, addService, delService } from '@/api/liswork/xtwh/xmFeeinstrApi';
 import { queryOneService } from '@/api/system/parameter'
 import { ElMessage } from 'element-plus';
 
 const tableConfig = ref({
   border: true, // 边框
-  height: '76vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
-  // cellStyle: cellStyleHd
 })
 
 //退拽属性
 const handleColumnDragEnd = (data: any) => {
-  // 更新列配置
-  columnsLeft.value = data.columns;
   columnsRight.value = data.columns;
 }
 
 const columnsLeft = ref([
-  { prop: 'sfxmmc', label: '当前仪器对应的收费项目', visible: true, align: 'center', width: 300 },
+  { prop: 'sfxmmc', label: '当前仪器对应的收费项目', visible: true, },
   { prop: 'yq', label: '仪器', visible: false, align: 'center', width: 100 },
 ]);
 const columnsRight = ref([
-  { prop: 'xmlb', label: '类别', visible: true, align: 'center', width: 100 },
-  { prop: 'sfxmdh', label: '收费项目代号', visible: true, align: 'center', width: 200 },
-  { prop: 'sfxmmc', label: '收费项目名称', visible: true, align: 'center', width: 300 },
-  { prop: 'dj', label: '单价', visible: true, align: 'center', width: 100 },
-  { prop: 'cp_yq', label: '分配了仪器', visible: true, align: 'center', width: 400 }
+  { prop: 'xmlb', label: '类别', visible: true, align: 'center', },
+  { prop: 'sfxmdh', label: '收费项目代号', visible: true, align: 'center', },
+  { prop: 'sfxmmc', label: '收费项目名称', visible: true, align: 'center', },
+  { prop: 'dj', label: '单价', visible: true, align: 'center', },
+  { prop: 'cp_yq', label: '分配了仪器', visible: true, align: 'center', }
 ]);
 
-const dataListLeft = ref([
-  {'sfxmdh':'','yq':''}
-])
+const dataListLeft = ref([])
 const dataListRight = ref([])
 const formData = ref({
-  yq: '',
+  yq: '46',
   item: ''
 })
 
 //刷新数据
 const getList = async () => {
-   if(!formData.value.yq) formData.value.yq = ''
-   let res = await queryService({yq: formData.value.yq});
-   dataListLeft.value = res.data;
-   res = await queryOneService('HISOPT','sp_gyxmyljg')
-   let param = res.data.value
-   //先写固定值，后面再改
-   if(param && param !== ''){
-      param = '1'
-   }else{
-      param = '1'
-   }
-   res = await queryXmService({yljg: param,yq: formData.value.yq,queryValue: formData.value.item});
-   dataListRight.value = res.data;
+  if (!formData.value.yq) formData.value.yq = ''
+  let res = await queryService({ yq: formData.value.yq });
+  dataListLeft.value = res.data;
+  // res = await queryOneService('HISOPT', 'sp_gyxmyljg')
+  // let param = res.data.value
+  //先写固定值，后面再改
+  let param = '1'
+  if (param && param !== '') {
+    param = '1'
+  } else {
+    param = '1'
+  }
+  res = await queryXmService({ yljg: param, yq: formData.value.yq, queryValue: formData.value.item });
+  dataListRight.value = res.data;
 };
 
-const onDBClickRight = async (row:any)=> {
+const onDBClickRight = async (row: any) => {
   //新增数据
-  await addService({sfxmdh:row.sfxmdh,yq: formData.value.yq})
+  await addService({ sfxmdh: row.sfxmdh, yq: formData.value.yq })
   ElMessage.success('新增成功！')
   getList()
 }
 
-const onDBClickLeft = async (row:any) => {
+const onDBClickLeft = async (row: any) => {
   //删除数据
-  await delService({yq: formData.value.yq,sfxmdh: row.sfxmdh})
+  await delService({ yq: formData.value.yq, sfxmdh: row.sfxmdh })
   ElMessage.success('删除成功！')
   getList()
 }
 
 const onQueryClick = () => {
-  if(!formData.value.yq) {
+  if (!formData.value.yq) {
     ElMessage.error('请先选择仪器！')
     return
   }
   getList()
 }
 
-
-
+getList()
 
 </script>
 
 <style scoped lang="scss">
+.tips {
+  font-family: SourceHanSansCN, SourceHanSansCN;
+  font-size: 16px;
+  color: #409eff;
+  font-weight: 600;
+}
+
+.table-row {
+  height: calc(100% - 58px);
+
+  .table-col {
+    height: 100%;
+  }
+}
 </style>
diff --git a/src/views/liswork/xtwh/xmReqItemVsApi/index.vue b/src/views/liswork/xtwh/xmReqItemVs/index.vue
similarity index 100%
rename from src/views/liswork/xtwh/xmReqItemVsApi/index.vue
rename to src/views/liswork/xtwh/xmReqItemVs/index.vue

From 574fb9bc6eddac0d496e885aafedc60510df1db6 Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Thu, 25 Dec 2025 18:53:23 +0800
Subject: [PATCH 5/7] =?UTF-8?q?=E5=90=88=E5=B9=B6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/liswork/xtwh/ComOpt.ts                |  64 +++
 .../comopt-1/components/sysChannel/index.vue  | 108 -----
 .../comopt-1/components/sysGlobal/index.vue   | 330 ---------------
 .../comopt-1/components/sysInput/index.vue    | 330 ---------------
 .../components/sysParameter/index.vue         | 389 ------------------
 .../comopt-1/components/sysReport/index.vue   |  12 -
 .../comopt-1/components/sysSort/index.vue     | 164 --------
 src/views/liswork/xtwh/comopt-1/index.vue     | 352 ----------------
 src/views/regional/circulation/bbcx/index.vue |  28 +-
 src/views/regional/circulation/bbqs/index.vue |  30 +-
 src/views/regional/circulation/bbth/index.vue |  28 +-
 src/views/regional/statistics/bbtj/index.vue  | 104 +++--
 src/views/regional/statistics/fytj/index.vue  |  12 +-
 13 files changed, 192 insertions(+), 1759 deletions(-)
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
 delete mode 100644 src/views/liswork/xtwh/comopt-1/index.vue

diff --git a/src/api/liswork/xtwh/ComOpt.ts b/src/api/liswork/xtwh/ComOpt.ts
index 5624cfb..14ece01 100644
--- a/src/api/liswork/xtwh/ComOpt.ts
+++ b/src/api/liswork/xtwh/ComOpt.ts
@@ -106,4 +106,68 @@ export function querySjcs(data?: Object) {
     method: 'get',
     params: data
   });
+}
+// 查询检验项目排序
+export function getitemsort(data?: Object) {
+  return request({
+    url: '/xminfo/getitemsort',
+    method: 'get',
+    params: data
+  });
+}
+// 保存检验项目排序
+export function saveitemsort(data?: Object) {
+  return request({
+    url: '/xminfo/saveitemsort',
+    method: 'post',
+    data
+  });
+}
+// 查询检验项目通道号
+export function getitemtdh(data?: Object) {
+  return request({
+    url: '/xminfo/getitemtdh',
+    method: 'get',
+    params: data
+  });
+}
+// 保存检验项目通道号
+export function saveitemtdh(data?: Object) {
+  return request({
+    url: '/xminfo/saveitemtdh',
+    method: 'post',
+    data
+  });
+}
+// 删除检验项目通道号
+export function delitemtdh(data?: Object) {
+  return request({
+    url: '/xminfo/delitemtdh',
+    method: 'get',
+    params: data
+  });
+}
+// 获取仪器参数
+export function querydouble(data?: Object) {
+  return request({
+    url: '/xminfo/querydouble',
+    method: 'get',
+    params: data
+  });
+}
+// 保存仪器参数
+export function savedouble(data?: Object) {
+  return request({
+    url: '/xminfo/savedouble',
+    method: 'post',
+    data
+  });
+}
+// 获取参数默认模板
+export function querymbmc(data?: Object) {
+  return request({
+    url: '/xminfo/querymbmc',
+    method: 'get',
+    params: data
+  });
 }
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
deleted file mode 100644
index e8f367c..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysChannel/index.vue
+++ /dev/null
@@ -1,108 +0,0 @@
-<template>
-  <!-- 通道号配置 -->
-  <div class="table-container">
-    <el-row :gutter="10" class="table-toolbar">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" @click="addItem">新增</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" @click="delItem">删除</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="Delete" @click="allClear">清除所有项目接口号</el-button>
-      </el-col>
-    </el-row>
-
-    <el-row :gutter="10" class="table-row">
-      <el-col :span="12" class="table-box">
-        <el-table :data="tableData" height="100%" border highlight-current-row>
-          <el-table-column label="通道号" align="center">
-            <template #default="scope">
-              <el-input v-model="scope.row.channel" placeholder="请输入通道号" class="full-width-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="项目" align="center">
-            <template #default="scope">
-              <SelectTable v-model:data="scope.row.xmid" :tableData="xmList" class="full-width-input" />
-            </template>
-          </el-table-column>
-        </el-table>
-      </el-col>
-      <el-col :span="6">
-        <div class="tips">
-          说明：
-          “通道号”又称“接口代号”，是指仪器向电脑传送结果时项目的
-          标识符
-          接口代号对于一个仪器不可重复。
-        </div>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { queryXmInfoNewService } from '@/api/liswork/labItem/labItemApi';
-const yq = defineModel<string>();
-
-const tableData = ref<Array<{ channel: string }>>([]);
-const handleSave = () => {
-};
-
-const addItem = () => {
-  tableData.value.push({ channel: '' })
-};
-
-const delItem = () => {
-}
-
-const allClear = () => {
-}
-const xmList = ref<Array<{ xmmc: string, xmid: string }>>([]);
-const getXmList = () => {
-  queryXmInfoNewService({ yq: yq.value }).then((res: any) => {
-    xmList.value = res.rows.map((item: any) => {
-      return {
-        label: item.xmmc,
-        value: item.xmid.toString(),
-      }
-    })
-  })
-};
-
-watch(() => yq.value, (val) => {
-  if (val) {
-    getXmList();
-  }
-}, { immediate: true });
-</script>
-
-<style scoped lang="scss">
-.table-container {
-  height: calc(100% - 58px);
-}
-
-.table-toolbar {
-  margin-bottom: 8px;
-  height: 36px;
-  line-height: 36px;
-}
-
-.tips {
-  font-family: SourceHanSansCN, SourceHanSansCN;
-  font-size: 16px;
-  color: #409eff;
-  font-weight: 600;
-}
-
-.table-row {
-  height: calc(100% - 45px);
-
-  .table-box {
-    height: 100%;
-
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
deleted file mode 100644
index 3b0a308..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysGlobal/index.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-<!-- 系统全局选项 -->
-<template>
-  <div class="sys_box">
-    <el-row :gutter="10" class="table-toolbar">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
-      </el-col>
-    </el-row>
-
-    <!-- 三列表格容器 -->
-    <div class="triple-table-wrapper">
-      <!-- 第一列表格 -->
-      <div class="table-panel table-1">
-        <el-table v-loading="loading" :data="tableData1" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-
-      <!-- 第二列表格 -->
-      <div class="table-panel table-2">
-        <el-table v-loading="loading" :data="tableData2" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-
-      <!-- 第三列表格 -->
-      <div class="table-panel table-3">
-        <el-table v-loading="loading" :data="tableData3" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
-import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
-import { getFirstLetter } from '@/utils/pinyin'
-// @ts-ignore
-import DynamicInput from "@/views/liswork/xtwh/localconfig/components/DynamicInput.vue"
-const emits = defineEmits(['updateTree'])
-const yq = defineModel<string>()
-
-interface RegDictItem {
-  configId: string | number
-  configSort: number
-  configCode: string
-  configName: string
-  configDefvalue: string | number
-  configOptiontype: string
-  remark: string
-}
-// 列表相关
-const optiontype = ref<string>("SYSTEM")
-const menuname = ref<string>("系统全局")
-const regdictList = ref<RegDictItem[]>([])
-const originRegdictList = ref<RegDictItem[]>([])
-const loading = ref<boolean>(false)
-const total = ref<number>(0)
-
-// 选择相关
-const ids = ref<(string | number)[]>([])
-const single = ref<boolean>(true)
-const multiple = ref<boolean>(true)
-
-// ========== 核心：拆分三列表格数据 ==========
-const tableData1 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3) // 每列基础行数
-  return regdictList.value.slice(0, splitSize)
-})
-
-const tableData2 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3)
-  return regdictList.value.slice(splitSize, splitSize * 2)
-})
-
-const tableData3 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3)
-  return regdictList.value.slice(splitSize * 2)
-})
-
-
-const getList = async (): Promise<void> => {
-  loading.value = true
-  try {
-    const response = await paramList({ yq: yq.value, optiontype: optiontype.value })
-    regdictList.value = JSON.parse(JSON.stringify(response.data))
-    originRegdictList.value = JSON.parse(JSON.stringify(response.data))
-    total.value = response.data.length
-  } catch (error) {
-    ElMessage.error(`获取列表异常：${(error as Error).message}`)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleSelectionChange = (val: RegDictItem[]): void => {
-  ids.value = val.map(item => item.configId)
-  single.value = val.length === 1
-  multiple.value = val.length > 1
-}
-
-const handleSave = async (): Promise<void> => {
-  try {
-    loading.value = true
-    // 合并三列表格数据提交
-    const allData = [...tableData1.value, ...tableData2.value, ...tableData3.value]
-    const res = await updateParam(allData)
-    if (res.code == 0) {
-      ElMessage.success(res.msg || "保存成功")
-      originRegdictList.value = JSON.parse(JSON.stringify(allData))
-      // 更新树结构状态
-      emits('updateTree')
-    }
-  } catch (error) {
-    ElMessage.error(`保存失败：${(error as Error).message}`)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleCancelEdit = (): void => {
-  ElMessageBox.confirm(
-    "是否确认取消所有修改，恢复原始数据？",
-    "提示",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning"
-    }
-  ).then(() => {
-    regdictList.value = JSON.parse(JSON.stringify(originRegdictList.value))
-    ElMessage.success("已恢复原始数据！")
-  })
-}
-
-const handleRestoreDefault = async (): Promise<void> => {
-  ElMessageBox.confirm(
-    "是否确认还原所有默认值？此操作会覆盖当前修改！",
-    "警告",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "error"
-    }
-  ).then(async () => {
-    loading.value = true
-    try {
-      const res = await getdef({ optiontype: optiontype.value })
-      regdictList.value = JSON.parse(JSON.stringify(res.data))
-      originRegdictList.value = JSON.parse(JSON.stringify(res.data))
-      total.value = res.data.length
-      ElMessage.success("还原默认值成功！")
-    } catch (error) {
-      ElMessage.error(`还原失败：${(error as Error).message}`)
-    } finally {
-      loading.value = false
-    }
-  })
-}
-
-
-watch(yq, (newVal) => {
-  if (newVal !== undefined) {
-    getList()
-  }
-}, {
-  immediate: true,
-  deep: true
-})
-</script>
-
-<style scoped lang="scss">
-.sys_box {
-  height: calc(100% - 58px);
-}
-
-.table-toolbar {
-  margin-bottom: 8px;
-  height: 36px;
-  line-height: 36px;
-}
-
-// 三列表格容器
-.triple-table-wrapper {
-  flex: 1;
-  height: calc(100% - 45px); // 减去标题行+工具栏高度
-  display: flex;
-  gap: 0px; // 表格间间距
-  overflow: hidden;
-
-  // 单个表格面板
-  .table-panel {
-    flex: 1; // 三列均等分
-    height: 100%;
-    overflow: hidden;
-    background: #fff;
-    border: 1px solid #e6e6e6;
-    border-radius: 4px;
-
-    // 细微间距优化
-    &.table-1 {
-      margin-right: 0px;
-    }
-
-    &.table-2 {
-      margin: 0 0px;
-    }
-
-    &.table-3 {
-      margin-left: 0px;
-    }
-  }
-}
-
-
-// 核心：清除表格内上下间隙
-:deep(.config-table) {
-  // 清除表格整体的边框间距
-  border-collapse: collapse !important;
-  border-spacing: 0 !important;
-
-  // 清除表格头部间距
-  .el-table__header {
-    padding: 0 !important;
-
-    th {
-      padding: 0 !important;
-      border-bottom: 1px solid #e6e6e6 !important;
-      line-height: 25px !important;
-      height: 25px !important;
-    }
-  }
-
-  // 清除表格内容区间距
-  .el-table__body {
-    padding: 0 !important;
-
-    // 清除行间距
-    .el-table__row {
-      height: 25px !important;
-      line-height: 25px !important;
-      margin: 0 !important;
-      padding: 0 !important;
-    }
-
-    // 清除单元格内边距和间距
-    .el-table__cell {
-      padding: 0 4px !important; // 仅保留左右内边距，上下清零
-      height: 25px !important;
-      line-height: 25px !important;
-      vertical-align: middle !important;
-      font-size: 12px;
-      border-bottom: 1px solid #e6e6e6 !important;
-      border-right: 1px solid #e6e6e6 !important;
-    }
-
-    // 最后一列清除右侧边框
-    .el-table__cell:last-child {
-      border-right: none !important;
-    }
-  }
-
-  // 清除表格底部间距
-  .el-table__footer {
-    padding: 0 !important;
-  }
-
-  // 编辑输入框适配紧凑布局
-  .edit-input {
-    width: 95%;
-    margin: 0 !important;
-    padding: 0 !important;
-
-    :deep(.el-input__inner) {
-      padding: 0 5px;
-      height: 25px !important; // 缩小输入框高度适配紧凑行高
-      line-height: 25px !important;
-      font-size: 12px;
-      border: 1px solid #dcdfe6;
-      margin: 0 !important;
-
-      &:focus {
-        border-color: #409eff;
-        outline: none;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
deleted file mode 100644
index e1bac06..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysInput/index.vue
+++ /dev/null
@@ -1,330 +0,0 @@
-<!-- 系统全局选项 -->
-<template>
-  <div class="sys_box">
-    <el-row :gutter="10" class="table-toolbar">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
-      </el-col>
-    </el-row>
-
-    <!-- 三列表格容器 -->
-    <div class="triple-table-wrapper">
-      <!-- 第一列表格 -->
-      <div class="table-panel table-1">
-        <el-table v-loading="loading" :data="tableData1" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-
-      <!-- 第二列表格 -->
-      <div class="table-panel table-2">
-        <el-table v-loading="loading" :data="tableData2" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-
-      <!-- 第三列表格 -->
-      <div class="table-panel table-3">
-        <el-table v-loading="loading" :data="tableData3" @selection-change="handleSelectionChange" class="config-table"
-          fit border height="100%" :cell-spacing="0">
-          <el-table-column label="序号" align="center" prop="configSort" width="50" />
-          <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip
-            min-width="150" />
-          <el-table-column label="参数值" align="center" prop="configDefvalue" show-overflow-tooltip min-width="100">
-            <template #default="scope">
-              <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
-                :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
-            </template>
-          </el-table-column>
-          <el-table-column label="值码" align="center" prop="configDefvalue" v-if="false" show-overflow-tooltip
-            min-width="100" />
-        </el-table>
-      </div>
-    </div>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
-import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
-import { getFirstLetter } from '@/utils/pinyin'
-// @ts-ignore
-import DynamicInput from "@/views/liswork/xtwh/localconfig/components/DynamicInput.vue"
-const emits = defineEmits(['updateTree'])
-const yq = defineModel<string>()
-
-interface RegDictItem {
-  configId: string | number
-  configSort: number
-  configCode: string
-  configName: string
-  configDefvalue: string | number
-  configOptiontype: string
-  remark: string
-}
-// 列表相关
-const optiontype = ref<string>("INPUT")
-const menuname = ref<string>("界面设定")
-const regdictList = ref<RegDictItem[]>([])
-const originRegdictList = ref<RegDictItem[]>([])
-const loading = ref<boolean>(false)
-const total = ref<number>(0)
-
-// 选择相关
-const ids = ref<(string | number)[]>([])
-const single = ref<boolean>(true)
-const multiple = ref<boolean>(true)
-
-// ========== 核心：拆分三列表格数据 ==========
-const tableData1 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3) // 每列基础行数
-  return regdictList.value.slice(0, splitSize)
-})
-
-const tableData2 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3)
-  return regdictList.value.slice(splitSize, splitSize * 2)
-})
-
-const tableData3 = computed<RegDictItem[]>(() => {
-  const splitSize = Math.ceil(total.value / 3)
-  return regdictList.value.slice(splitSize * 2)
-})
-
-
-const getList = async (): Promise<void> => {
-  loading.value = true
-  try {
-    const response = await paramList({ yq: yq.value, optiontype: optiontype.value })
-    regdictList.value = JSON.parse(JSON.stringify(response.data))
-    originRegdictList.value = JSON.parse(JSON.stringify(response.data))
-    total.value = response.data.length
-  } catch (error) {
-    ElMessage.error(`获取列表异常：${(error as Error).message}`)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleSelectionChange = (val: RegDictItem[]): void => {
-  ids.value = val.map(item => item.configId)
-  single.value = val.length === 1
-  multiple.value = val.length > 1
-}
-
-const handleSave = async (): Promise<void> => {
-  try {
-    loading.value = true
-    // 合并三列表格数据提交
-    const allData = [...tableData1.value, ...tableData2.value, ...tableData3.value]
-    const res = await updateParam(allData)
-    if (res.code == 0) {
-      ElMessage.success(res.msg || "保存成功")
-      originRegdictList.value = JSON.parse(JSON.stringify(allData))
-      // 更新树结构状态
-      emits('updateTree')
-    }
-  } catch (error) {
-    ElMessage.error(`保存失败：${(error as Error).message}`)
-  } finally {
-    loading.value = false
-  }
-}
-
-const handleCancelEdit = (): void => {
-  ElMessageBox.confirm(
-    "是否确认取消所有修改，恢复原始数据？",
-    "提示",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "warning"
-    }
-  ).then(() => {
-    regdictList.value = JSON.parse(JSON.stringify(originRegdictList.value))
-    ElMessage.success("已恢复原始数据！")
-  })
-}
-
-const handleRestoreDefault = async (): Promise<void> => {
-  ElMessageBox.confirm(
-    "是否确认还原所有默认值？此操作会覆盖当前修改！",
-    "警告",
-    {
-      confirmButtonText: "确定",
-      cancelButtonText: "取消",
-      type: "error"
-    }
-  ).then(async () => {
-    loading.value = true
-    try {
-      const res = await getdef({ optiontype: optiontype.value })
-      regdictList.value = JSON.parse(JSON.stringify(res.data))
-      originRegdictList.value = JSON.parse(JSON.stringify(res.data))
-      total.value = res.data.length
-      ElMessage.success("还原默认值成功！")
-    } catch (error) {
-      ElMessage.error(`还原失败：${(error as Error).message}`)
-    } finally {
-      loading.value = false
-    }
-  })
-}
-
-
-watch(yq, (newVal) => {
-  if (newVal !== undefined) {
-    getList()
-  }
-}, {
-  immediate: true,
-  deep: true
-})
-</script>
-
-<style scoped lang="scss">
-.sys_box {
-  height: calc(100% - 58px);
-}
-
-.table-toolbar {
-  margin-bottom: 8px;
-  height: 36px;
-  line-height: 36px;
-}
-
-// 三列表格容器
-.triple-table-wrapper {
-  flex: 1;
-  height: calc(100% - 45px); // 减去标题行+工具栏高度
-  display: flex;
-  gap: 0px; // 表格间间距
-  overflow: hidden;
-
-  // 单个表格面板
-  .table-panel {
-    flex: 1; // 三列均等分
-    height: 100%;
-    overflow: hidden;
-    background: #fff;
-    border: 1px solid #e6e6e6;
-    border-radius: 4px;
-
-    // 细微间距优化
-    &.table-1 {
-      margin-right: 0px;
-    }
-
-    &.table-2 {
-      margin: 0 0px;
-    }
-
-    &.table-3 {
-      margin-left: 0px;
-    }
-  }
-}
-
-
-// 核心：清除表格内上下间隙
-:deep(.config-table) {
-  // 清除表格整体的边框间距
-  border-collapse: collapse !important;
-  border-spacing: 0 !important;
-
-  // 清除表格头部间距
-  .el-table__header {
-    padding: 0 !important;
-
-    th {
-      padding: 0 !important;
-      border-bottom: 1px solid #e6e6e6 !important;
-      line-height: 25px !important;
-      height: 25px !important;
-    }
-  }
-
-  // 清除表格内容区间距
-  .el-table__body {
-    padding: 0 !important;
-
-    // 清除行间距
-    .el-table__row {
-      height: 25px !important;
-      line-height: 25px !important;
-      margin: 0 !important;
-      padding: 0 !important;
-    }
-
-    // 清除单元格内边距和间距
-    .el-table__cell {
-      padding: 0 4px !important; // 仅保留左右内边距，上下清零
-      height: 25px !important;
-      line-height: 25px !important;
-      vertical-align: middle !important;
-      font-size: 12px;
-      border-bottom: 1px solid #e6e6e6 !important;
-      border-right: 1px solid #e6e6e6 !important;
-    }
-
-    // 最后一列清除右侧边框
-    .el-table__cell:last-child {
-      border-right: none !important;
-    }
-  }
-
-  // 清除表格底部间距
-  .el-table__footer {
-    padding: 0 !important;
-  }
-
-  // 编辑输入框适配紧凑布局
-  .edit-input {
-    width: 95%;
-    margin: 0 !important;
-    padding: 0 !important;
-
-    :deep(.el-input__inner) {
-      padding: 0 5px;
-      height: 25px !important; // 缩小输入框高度适配紧凑行高
-      line-height: 25px !important;
-      font-size: 12px;
-      border: 1px solid #dcdfe6;
-      margin: 0 !important;
-
-      &:focus {
-        border-color: #409eff;
-        outline: none;
-      }
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
deleted file mode 100644
index 5c19ce5..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysParameter/index.vue
+++ /dev/null
@@ -1,389 +0,0 @@
-<template>
-  <!-- 参数列表 -->
-  <div>
-    <el-row :gutter="10" class="table-toolbar">
-      <el-col :span="1.5">
-        <el-button type="primary" plain icon="Check" @click="handleSave">保存</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="success" plain icon="Edit" @click="handleCancelEdit">取消修改</el-button>
-      </el-col>
-      <el-col :span="1.5">
-        <el-button type="danger" plain icon="RefreshRight" @click="handleRestoreDefault">还原默认</el-button>
-      </el-col>
-    </el-row>
-
-    <el-form ref="form" :model="formData" :rules="rules" label-width="120px" class="form-inline" inline>
-      <div class="title">说明：公式中阴阳对照请用NC,PC表示</div>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="测试波长" prop="csbc">
-            <el-select v-model="formData.csbc" style="width: 12rem;">
-              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <el-form-item label="参考波长" prop="ckbc">
-            <el-select v-model="formData.ckbc" style="width: 12rem;">
-              <el-option v-for="item in dzList" :key="item.lgph" :value="item.lgph" :label="item.bc" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="openDz">滤光片波长对照表</el-button>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阳性判断公式" prop="yxgs">
-            <el-input v-model="formData.yxgs" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="上灰区" prop="shq">
-            <el-input v-model="formData.shq">
-              <template #append>% </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="下灰区" prop="xhq">
-            <el-input v-model="formData.xhq">
-              <template #append>% </template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阴性对照下限" prop="negxx">
-            <el-input v-model="formData.negxx" />
-          </el-form-item>
-        </el-col>
-      </el-row>
-
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="阳性对照下限" prop="posxx">
-            <el-input v-model="formData.posxx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阴性对照上限" prop="negsx">
-            <el-input v-model="formData.negsx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="阳性对照上限" prop="possx">
-            <el-input v-model="formData.possx" />
-          </el-form-item>
-        </el-col>
-        <el-col :span="6">
-
-        </el-col>
-      </el-row>
-
-      <el-divider></el-divider>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="项目性质" prop="xmxz">
-            <el-radio-group v-model="formData.xmxz">
-              <el-radio value="1">定性</el-radio>
-              <el-radio value="2">定量</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="移动模式" prop="ydfs">
-            <el-radio-group v-model="formData.ydfs">
-              <el-radio value="1">连续</el-radio>
-              <el-radio value="2">步进</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-
-          <el-form-item label="测试模式" prop="csms">
-            <el-radio-group v-model="formData.csms">
-              <el-radio value="1">终点法</el-radio>
-              <el-radio value="2">两点法</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="振板频率" prop="zbpl">
-            <el-radio-group v-model="formData.zbpl">
-              <el-radio value="1">高</el-radio>
-              <el-radio value="2">中</el-radio>
-              <el-radio value="3">低</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="空白形式" prop="kbms">
-            <el-radio-group v-model="formData.kbms">
-              <el-radio value="1">空气</el-radio>
-              <el-radio value="2">试剂</el-radio>
-            </el-radio-group>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8">
-          <el-form-item label="振板时间" prop="zbsj">
-            <el-input v-model="formData.zbsj">
-              <template #append>秒</template>
-            </el-input>
-          </el-form-item>
-        </el-col>
-      </el-row>
-      <el-divider></el-divider>
-      <el-row>
-        <el-col :span="8">
-          <el-form-item label="默认模板" prop="mrmb">
-            <el-select v-model="formData.mrmb" style="width: 12rem;">
-              <!-- <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" /> -->
-            </el-select>
-          </el-form-item>
-        </el-col>
-        <el-col :span="8" style="display: flex;">
-          <el-form-item label="默认试剂" prop="mrsjph">
-            <el-select v-model="formData.mrsjph" style="width: 12rem;">
-              <el-option v-for="item in sjtableData" :key="item.sjph" :value="item.sjph" :label="item.sjph" />
-            </el-select>
-          </el-form-item>
-          <el-button type="primary" @click="sjHandle">试剂维护</el-button>
-        </el-col>
-      </el-row>
-    </el-form>
-
-    <!-- 波长对照表 -->
-    <el-dialog v-model="dialogVisible" title="滤光波长对照表" draggable :close-on-click-modal="false" width="500px">
-      <div class="mb5">
-        <el-button type="primary" @click="savaItem">保存</el-button>
-        <el-button type="primary" @click="addItem">新增</el-button>
-        <el-button type="danger" @click="delItem">删除</el-button>
-      </div>
-
-      <el-table :data="dzList" style="width: 100%" height="450" border highlight-current-row
-        @row-click="handleRowClick">
-        <el-table-column type="index" width="50" label="No" align="center" />
-        <el-table-column label="滤光片号" prop="lgph">
-          <template #default="scope">
-            <el-input v-model="scope.row.lgph" class="full-width-input" />
-          </template>
-        </el-table-column>
-        <el-table-column label="波长" prop="bc">
-          <template #default="scope">
-            <el-input v-model="scope.row.bc" class="full-width-input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-
-
-    <!-- 试剂维护 -->
-    <el-dialog v-model="sjShow" title="试剂维护" draggable :close-on-click-modal="false" width="700px">
-      <div class="mb5">
-        <el-button type="primary" @click="sjsavaItem">保存</el-button>
-        <el-button type="primary" @click="sjaddItem">新增</el-button>
-        <el-button type="danger" @click="sjdelItem">删除</el-button>
-      </div>
-      <el-table :data="sjtableData" height="400px" border highlight-current-row @row-click="sjRowClick">
-        <el-table-column label="试剂批号" prop="sjph" width="120">
-          <template #default="scope">
-            <el-input v-model="scope.row.sjph" class="full-width-input" />
-          </template>
-        </el-table-column>
-        <el-table-column label="厂商" prop="sjcs">
-          <template #default="scope">
-            <el-select v-model="scope.row.sjcs" class="full-width-input" filterable allow-create>
-              <el-option v-for="item in cjList" :label="item.na" :value="item.no" />
-            </el-select>
-          </template>
-        </el-table-column>
-        <el-table-column label="有效期" prop="yxq">
-          <template #default="scope">
-            <el-date-picker v-model="scope.row.yxq" type="datetime" placeholder="0000:00:00 00:00:00"
-              format="YYYY-MM-DD HH:mm:ss" value-format="YYYY-MM-DD HH:mm:ss" style="width:100%" />
-          </template>
-        </el-table-column>
-        <el-table-column label="方法" prop="csff">
-          <template #default="scope">
-            <SelectTable v-model:data="scope.row.csff" :tableData="dictData.MD" class="full-width-input" />
-          </template>
-        </el-table-column>
-      </el-table>
-    </el-dialog>
-  </div>
-</template>
-
-<script setup lang="ts">
-import { queryFilter, addXmFilter, delXmFilter, addXmLot, delXmLot, queryXmLot, querySjcs } from '@/api/liswork/xtwh/ComOpt'
-import { ElMessage } from 'element-plus';
-import { formatDict, dictData } from '@/hooks'
-import { get } from 'lodash';
-
-const yq = defineModel<string>()
-
-const dialogVisible = ref(false)
-const formData = ref({
-  csbc: '',
-  ckbc: '',
-  yxgs: '',
-  shq: '',
-  xhq: '',
-  negxx: '',
-  posxx: '',
-  negsx: '',
-  possx: '',
-  xmxz: '1',
-  ydfs: '1',
-  csms: '1',
-  zbpl: '1',
-  kbms: '1',
-  zbsj: '',
-  mrmb: '',
-  mrsjph: ''
-});
-const rules = ref({
-  csbc: [
-    { required: true, message: '请选择测试波长', trigger: 'change' }
-  ],
-  yxgs: [
-    { required: true, message: '请输入阳性判断公式', trigger: 'blur' }
-  ]
-});
-
-const form = ref();
-const handleSave = () => {
-  form.value.validate((valid: boolean) => {
-    if (valid) {
-      console.log('submit!')
-    }
-  })
-}
-const handleCancelEdit = () => {
-  console.log('取消修改')
-}
-const handleRestoreDefault = () => {
-  console.log('还原默认')
-}
-const dzList = ref<Array<{ lgph: string, bc: string, yq?: string }>>([])
-const getDzList = () => {
-  selectRow.value = null
-  queryFilter({ yq: yq.value }).then((res: any) => {
-    dzList.value = res.data
-  })
-}
-
-const selectRow = ref()
-const handleRowClick = (row: any) => {
-  selectRow.value = row
-}
-const openDz = () => {
-  getDzList()
-  dialogVisible.value = true
-}
-
-const savaItem = () => {
-  const flag = dzList.value.every(item => item.bc && item.lgph)
-  if (!flag) return ElMessage.warning('请检查滤光片号和波长填写！')
-  addXmFilter(dzList.value).then((res: any) => {
-    if (res.code == 0) {
-      ElMessage.success('保存成功！')
-      getDzList()
-    }
-  })
-}
-const addItem = () => {
-  dzList.value.push({ lgph: '', bc: '', yq: yq.value })
-}
-const delItem = () => {
-  if (!selectRow.value) return ElMessage.warning('请选择要删除的行！')
-  if (selectRow.value.lgph) {
-    delXmFilter(selectRow.value)
-  }
-  dzList.value = dzList.value.filter(item => item.lgph != selectRow.value.lgph)
-  selectRow.value = null
-}
-
-interface sjList {
-  sjcs: string, sjph: string, yq: string, yxq: string, csff: string
-}
-const sjShow = ref(false)
-const sjtableData = ref<sjList[]>([])
-const sjHandle = () => {
-  getSjList()
-  getSjcjList()
-  sjShow.value = true
-}
-
-const sjRowClick = (row: any) => {
-  selectRow.value = row
-}
-const getSjList = () => {
-  selectRow.value = null
-  queryXmLot({ yq: yq.value }).then((res: any) => {
-    sjtableData.value = res.data
-  })
-}
-
-const sjsavaItem = () => {
-  sjtableData.value.forEach(item => {
-    item.yq = yq.value || ''
-  })
-  addXmLot(sjtableData.value).then((res: any) => {
-    if (res.code == 0) {
-      ElMessage.success('保存成功！')
-      getSjList()
-      getSjcjList()
-    }
-  })
-}
-const sjaddItem = () => {
-  sjtableData.value.push({
-    sjcs: '',
-    sjph: '',
-    yxq: '',
-    csff: '',
-    yq: yq.value || '',
-  })
-}
-const sjdelItem = () => {
-  if (!selectRow.value) return ElMessage.warning('请选择要删除的行！')
-  if (selectRow.value.sjph) {
-    delXmLot(selectRow.value)
-  }
-  sjtableData.value = sjtableData.value.filter(item => item.sjph != selectRow.value.sjph)
-  selectRow.value = null
-}
-const cjList = ref<Array<{ no: string, na: string }>>([])
-const getSjcjList = () => {
-  querySjcs({ yq: yq.value }).then((res: any) => {
-    cjList.value = res.data
-  })
-}
-
-watch(yq, (newVal) => {
-  getDzList()
-  getSjList()
-}, {
-  immediate: true,
-  deep: true
-})
-</script>
-
-<style scoped lang="scss">
-.table-toolbar {
-  margin-bottom: 8px;
-  height: 36px;
-  line-height: 36px;
-}
-
-.title {
-  font-family: SourceHanSansCN, SourceHanSansCN;
-  font-size: 16px;
-  color: #409eff;
-  font-weight: 600;
-  margin-bottom: 8px;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
deleted file mode 100644
index 1ed106b..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysReport/index.vue
+++ /dev/null
@@ -1,12 +0,0 @@
-<!-- 报告界面参数 -->
-<template>
-  <div>
-    报告界面参数
-  </div>
-</template>
-
-<script setup lang="ts">
-
-</script>
-
-<style scoped></style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue b/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
deleted file mode 100644
index 81db88d..0000000
--- a/src/views/liswork/xtwh/comopt-1/components/sysSort/index.vue
+++ /dev/null
@@ -1,164 +0,0 @@
-<template>
-  <!-- 整体排序 -->
-  <div class="sort_box">
-    <el-row :gutter="10" class="table-row">
-      <el-col :span="20" class="table-box">
-        <CustomTable ref="tableRef" :data="dataList" :columns="columns" :config="tableConfig"
-          @row-click="handleRowClick">
-          <template #sort="{ row }">
-            <el-input v-model="row.sort" class="full-width-input" />
-          </template>
-        </CustomTable>
-      </el-col>
-      <el-col :span="4">
-        <el-row :gutter="10" class="table-toolbar">
-          <!-- <el-col :span="1.5">
-            <el-radio-group v-model="radio" @change="radioChange">
-              <el-radio value="1">上下移动调整</el-radio>
-              <el-radio value="2">手工输入工号</el-radio>
-            </el-radio-group>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="primary" @click="refresh">刷新</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" @click="cpHandle">存盘</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" :disabled="radio == '2'" @click="firstHandle">首位</el-button>
-          </el-col>
-          <!-- <el-col :span="1.5">
-            <el-button type="primary" icon="top" :disabled="radio == '2'" @click="prevHandle">上移</el-button>
-          </el-col>
-          <el-col :span="1.5">
-            <el-button type="primary" icon="bottom" :disabled="radio == '2'" @click="nextHandle">下移</el-button>
-          </el-col> -->
-          <el-col :span="1.5">
-            <el-button type="primary" :disabled="radio == '2'" @click="lastHadnle">末位</el-button>
-          </el-col>
-        </el-row>
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-
-<script setup lang="ts">
-import { ref } from 'vue';
-import { formatDict, dictData } from '@/hooks';
-
-
-const props = defineProps({
-  dataList: {
-    type: Array,
-    default: []
-  }
-});
-
-interface DataItem {
-  xmid: string | number;
-  xmmc: string | number;
-  sort: string | number;
-}
-const currentIndex = ref(0);
-const radio = ref('1');
-const tableRef = ref();
-const dataList = ref<DataItem[]>([]);
-const columns = ref([
-  { prop: 'xmid', label: '项目ID', visible: true, align: 'center', },
-  { prop: 'xmmc', label: '项目名称', visible: true, align: 'center', },
-  { prop: 'sort', label: '整体排序', visible: true, align: 'center', slot: "sort" },
-]);
-const tableConfig = ref({
-  border: true, // 边框
-  height: '100%', // 高度
-  highlightCurrentRow: true, // 高亮当前行
-  key: 'xmid'
-})
-
-
-//退拽属性
-const handleColumnDragEnd = (data: any) => {
-  // 更新列配置
-  dataList.value = data.list;
-}
-
-const handleRowClick = (row: DataItem) => {
-  currentIndex.value = dataList.value.indexOf(row);
-}
-
-
-
-const getList = () => {
-
-}
-
-const refresh = () => {
-  getList();
-}
-
-const cpHandle = () => {
-
-}
-const firstHandle = () => {
-  currentIndex.value = 0;
-  tableRef.value.setCurrentRow(dataList.value[0]);
-  tableRef.value.setScrollTop(0)
-}
-
-const lastHadnle = () => {
-  currentIndex.value = dataList.value.length - 1;
-  tableRef.value.setCurrentRow(dataList.value[currentIndex.value]);
-  tableRef.value.setScrollTop(dataList.value.length)
-}
-
-onMounted(() => {
-  for (let index = 0; index < 20; index++) {
-    dataList.value.push(
-      { xmid: 'ID' + index, xmmc: 'xmmc' + index, sort: '', }
-    )
-  }
-})
-</script>
-
-<style scoped lang="scss">
-.sort_box {
-  height: calc(100% - 58px);
-  padding-top: 8px;
-}
-
-.table-toolbar {
-  flex: 1;
-  display: flex;
-  flex-direction: column;
-  align-items: center;
-
-  .el-col {
-    width: 50%;
-  }
-
-  .el-button {
-    width: 80%;
-    margin-top: 20px;
-  }
-}
-
-
-
-.table-row {
-  height: 100%;
-  flex: 3;
-
-  .table-box {
-    height: 100%;
-  }
-}
-
-
-/* 可拖拽表格行样式提示 */
-:deep(.drag-table .el-table__row) {
-  cursor: move;
-  /* 鼠标移入行显示拖拽光标 */
-  transition: background-color 0.2s;
-}
-</style>
\ No newline at end of file
diff --git a/src/views/liswork/xtwh/comopt-1/index.vue b/src/views/liswork/xtwh/comopt-1/index.vue
deleted file mode 100644
index d774bda..0000000
--- a/src/views/liswork/xtwh/comopt-1/index.vue
+++ /dev/null
@@ -1,352 +0,0 @@
-<template>
-  <div class="app-container">
-    <el-row :gutter="20" class="main-row">
-      <!-- 左侧树区域 -->
-      <el-col :span="4" :xs="24" class="tree-col">
-        <el-input v-model="deptName" placeholder="请输入仪器名称" clearable prefix-icon="Search" class="tree-search-input" />
-        <el-radio-group v-model="radiotype" @change="radioChange">
-          <el-radio value="1" size="large">仪器组</el-radio>
-          <el-radio value="2" size="large">所有仪器</el-radio>
-        </el-radio-group>
-        <div class="tree-container">
-          <el-tree :data="deptOptions" :props="treeProps" expand-on-click-node :filter-node-method="filterNode"
-            ref="deptTreeRef" node-key="id" highlight-current :expanded-keys="expandedKeys"
-            @node-click="handleNodeClick">
-            <!-- 自定义树节点模板：新增newflag徽章 -->
-            <template #default="{ node, data }">
-              <span class="tree-node-content">
-                {{ node.label }}
-                <!-- 新节点徽章：newflag=1时显示黄色"新"标 -->
-                <el-badge v-if="data.newflag === '1'" value="new" class="new-node-badge" />
-              </span>
-            </template>
-          </el-tree>
-        </div>
-      </el-col>
-
-      <!-- 右侧列表区域  -->
-      <el-col :span="20" :xs="24" class="table-col">
-        <el-row :gutter="10" class="yq-title-row">
-          <h1 class="yq-title">仪器: {{ yqmc }}</h1>
-        </el-row>
-        <el-tabs v-model="activeName" type="card" class="tabs_box">
-          <el-tab-pane v-for="tab in tabList" :key="tab.key" :label="tab.label" :name="tab.key" />
-        </el-tabs>
-        <!-- 动态组件渲染 -->
-        <component :is="currentComponent" :key="activeName" v-model="queryParams.yq" @updateTree="getDeptTree" />
-      </el-col>
-    </el-row>
-  </div>
-</template>
-
-<script setup name="ComOpt" lang="ts">
-import { ref, watch, nextTick, computed } from 'vue'
-import { ElMessage, ElTree, TreeNode, ElMessageBox, ElBadge } from 'element-plus'
-import { paramList, paramTree, getdef, updateParam } from '@/api/liswork/xtwh/ComOpt'
-import { getFirstLetter } from '@/utils/pinyin'
-import { formatDict, getDictData, dictData } from '@/hooks';
-import SysGlobal from './components/sysGlobal/index.vue'
-import SysInput from './components/sysInput/index.vue'
-import SysReport from './components/sysReport/index.vue'
-import SysParameter from './components/sysParameter/index.vue'
-import SysChannel from './components/sysChannel/index.vue'
-import SysSort from './components/sysSort/index.vue'
-
-// ========== TypeScript 类型定义 ==========
-interface InstrTreeNode {
-  id: string
-  label: string
-  lx: string
-  newflag: string  // 新增newflag字段
-  children?: InstrTreeNode[]
-}
-
-interface ParamTreeResponse {
-  code: string
-  msg: string
-  data: InstrTreeNode[]
-  url: null | string
-  method: null | string
-  params: null | any
-  problemId: null | string
-}
-
-interface QueryParams {
-  yq?: string | undefined
-  xxdh?: string | undefined
-  xxqz?: string | undefined
-  groupId?: string | undefined
-}
-
-
-const radiotype = ref<string>("1")
-// ========== 响应式变量 ==========
-// 树相关
-const deptTreeRef = ref<InstanceType<typeof ElTree>>()
-const deptOptions = ref<InstrTreeNode[]>([])
-const deptName = ref<string>("")
-const yqmc = ref<string>("")
-const expandedKeys = ref<string[]>([])
-const isFiltering = ref<boolean>(false)
-const treeProps = ref({
-  label: 'label',
-  children: 'children',
-  isLeaf: (data: Record<string, any>) => !data.children || data.children.length === 0
-})
-
-// 查询参数
-const queryParams = ref<QueryParams>({
-  yq: undefined,
-  xxdh: undefined,
-  xxqz: undefined,
-  groupId: undefined
-})
-
-
-
-const tabList = [
-  { key: 'SysGlobal', label: '全局设定', component: SysGlobal },
-  { key: 'SysInput', label: '界面设定', component: SysInput },
-  { key: 'SysParameter', label: '参数', component: SysParameter },
-  { key: 'SysChannel', label: '通道号', component: SysChannel },
-  { key: 'SysSort', label: '项目排序', component: SysSort },
-  { key: 'SysReport', label: '报告单设置', component: SysReport },
-]
-const activeName = ref('SysSort')
-
-// 计算当前要渲染的组件
-const currentComponent = computed(() => {
-  return tabList.find(tab => tab.key === activeName.value)?.component || 'SysGlobal'
-})
-
-
-const treeData = ref<InstrTreeNode[]>([])
-const radioChange = (val: string) => {
-  if (val == "1") {
-    deptOptions.value = treeData.value
-  } else {
-    const result = [];
-    // 遍历外层数组的每个分组
-    for (let i = 0; i < treeData.value.length; i++) {
-      const group = treeData.value[i];
-      if (group.children && Array.isArray(group.children)) {
-        for (let j = 0; j < group.children.length; j++) {
-          result.push(group.children[j]);
-        }
-      }
-    }
-    deptOptions.value = result
-  }
-}
-
-// ========== 树操作核心方法 ==========
-const forceExpandSingleNode = (nodeId: string): void => {
-  expandedKeys.value = []
-  nextTick(() => {
-    expandedKeys.value = [nodeId]
-    // deptTreeRef.value?.expand(nodeId, false)
-  })
-}
-
-const handleNodeClick = (data: InstrTreeNode): void => {
-  if (isFiltering.value) {
-    queryParams.value.groupId = data.id === "-1" ? undefined : data.id
-    return
-  }
-
-  if (data.children && data.children.length > 0) {
-    const isExpanded = expandedKeys.value.includes(data.id)
-    expandedKeys.value = isExpanded ? [] : [data.id]
-    !isExpanded && forceExpandSingleNode(data.id)
-  } else {
-    queryParams.value.yq = data.id
-    yqmc.value = data.label
-  }
-}
-// ========== 检索过滤逻辑 ==========
-const filterNode = (value: string, data: any, _node: TreeNode): boolean => {
-  if (!value) return true
-
-  const keyword = value.trim().toUpperCase()
-  const nodeLabel = data.label?.toLowerCase() || ''
-  const nodePinyinFirst = data.label ? getFirstLetter(data.label).toUpperCase() : ''
-
-  const currentMatch = nodeLabel.includes(keyword.toLowerCase()) || nodePinyinFirst.includes(keyword)
-  const childrenMatch = (data.children || []).some((child: any) => filterNode(value, child, _node))
-  return currentMatch || childrenMatch
-}
-
-const debounceFilter = (() => {
-  let timer: number | undefined
-  return (val: string): void => {
-    clearTimeout(timer)
-    timer = setTimeout(() => {
-      isFiltering.value = true
-      deptTreeRef.value?.filter(val)
-
-      if (val) {
-        expandedKeys.value = []
-        const expandMatched = (nodes: InstrTreeNode[]) => {
-          nodes.forEach(node => {
-            if (filterNode(val, node, {} as TreeNode) && node.children?.length) {
-              expandedKeys.value.push(node.id)
-            }
-            node.children && expandMatched(node.children)
-          })
-        }
-        expandMatched(deptOptions.value)
-      } else {
-        expandedKeys.value = []
-      }
-      isFiltering.value = false
-    }, 300)
-  }
-})()
-
-watch(deptName, debounceFilter, { immediate: false })
-
-// ========== 业务逻辑 ==========
-const getDeptTree = async (): Promise<void> => {
-  try {
-    const response = await paramTree() as ParamTreeResponse
-    if (response.code === "0" && response.data) {
-      treeData.value = response.data
-      radioChange('1')
-      if (!expandedKeys.value.length) {
-        // 默认展开第一个一级节点的子级
-        nextTick(() => {
-          if (deptOptions.value.length > 0) {
-            const firstLevelNode = deptOptions.value[0]
-            if (firstLevelNode && firstLevelNode.children && firstLevelNode.children.length > 0) {
-              expandedKeys.value = [firstLevelNode.id]
-              const firstChildNode = firstLevelNode.children[0]
-              queryParams.value.yq = firstChildNode.id
-              yqmc.value = firstChildNode.label
-
-              deptTreeRef.value?.setCurrentKey(firstChildNode.id)
-            }
-          }
-        })
-      }
-    } else {
-      ElMessage.warning(response.msg || "获取树数据失败")
-    }
-  } catch (error) {
-    ElMessage.error(`获取树数据异常：${(error as Error).message}`)
-  }
-}
-
-
-
-
-onMounted(() => {
-  getDictData('XMGL', 'MD')
-})
-// ========== 初始化 ==========
-getDeptTree()
-</script>
-
-<style lang="scss" scoped>
-.app-container {
-  width: 100%;
-  height: 90vh;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-  padding: 8px;
-  box-sizing: border-box;
-}
-
-.main-row {
-  display: flex;
-  flex: 1;
-  height: 100%;
-  overflow: hidden;
-}
-
-.tree-col {
-  height: 100%;
-  display: flex;
-  flex-direction: column;
-  overflow: hidden;
-
-
-  .tree-container {
-    flex: 1;
-    height: 100%;
-    overflow: auto;
-    background: #fff;
-    border: 1px solid #e6e6e6;
-    border-radius: 4px;
-    padding: 8px;
-
-    // 核心：树选中节点样式
-    :deep(.el-tree) {
-      --el-tree-node-transition-duration: 0.2s;
-
-      .el-tree-node__children {
-        transition: all var(--el-tree-node-transition-duration) ease-in-out;
-      }
-
-      .el-tree-node__expand-icon.is-leaf {
-        display: none;
-      }
-
-      // 选中节点的背景色（蓝色）+ 文字白色
-      .el-tree-node.is-current>.el-tree-node__content {
-        background-color: #409eff !important;
-        color: #ffffff !important;
-      }
-
-      // 选中节点hover样式（加深蓝色）
-      .el-tree-node.is-current>.el-tree-node__content:hover {
-        background-color: #1e88e5 !important;
-      }
-
-      // 树节点内容容器样式
-      .tree-node-content {
-        display: inline-flex;
-        align-items: center;
-        gap: 4px; // 徽章和文字间距
-        height: 100%;
-      }
-
-      // 新节点徽章样式
-      .new-node-badge {
-        --el-badge-font-size: 10px !important;
-        --el-badge-height: 16px !important;
-        --el-badge-padding: 0 4px !important;
-        --el-badge-warning-color: #FFEC24 !important; // 黄色徽章
-        --el-badge-warning-bg-color: #fff7e6 !important; // 浅黄色背景
-        --el-badge-border-radius: 2px !important; // 圆角优化
-
-        // 徽章文字样式
-        .el-badge__content {
-          font-size: 10px !important;
-          line-height: 16px !important;
-          padding: 0 4px !important;
-          height: 16px !important;
-        }
-      }
-    }
-  }
-}
-
-.table-col {
-  height: 100%;
-
-  // 仪器标题行样式
-  .yq-title-row {
-    margin-bottom: 8px;
-
-    .yq-title {
-      font-family: SourceHanSansCN, SourceHanSansCN;
-      font-size: 16px; // 缩小h1字体（默认24px→16px）
-      color: #409eff; // 蓝色（Element Plus主题色）
-      font-weight: 600;
-      margin: 0; // 清除默认margin
-      line-height: 1.2;
-    }
-  }
-}
-</style>
\ No newline at end of file
diff --git a/src/views/regional/circulation/bbcx/index.vue b/src/views/regional/circulation/bbcx/index.vue
index 63c5dae..ba30d9b 100644
--- a/src/views/regional/circulation/bbcx/index.vue
+++ b/src/views/regional/circulation/bbcx/index.vue
@@ -71,20 +71,20 @@
         </el-row>
       </el-form>
     </div>
-
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange" @row-click="rowHandle">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
-
+    <div>
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange" @row-click="rowHandle">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
     <!-- 样本流程 -->
     <div class="time-line-box">
       <div v-for="(item, i) in timelineItems" :key="i" class="time-line-item">
diff --git a/src/views/regional/circulation/bbqs/index.vue b/src/views/regional/circulation/bbqs/index.vue
index bd00b88..23eeb61 100644
--- a/src/views/regional/circulation/bbqs/index.vue
+++ b/src/views/regional/circulation/bbqs/index.vue
@@ -60,20 +60,20 @@
       <el-button type="primary" @click="qsHandle(110)">标本拒签</el-button>
       <el-button type="primary" plain @click="bbThHandle">标本退回</el-button>
     </div>
-
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
-
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -113,7 +113,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '68vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // fit: true, // 列宽自适应
 })
diff --git a/src/views/regional/circulation/bbth/index.vue b/src/views/regional/circulation/bbth/index.vue
index 6e3eb9c..7de86a5 100644
--- a/src/views/regional/circulation/bbth/index.vue
+++ b/src/views/regional/circulation/bbth/index.vue
@@ -60,18 +60,20 @@
       <el-button type="primary" @click="thHandle(90)">申请作废</el-button>
 
     </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
-      <template #patAge="{ row }">
-        {{ row.patAge }}{{ row.ageUnit }}
-      </template>
-      <template #status="{ row }">
-        {{ formatDict(row.status, regdictList) }}
-      </template>
-      <template #patSex="{ row }">
-        {{ row.patSex == 1 ? '男' : '女' }}
-      </template>
-    </CustomTable>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -109,7 +111,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '68vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   // fit: true, // 列宽自适应
 })
diff --git a/src/views/regional/statistics/bbtj/index.vue b/src/views/regional/statistics/bbtj/index.vue
index 66619c8..7de86a5 100644
--- a/src/views/regional/statistics/bbtj/index.vue
+++ b/src/views/regional/statistics/bbtj/index.vue
@@ -4,15 +4,39 @@
       <el-form :model="queryParams" ref="queryRef" label-width="5rem" style="width: 100%;" :size="aotuSize">
         <el-row :gutter="10">
           <el-col :span="5">
-            <el-form-item label="所属医院：" prop="DstHospName">
+            <el-form-item label="委托机构：" prop="SrcHospName">
+              <SelectTable v-model:data="queryParams.SrcHospName" :fields="ksdhFields" :tableData="hosList"
+                label="label" :size="aotuSize" value="value" objKey="value" :border="true" placeholder="请选择委托机构" />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="检测医院：" prop="DstHospName">
               <SelectTable v-model:data="queryParams.DstHospName" :fields="ksdhFields" :tableData="hosList"
                 label="label" :size="aotuSize" value="label" objKey="label" :border="true" placeholder="请选择" />
             </el-form-item>
           </el-col>
           <el-col :span="5">
-            <el-form-item label="标本类型：" prop="SampleTypeName">
-              <el-select v-model="queryParams.SampleTypeName" placeholder="请选择" clearable>
-                <el-option v-for="item in regdictList" :label="item.dictName" :value="item.dictCode" />
+            <el-form-item label="条码号：" prop="Barcode">
+              <el-input v-model="queryParams.Barcode" placeholder="请输入条码号" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="姓名：" prop="PatName">
+              <el-input v-model="queryParams.PatName" placeholder="请输入姓名" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="申请项目：" prop="checkPUR">
+              <el-input v-model="queryParams.checkPUR" placeholder="请输入申请项目" clearable />
+            </el-form-item>
+          </el-col>
+          <el-col :span="5">
+            <el-form-item label="时间类型：" prop="DateType">
+              <el-select v-model="queryParams.DateType" placeholder="请选择">
+                <el-option label="登记时间" value="登记时间" />
+                <el-option label="采样时间" value="采样时间" />
+                <el-option label="送出时间" value="送出时间" />
+                <el-option label="签收时间" value="签收时间" />
               </el-select>
             </el-form-item>
           </el-col>
@@ -31,20 +55,31 @@
     </div>
 
     <div class="mb10">
-      <!-- <el-button type="primary" @click="thHandle(20)">重新采集</el-button>
+      <el-button type="primary" @click="thHandle(20)">重新采集</el-button>
       <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
-      <el-button type="primary" @click="thHandle(90)">申请作废</el-button> -->
-    </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange">
+      <el-button type="primary" @click="thHandle(90)">申请作废</el-button>
 
-    </CustomTable>
+    </div>
+    <div style="height: calc(100% - 180px)">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @selection-change="handleSelectionChange" @size-change="sizeChange" @page-change="currentChange">
+        <template #patAge="{ row }">
+          {{ row.patAge }}{{ row.ageUnit }}
+        </template>
+        <template #status="{ row }">
+          {{ formatDict(row.status, regdictList) }}
+        </template>
+        <template #patSex="{ row }">
+          {{ row.patSex == 1 ? '男' : '女' }}
+        </template>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
 <script setup lang="ts">
 import CustomTable from '@/components/elTable/index.vue'
-import { sampleTypeCount } from '@/api/regional/index'
+import { querySampleSignBack, sampleSign } from '@/api/regional/index'
 import SelectTable from '@/components/SelectTable/index.vue';
 import { classCom } from '@/utils/classCom';
 // @ts-ignore
@@ -53,28 +88,32 @@ import { listhospital } from "@/api/regional/dict/hospital.js";
 import { listregdict } from "@/api/regional/dict/regdict.js";
 import { ElMessage } from 'element-plus';
 const aotuSize = classCom.useAutoSize();
-import dayjs from 'dayjs';
 
-const today = dayjs().format('YYYY-MM-DD');
 const queryParams: any = ref({
   pageSize: 50,
   pageNum: 1,
-  times: [today, today]
 })
 const tableData: any = ref([])
 const columns: any = ref([
-  { prop: 'srchospname', label: '所属医院', align: 'center', visible: true, },
-  { prop: 'sampletypecode', label: '标本代码', align: 'center', visible: true, },
-  { prop: 'sampletypename', label: '标本类别', align: 'center', visible: true, },
-  { prop: 'sl', label: '数量(份)', align: 'center', visible: true, },
+  { type: 'selection', align: 'center', visible: true, width: 40 },
+  { prop: 'barcode', label: '条码号', align: 'center', visible: true, },
+  { prop: 'patName', label: '姓名', align: 'center', visible: true, width: 60 },
+  { prop: 'patSex', label: '性别', align: 'center', visible: true, width: 60, slot: "patSex" },
+  { prop: 'patAge', label: '年龄', align: 'center', visible: true, slot: "patAge", width: 60 },
+  { prop: 'checkPUR', label: '申请项目', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '委托机构', align: 'center', visible: true, width: 200 },
+  { prop: 'srcHospName', label: '检测机构', align: 'center', visible: true, width: 200 },
+  { prop: 'Status', label: '标本状态', align: 'center', visible: true, slot: "status" },
+  { prop: 'backReasons', label: '退回理由', align: 'center', visible: true, width: 150 },
+  { prop: 'affirmTime', label: '采样时间', align: 'center', visible: true, width: 150 },
+  { prop: 'backUserName', label: '操作人', align: 'center', visible: true, },
+  { prop: 'backTime', label: '操作时间', align: 'center', visible: true, width: 150 },
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '75vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
-  summary: true,
-  summaryField: ['sl'],//计算列总和
-  sumText: '合计'
+  // fit: true, // 列宽自适应
 })
 
 const pagination = ref({
@@ -91,7 +130,15 @@ const ksdhFields = ref([
 const barcodes = ref([])
 const tableRefs = ref(null)
 
-
+const thHandle = (val: number) => {
+  if (!barcodes.value.length) return ElMessage.warning('请选择数据！')
+  sampleSign({ status: val, barcode: barcodes.value }).then((res: any) => {
+    if (res.code == 0) {
+      ElMessage.success('操作成功！')
+      handleQuery()
+    }
+  })
+}
 const handleSelectionChange = (val: any) => {
   barcodes.value = val.map((item: any) => item.barcode)
 }
@@ -121,12 +168,11 @@ const resetHandle = () => {
   queryParams.value = {
     pageSize: 50,
     pageNum: 1,
-    times: [today, today]
   }
   handleQuery()
 }
 const getList = () => {
-  sampleTypeCount(queryParams.value).then((res: any) => {
+  querySampleSignBack(queryParams.value).then((res: any) => {
     tableData.value = res.rows
     pagination.value.total = res.total
   })
@@ -134,7 +180,7 @@ const getList = () => {
 const hosList = ref([])
 const regdictList: any = ref([])
 onMounted(() => {
-  handleQuery()
+  getList()
   listhospital().then((res: any) => {
     hosList.value = res.rows.map((item: any) => {
       return {
@@ -144,8 +190,8 @@ onMounted(() => {
     })
   })
 
-  listregdict({ pageSize: 100, pageNum: 1, dictType: 'BT' }).then((res: any) => {
-    regdictList.value = res.rows
+  listregdict({ pageSize: 100, pageNum: 1, dictType: 'ZT' }).then((res: any) => {
+    regdictList.value = res.rows;
   })
 })
 
@@ -156,6 +202,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 5rem;
+
   .el-form-item {
     margin-bottom: 5px;
   }
diff --git a/src/views/regional/statistics/fytj/index.vue b/src/views/regional/statistics/fytj/index.vue
index 0763c95..1743dd9 100644
--- a/src/views/regional/statistics/fytj/index.vue
+++ b/src/views/regional/statistics/fytj/index.vue
@@ -35,10 +35,12 @@
       <el-button type="primary" @click="thHandle(50)">撤销退回</el-button>
       <el-button type="primary" @click="thHandle(90)">申请作废</el-button> -->
     </div>
-    <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
-      @size-change="sizeChange" @page-change="currentChange">
+    <div style="height: calc(100% - 100px);">
+      <CustomTable ref="tableRefs" :data="tableData" :columns="columns" :config="tableConfig" :pagination="pagination"
+        @size-change="sizeChange" @page-change="currentChange">
 
-    </CustomTable>
+      </CustomTable>
+    </div>
   </div>
 </template>
 
@@ -71,7 +73,7 @@ const columns: any = ref([
 ])
 const tableConfig = ref({
   border: true, // 边框
-  height: '75vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
   summary: true,
   summaryField: ['sl', 'cost'],//计算列总和
@@ -165,6 +167,8 @@ const formatDict = (v: string, arr: Array<any>) => {
 
 <style scoped lang="scss">
 .compact-form {
+  height: 2.5rem;
+
   .el-form-item {
     margin-bottom: 5px;
   }

From 35c86030026c9b34d698a9f0d5f159d3896454ab Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Thu, 25 Dec 2025 19:14:33 +0800
Subject: [PATCH 6/7] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/assets/styles/index.scss                |   2 +-
 src/components/DictTag/index.vue            |  18 +-
 src/views/liswork/xtwh/configdict/index.vue | 321 ++++++++------------
 3 files changed, 134 insertions(+), 207 deletions(-)

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 641e6c8..834f5b1 100644
--- a/src/assets/styles/index.scss
+++ b/src/assets/styles/index.scss
@@ -133,7 +133,7 @@ aside {
 }
 
 .pagination-container {
-  margin-top: 30px;
+  margin-top: 10px;
 }
 
 .text-center {
diff --git a/src/components/DictTag/index.vue b/src/components/DictTag/index.vue
index 7d0888c..bcbd948 100644
--- a/src/components/DictTag/index.vue
+++ b/src/components/DictTag/index.vue
@@ -4,18 +4,10 @@
       <template v-if="values.includes(item.value)">
         <span
           v-if="(item.elTagType == 'default' || item.elTagType == '') && (item.elTagClass == '' || item.elTagClass == null)"
-          :key="item.value"
-          :index="index"
-          :class="item.elTagClass"
-        >{{ item.label + " " }}</span>
-        <el-tag
-          v-else
-          :disable-transitions="true"
-          :key="item.value + ''"
-          :index="index"
-          :type="item.elTagType === 'primary' ? '' : item.elTagType"
-          :class="item.elTagClass"
-        >{{ item.label + " " }}</el-tag>
+          :key="item.value" :index="index" :class="item.elTagClass">{{ item.label + " " }}</span>
+        <el-tag v-else :disable-transitions="true" :key="item.value + ''" :index="index"
+          :type="item.elTagType === 'primary' ? 'primary' : item.elTagType" :class="item.elTagClass">{{ item.label + " "
+          }}</el-tag>
       </template>
     </template>
     <template v-if="unmatch && showValue">
@@ -76,7 +68,7 @@ function handleArray(array) {
 </script>
 
 <style scoped>
-.el-tag + .el-tag {
+.el-tag+.el-tag {
   margin-left: 10px;
 }
 </style>
diff --git a/src/views/liswork/xtwh/configdict/index.vue b/src/views/liswork/xtwh/configdict/index.vue
index 69166fe..5c2e52d 100644
--- a/src/views/liswork/xtwh/configdict/index.vue
+++ b/src/views/liswork/xtwh/configdict/index.vue
@@ -1,48 +1,23 @@
 <template>
   <div class="app-container">
     <el-form :model="queryParams" ref="queryRef" :inline="true" v-show="showSearch">
-      <el-form-item :label="menuname + '类别'"  prop="configType">
-        <el-select
-            v-model="queryParams.configType"
-            :placeholder="`请选择${menuname}类别`"
-            clearable
-            style="width: 200px"
-            @change="handleQuery"
-        >
-          <el-option
-              v-for="item in configTypeOptions"
-              :key="item.value"
-              :label="item.label"
-              :value="item.value"
-          />
+      <el-form-item :label="menuname + '类别'" prop="configType">
+        <el-select v-model="queryParams.configType" :placeholder="`请选择${menuname}类别`" clearable style="width: 200px"
+          @change="handleQuery">
+          <el-option v-for="item in configTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
         </el-select>
       </el-form-item>
-      <el-form-item :label="menuname + '编码'"  prop="configCode">
-        <el-input
-            v-model="queryParams.configCode"
-            :placeholder="`请输入${menuname}编码`"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-        />
+      <el-form-item :label="menuname + '编码'" prop="configCode">
+        <el-input v-model="queryParams.configCode" :placeholder="`请输入${menuname}编码`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item :label="`${menuname}名称`" prop="configName">
-        <el-input
-            v-model="queryParams.configName"
-            :placeholder="`请输入${menuname}名称`"
-            clearable
-            style="width: 200px"
-            @keyup.enter="handleQuery"
-        />
+        <el-input v-model="queryParams.configName" :placeholder="`请输入${menuname}名称`" clearable style="width: 200px"
+          @keyup.enter="handleQuery" />
       </el-form-item>
       <el-form-item label="状态" prop="status">
         <el-select v-model="queryParams.status" placeholder="状态" clearable style="width: 200px">
-          <el-option
-              v-for="dict in sys_normal_disable"
-              :key="dict.value"
-              :label="dict.label"
-              :value="dict.value"
-          />
+          <el-option v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.label" :value="dict.value" />
         </el-select>
       </el-form-item>
       <el-form-item>
@@ -53,111 +28,81 @@
 
     <el-row :gutter="10" class="mb8">
       <el-col :span="1.5">
-        <el-button
-            type="primary"
-            plain
-            icon="Plus"
-            @click="handleAdd"
-        >新增</el-button>
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="success"
-            plain
-            icon="Edit"
-            :disabled="single"
-            @click="handleUpdate"
-        >修改</el-button>
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdate">修改</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="danger"
-            plain
-            icon="Delete"
-            :disabled="multiple"
-            @click="handleDelete"
-        >删除</el-button>
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDelete">删除</el-button>
       </el-col>
       <el-col :span="1.5">
-        <el-button
-            type="warning"
-            plain
-            icon="Download"
-            @click="handleExport"
-        >导出</el-button>
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
       </el-col>
       <right-toolbar v-model:showSearch="showSearch" @queryTable="getList"></right-toolbar>
     </el-row>
-    <el-row :gutter="5" class="table-container">
-    <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange" class="config-table" height="100%">
-      <el-table-column type="selection" width="55" align="center" />
-      <el-table-column :label="`${menuname}编号`" align="center" prop="configId"   v-if="false"/>
-      <el-table-column :label="`${menuname}类别`" align="center" prop="configType" width="100" show-overflow-tooltip>
-        <template #default="scope">
-          <span
-              class="config-type-cell"
-              :style="{
+    <div class="table-container">
+      <el-table v-loading="loading" :data="regdictList" @selection-change="handleSelectionChange" class="config-table"
+        height="100%">
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column :label="`${menuname}编号`" align="center" prop="configId" v-if="false" />
+        <el-table-column :label="`${menuname}类别`" align="center" prop="configType" width="100" show-overflow-tooltip>
+          <template #default="scope">
+            <span class="config-type-cell" :style="{
               backgroundColor: getConfigTypeColor(scope.row.configType),
               color: '#fff' // 文字白色，保证对比
-            }"
-          >
-          {{ configTypeOptions.find(item => item.value === scope.row.configType)?.label || scope.row.configType }}
-          </span>
-        </template>
-      </el-table-column>
-      <el-table-column :label="`${menuname}编码`" align="center" prop="configCode" width="150" show-overflow-tooltip />
-      <el-table-column :label="`${menuname}名称`" align="left" prop="configName"  show-overflow-tooltip />
-      <el-table-column label="选项类型" align="center" prop="configOptiontype"width="100">
-        <template #default="scope">
-           <span
-               class="config-type-cell"
-               :style="{
+            }">
+              {{configTypeOptions.find(item => item.value === scope.row.configType)?.label || scope.row.configType}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column :label="`${menuname}编码`" align="center" prop="configCode" width="150" show-overflow-tooltip />
+        <el-table-column :label="`${menuname}名称`" align="left" prop="configName" show-overflow-tooltip />
+        <el-table-column label="选项类型" align="center" prop="configOptiontype" width="100">
+          <template #default="scope">
+            <span class="config-type-cell" :style="{
               backgroundColor: getconfigOptionTypeColor(scope.row.configOptiontype),
               color: '#fff' // 文字白色，保证对比
-            }"
-           >
-          {{ configOptiontypeOptions.find(item => item.value === scope.row.configOptiontype)?.label || scope.row.configOptiontype }}
-           </span>
-        </template>
-
-      </el-table-column>
-      <el-table-column label="默认值" align="center" prop="configDefvalue"  show-overflow-tooltip />
-      <el-table-column label="值域规则" align="left" prop="remark"  show-overflow-tooltip />
-      <el-table-column label="排序" align="center" prop="configSort" width="80" />
-      <el-table-column label="状态" align="center" prop="status" width="80">
-        <template #default="scope">
-          <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
-        </template>
-      </el-table-column>
-      <el-table-column label="创建时间" align="center" prop="createTime" width="150" show-overflow-tooltip>
-        <template #default="scope">
-          <span>{{ parseTime(scope.row.createTime) }}</span>
-        </template>
-      </el-table-column>
-      <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
-        <template #default="scope">
-          <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)" >修改</el-button>
-          <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)" >删除</el-button>
-        </template>
-      </el-table-column>
-    </el-table>
-      </el-row>
+            }">
+              {{configOptiontypeOptions.find(item => item.value === scope.row.configOptiontype)?.label ||
+                scope.row.configOptiontype}}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="默认值" align="center" prop="configDefvalue" width="200" show-overflow-tooltip>
+          <template #default="scope">
+            <DynamicInput :type="scope.row.configOptiontype" v-model="scope.row.configDefvalue"
+              :dict-data="scope.row.remark" :placeholder="`请输入${scope.row.configName}值`" class="edit-input" />
+          </template>
+        </el-table-column>
+        <el-table-column label="值域规则" align="left" prop="remark" show-overflow-tooltip />
+        <el-table-column label="排序" align="center" prop="configSort" width="80" />
+        <el-table-column label="状态" align="center" prop="status" width="80">
+          <template #default="scope">
+            <dict-tag :options="sys_normal_disable" :value="scope.row.status" />
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button link type="primary" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </div>
+    <pagination v-show="total > 0" :total="total" v-model:page="queryParams.pageNum"
+      v-model:limit="queryParams.pageSize" @pagination="getList" />
     <!-- 添加或修改字典对话框 -->
-    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
-
+    <el-dialog :title="title" v-model="open" width="500px">
       <el-form ref="configdictRef" :model="form" :rules="rules" label-width="150px">
         <el-form-item :label="`${menuname}类别`" prop="configType">
-          <el-select
-              v-model="form.configType"
-              :placeholder="`请选择${menuname}类别`"
-              style="width: 100%"
-          >
-            <el-option
-                v-for="item in configTypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
+          <el-select v-model="form.configType" :placeholder="`请选择${menuname}类别`" style="width: 100%">
+            <el-option v-for="item in configTypeOptions" :key="item.value" :label="item.label" :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="`${menuname}编码`" prop="configCode">
@@ -167,17 +112,9 @@
           <el-input v-model="form.configName" :placeholder="`请输入${menuname}名称`" />
         </el-form-item>
         <el-form-item :label="`${menuname}选项类型`" prop="configOptiontype">
-          <el-select
-              v-model="form.configOptiontype"
-              :placeholder="`请选择${menuname}选项类型`"
-              style="width: 100%"
-          >
-            <el-option
-                v-for="item in configOptiontypeOptions"
-                :key="item.value"
-                :label="item.label"
-                :value="item.value"
-            />
+          <el-select v-model="form.configOptiontype" :placeholder="`请选择${menuname}选项类型`" style="width: 100%">
+            <el-option v-for="item in configOptiontypeOptions" :key="item.value" :label="item.label"
+              :value="item.value" />
           </el-select>
         </el-form-item>
         <el-form-item :label="`${menuname}默认值`" prop="configDefvalue">
@@ -189,11 +126,8 @@
         </el-form-item>
         <el-form-item label="状态" prop="status">
           <el-radio-group v-model="form.status">
-            <el-radio
-                v-for="dict in sys_normal_disable"
-                :key="dict.value"
-                :label="dict.value"
-            >{{ dict.label }}</el-radio>
+            <el-radio v-for="dict in sys_normal_disable" :key="dict.value" :label="dict.value">{{ dict.label
+            }}</el-radio>
           </el-radio-group>
         </el-form-item>
         <el-form-item label="值域参数JSON" prop="remark">
@@ -217,13 +151,14 @@ import {
   listconfigdict,
   updateconfigdict
 } from "@/api/liswork/xtwh/configdictApi.ts";
+import DynamicInput from "@/views/liswork/xtwh/localconfig/components/DynamicInput.vue"
 // 1. 定义类别下拉选项（根据实际业务调整）
 const configTypeOptions = ref([
-  { label: "仪器全局设置", value: "SYSTEM",color: "#E6A23C" },
+  { label: "仪器全局设置", value: "SYSTEM", color: "#E6A23C" },
   { label: "仪器界面设置", value: "INPUT", color: "#67C23A" },
-  { label: "本地选项设置", value: "LOCAL" , color: "#409EFF" },
-  { label: "本院特殊设置", value: "HISOPT", color: "#909399"  },
-  { label: "门诊采血设置", value: "_MZCX_", color: "#C74127"  }
+  { label: "本地选项设置", value: "LOCAL", color: "#409EFF" },
+  { label: "本院特殊设置", value: "HISOPT", color: "#909399" },
+  { label: "门诊采血设置", value: "_MZCX_", color: "#C74127" }
 ]);
 // 2. 定义获取类别对应颜色的方法
 function getConfigTypeColor(type) {
@@ -233,15 +168,15 @@ function getConfigTypeColor(type) {
 }
 // 2. 定义参数类别下拉选项（根据实际业务调整）
 const configOptiontypeOptions = ref([
-  { label: "单选框", value: "0",color: "#56BBBD" },
-  { label: "下拉框", value: "1",color: "#67C23A" },
-  { label: "字典单选", value: "2",color: "#FF443F" },
-  { label: "字典多选", value: "3",color: "#F08784" },
-  { label: "特殊", value: "4",color: "#909399" },
-  { label: "文本框", value: "5",color: "#3282F6" },
-  { label: "数字框", value: "6",color: "#507F80" },
-  { label: "日期框", value: "7",color: "#7E84F7" },
-  { label: "时间框", value: "8",color: "#377D22" },
+  { label: "单选框", value: "0", color: "#56BBBD" },
+  { label: "下拉框", value: "1", color: "#67C23A" },
+  { label: "字典单选", value: "2", color: "#FF443F" },
+  { label: "字典多选", value: "3", color: "#F08784" },
+  { label: "特殊", value: "4", color: "#909399" },
+  { label: "文本框", value: "5", color: "#3282F6" },
+  { label: "数字框", value: "6", color: "#507F80" },
+  { label: "日期框", value: "7", color: "#7E84F7" },
+  { label: "时间框", value: "8", color: "#377D22" },
 ]);
 function getconfigOptionTypeColor(type) {
   // 匹配对应类别的颜色，无匹配时用默认色
@@ -265,26 +200,26 @@ const data = reactive({
   queryParams: {
     configCode: undefined,
     configName: undefined,
-    configType:undefined,
-    status: undefined
+    configType: undefined,
+    status: undefined,
+    pageNum: 1,
+    pageSize: 30
   },
   rules: {
-    configType: [{ required: true, message: menuname.value+"类别不能为空", trigger: "blur" }],
-    configName: [{ required: true, message: menuname.value+"名称不能为空", trigger: "blur" }],
-    configCode: [{ required: true, message: menuname.value+"编码不能为空", trigger: "blur" }],
-    configSort: [{ required: true, message: menuname.value+"顺序不能为空", trigger: "blur" }],
+    configType: [{ required: true, message: menuname.value + "类别不能为空", trigger: "blur" }],
+    configName: [{ required: true, message: menuname.value + "名称不能为空", trigger: "blur" }],
+    configCode: [{ required: true, message: menuname.value + "编码不能为空", trigger: "blur" }],
+    configSort: [{ required: true, message: menuname.value + "顺序不能为空", trigger: "blur" }],
   }
 });
 
 const { queryParams, form, rules } = toRefs(data);
-
 /** 查询字典列表 */
 function getList() {
   loading.value = true;
   listconfigdict(queryParams.value).then(response => {
-    console.log('response:', response);
-    regdictList.value = response.data;
-    total.value = response.data.length;
+    regdictList.value = response.rows;
+    total.value = response.total;
     loading.value = false;
   });
 }
@@ -301,7 +236,7 @@ function reset() {
     configName: undefined,
     configType: configTypeOptions.value[0]?.value || "",
     configOptiontype: configOptiontypeOptions.value[0]?.value || "",
-    configDefvalue:undefined,
+    configDefvalue: undefined,
     configSort: 0,
     status: "0",
     remark: undefined
@@ -328,7 +263,7 @@ function handleSelectionChange(selection) {
 function handleAdd() {
   reset();
   open.value = true;
-  title.value = "添加"+menuname.value;
+  title.value = "添加" + menuname.value;
 }
 /** 修改按钮操作 */
 function handleUpdate(row) {
@@ -337,25 +272,28 @@ function handleUpdate(row) {
   getconfigdict(configId).then(response => {
     form.value = response.data;
     open.value = true;
-    title.value = "修改"+menuname.value;
+    title.value = "修改" + menuname.value;
   });
 }
 /** 提交按钮 */
 function submitForm() {
   proxy.$refs["configdictRef"].validate(valid => {
     if (valid) {
-
       if (form.value.configId != undefined) {
         updateconfigdict(form.value).then(response => {
-          proxy.$modal.msgSuccess("修改成功");
-          open.value = false;
-          getList();
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess("修改成功");
+            open.value = false;
+            getList();
+          }
         });
       } else {
         addconfigdict(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
+          if (response.code == 200) {
+            proxy.$modal.msgSuccess("新增成功");
+            open.value = false;
+            getList();
+          }
         });
       }
     }
@@ -364,13 +302,12 @@ function submitForm() {
 /** 删除按钮操作 */
 function handleDelete(row) {
   const configIds = row.configId || ids.value;
-  proxy.$modal.confirm('是否确认删除"' + menuname.value + '"编号为"' + configIds + '"的数据项？').then(function() {
-
+  proxy.$modal.confirm('是否确认删除"' + menuname.value + '"编号为"' + configIds + '"的数据项？').then(function () {
     return delconfigdict(configIds);
   }).then(() => {
     getList();
     proxy.$modal.msgSuccess("删除成功");
-  }).catch(() => {});
+  }).catch(() => { });
 }
 /** 导出按钮操作 */
 function handleExport() {
@@ -381,42 +318,40 @@ function handleExport() {
 getList();
 </script>
 <style scoped>
-.app-container {
-  display: flex;
-  flex-direction: column;
-  height: 90vh;
-  /* 容器高度等于窗口高度 */
-  overflow: hidden;
-}
 .mb8 {
   height: 30px;
   /* 固定高度 */
 }
+
 .table-container {
-  flex: 1;
-  /* 占满剩余高度 */
-  overflow: hidden;
-  /* 避免表格超出容器 */
+  height: calc(100% - 150px);
 }
+
 /* 1. 减小表格行高（核心） */
 :deep(.config-table .el-table__row) {
-  height: 30px !important; /* 原默认行高约40px，按需调整（建议28-35px） */
-  line-height: 30px !important; /* 行高与height一致，保证垂直居中 */
+  height: 30px !important;
+  /* 原默认行高约40px，按需调整（建议28-35px） */
+  line-height: 30px !important;
+  /* 行高与height一致，保证垂直居中 */
 }
 
 /* 2. 减小单元格内边距（配合行高优化） */
 :deep(.config-table .el-table__cell) {
   padding: 2px 4px !important;
-  height: 30px !important; /* 单元格高度与行高一致 */
-  line-height: 1.2 !important; /* 文字行高适配矮行 */
-  vertical-align: middle !important; /* 强制垂直居中 */
+  height: 30px !important;
+  /* 单元格高度与行高一致 */
+  line-height: 1.2 !important;
+  /* 文字行高适配矮行 */
+  vertical-align: middle !important;
+  /* 强制垂直居中 */
 }
 
 /* 3. 类别单元格适配矮行高 */
 .config-type-cell {
   width: 100%;
   height: 100%;
-  min-height: 26px; /* 适配30px行高，略小一点 */
+  min-height: 26px;
+  /* 适配30px行高，略小一点 */
   display: flex;
   align-items: center;
   justify-content: center;

From 5d09d6ebecdf42b7c8a91cf51c2ec8bbd0572832 Mon Sep 17 00:00:00 2001
From: tangw <czlis@tangw>
Date: Thu, 25 Dec 2025 20:15:47 +0800
Subject: [PATCH 7/7] =?UTF-8?q?=E6=8A=A5=E5=91=8A=E5=8D=95=E8=AE=BE?=
 =?UTF-8?q?=E7=BD=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/liswork/xtwh/reportdictApi.ts         |   9 +
 src/api/liswork/xtwh/reportinstrApi.ts        |  47 ++
 .../comopt/components/sysReport/index.vue     | 508 +++++++++++++++++-
 3 files changed, 559 insertions(+), 5 deletions(-)
 create mode 100644 src/api/liswork/xtwh/reportinstrApi.ts

diff --git a/src/api/liswork/xtwh/reportdictApi.ts b/src/api/liswork/xtwh/reportdictApi.ts
index 9bb1f7f..934c44a 100644
--- a/src/api/liswork/xtwh/reportdictApi.ts
+++ b/src/api/liswork/xtwh/reportdictApi.ts
@@ -52,3 +52,12 @@ export function autoload() {
         method: 'get'
     })
 }
+
+// 查询字典列表
+export function optionselect(params:any) {
+    return request({
+        url: '/reportdict/optionselect',
+        method: 'get',
+        params
+    })
+}
diff --git a/src/api/liswork/xtwh/reportinstrApi.ts b/src/api/liswork/xtwh/reportinstrApi.ts
new file mode 100644
index 0000000..047e8ed
--- /dev/null
+++ b/src/api/liswork/xtwh/reportinstrApi.ts
@@ -0,0 +1,47 @@
+//参数设置字典
+// @ts-ignore
+import request from '@/utils/request'
+
+// 查询字典列表
+export function listreportinstr(params:any) {
+    return request({
+        url: '/reportinstr/list',
+        method: 'get',
+        params
+    })
+}
+
+// 查询字典详细
+export function getreportinstr(id:number) {
+    return request({
+        url: `/reportinstr/${id}`,
+        method: 'get'
+    })
+}
+
+// 新增字典
+export function addreportinstr(params:any) {
+    return request({
+        url: '/reportinstr',
+        method: 'post',
+        data:params
+    })
+}
+
+// 修改字典
+export function updatereportinstr(params:any) {
+    return request({
+        url: '/reportinstr',
+        method: 'put',
+        data:params
+    })
+}
+
+// 删除字典
+export function delreportinstr(id:any) {
+    return request({
+        url: `/reportinstr/${id}`,
+        method: 'delete'
+    })
+
+}
diff --git a/src/views/liswork/xtwh/comopt/components/sysReport/index.vue b/src/views/liswork/xtwh/comopt/components/sysReport/index.vue
index 1ed106b..b699e73 100644
--- a/src/views/liswork/xtwh/comopt/components/sysReport/index.vue
+++ b/src/views/liswork/xtwh/comopt/components/sysReport/index.vue
@@ -1,12 +1,510 @@
-<!-- 报告界面参数 -->
 <template>
-  <div>
-    报告界面参数
+  <div class="app-container">
+    <el-row :gutter="10" class="mb8">
+      <el-col :span="1.5">
+        <el-button type="primary" plain icon="Plus" @click="handleAdd">新增</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" plain icon="Edit" :disabled="single" @click="handleUpdateBatch">修改</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="danger" plain icon="Delete" :disabled="multiple" @click="handleDeleteBatch">删除</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="warning" plain icon="Download" @click="handleExport">导出</el-button>
+      </el-col>
+      <el-col :span="1.5">
+        <el-button type="success" icon="Refresh" @click="handleQuery">刷新</el-button>
+      </el-col>
+    </el-row>
+    <el-row :gutter="5" class="table-container">
+      <el-table
+          v-loading="loading"
+          :data="reportinstrList"
+          @selection-change="handleSelectionChange"
+          class="report-table"
+          height="100%"
+      >
+        <el-table-column type="selection" width="55" align="center" />
+        <el-table-column label="编号" align="center" prop="reportId" v-if="false"/>
+        <el-table-column label="仪器" align="center" prop="reportYq" v-if="false" show-overflow-tooltip />
+        <el-table-column label="模板ID" align="left" prop="reportBgdh"  width="50" show-overflow-tooltip />
+        <el-table-column label="模板名称" align="left" prop="reportName" show-overflow-tooltip />
+        <el-table-column label="类别" align="center" prop="reportType" width="50" show-overflow-tooltip>
+          <template #default="scope">
+            <span>
+              {{ reportTypeOptions.find(item => item.value === scope.row.reportType)?.label || scope.row.reportType }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="纸张" align="center" prop="reportSize" width="50">
+          <template #default="scope">
+            <span>
+              {{ reportSizeOptions.find(item => item.value === scope.row.reportSize)?.label || scope.row.reportSize }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="固定行数" align="center" prop="reportRows" width="80"show-overflow-tooltip />
+        <el-table-column label="最小行数" align="center" prop="reportMinrows" width="80"show-overflow-tooltip />
+        <el-table-column label="最大行数" align="center" prop="reportMaxrows" width="80"show-overflow-tooltip />
+        <el-table-column label="指定项目" align="center" prop="reportItems" show-overflow-tooltip />
+        <el-table-column label="排序" align="center" prop="reportSort" width="80" />
+        <el-table-column label="状态" align="center" prop="status" width="80">
+          <template #default="scope">
+            <!-- 修正：dict-tag 若为自定义组件需确保引入，否则替换为普通文本 -->
+            <span :class="scope.row.status === '0' ? 'status-normal' : 'status-disable'">
+              {{ scope.row.status === '0' ? '正常' : '禁用' }}
+            </span>
+          </template>
+        </el-table-column>
+        <el-table-column label="创建时间" align="center" prop="createTime" width="150" show-overflow-tooltip>
+          <template #default="scope">
+            <span>{{ parseTime(scope.row.createTime) }}</span>
+          </template>
+        </el-table-column>
+        <el-table-column label="操作" width="180" align="center" class-name="small-padding fixed-width">
+          <template #default="scope">
+            <el-button link type="primary" icon="Edit" @click="handleUpdate(scope.row)">修改</el-button>
+            <el-button link type="danger" icon="Delete" @click="handleDelete(scope.row)">删除</el-button>
+          </template>
+        </el-table-column>
+      </el-table>
+    </el-row>
+
+    <!-- 添加或修改字典对话框 -->
+    <el-dialog :title="title" v-model="open" width="500px" append-to-body>
+      <el-form ref="reportinstrRef" :model="form" :rules="rules" label-width="150px">
+
+        <el-form-item :label="`${menuname}模板`" prop="reportBgdh">
+          <el-select
+              v-model="form.reportBgdh"
+              :placeholder="`请选择${menuname}模板`"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in dictOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}类别`" prop="reportType">
+          <el-select
+              v-model="form.reportType"
+              :placeholder="`请选择${menuname}类别`"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in reportTypeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}纸张类型`" prop="reportSize">
+          <el-select
+              v-model="form.reportSize"
+              :placeholder="`请选择${menuname}纸张类型`"
+              style="width: 100%"
+          >
+            <el-option
+                v-for="item in reportSizeOptions"
+                :key="item.value"
+                :label="item.label"
+                :value="item.value"
+            />
+          </el-select>
+        </el-form-item>
+        <el-form-item :label="`${menuname}固定行数`" prop="reportRows">
+          <el-input v-model.number="form.reportRows" :placeholder="`请输入${menuname}固定行数`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}最小行数`" prop="reportMinrows">
+          <el-input v-model.number="form.reportMinrows" :placeholder="`请输入${menuname}最小行数`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}最大行数`" prop="reportMaxrows">
+          <el-input v-model.number="form.reportMaxrows" :placeholder="`请输入${menuname}最大行数`" />
+        </el-form-item>
+        <el-form-item :label="`${menuname}指定项目`" prop="reportItems">
+          <el-input v-model="form.reportItems" :placeholder="`请输入${menuname}指定项目`" />
+        </el-form-item>
+        <el-form-item label="顺序" prop="reportSort">
+          <el-input-number v-model="form.reportSort" controls-position="right" :min="0" />
+        </el-form-item>
+        <el-form-item label="状态" prop="status">
+          <el-radio-group v-model="form.status">
+            <el-radio label="0">正常</el-radio>
+            <el-radio label="1">禁用</el-radio>
+          </el-radio-group>
+        </el-form-item>
+        <el-form-item label="备注" prop="remark">
+          <el-input v-model="form.remark" type="textarea" placeholder="请输入内容" />
+        </el-form-item>
+      </el-form>
+      <template #footer>
+        <div class="dialog-footer">
+          <el-button type="primary" @click="submitForm">确 定</el-button>
+          <el-button @click="cancel">取 消</el-button>
+        </div>
+      </template>
+    </el-dialog>
   </div>
 </template>
 
-<script setup lang="ts">
+<script setup name="reportinstr" lang="ts">
+import { ref, reactive, toRefs, watch, onMounted } from 'vue';
+import { ElMessage, ElMessageBox, ElForm } from 'element-plus';
+// 导入类型定义（若项目有axios封装，需补充AxiosResponse类型）
+// 导入API（确保API返回Promise<AxiosResponse>）
+import {
+  addreportinstr,
+  delreportinstr,
+  getreportinstr,
+  listreportinstr,
+  updatereportinstr
+} from "@/api/liswork/xtwh/reportinstrApi";
+import {optionselect} from "@/api/liswork/xtwh/reportdictApi";
+// 导入时间格式化工具（确保存在）
+import { parseTime } from "@/utils/ruoyi.js";
+// ========== 1. 修正：TypeScript 类型定义 ==========
+interface ReportItem {
+  reportId: number;
+  reportYq: string;
+  reportBgdh: string;
+  reportType: string;
+  reportSize: string;
+  reportRows: number;
+  reportMinrows: number;
+  reportMaxrows: number;
+  reportItems: string;
+  reportSort: number;
+  status: string;
+  remark: string;
+  createTime?: string; // 可选属性
+  reportName: string;
+}
+// ========== 2. 修正：响应式变量定义 ==========
+// 下拉选项
+const reportTypeOptions = ref([
+  { label: "常规报告", value: "0" },
+  { label: "细菌阴性", value: "1" },
+  { label: "细菌阳性", value: "2" },
+  { label: "初步报告", value: "3" },
+  { label: "二级报告", value: "4" }
+]);
+const reportSizeOptions = ref([
+  { label: "默认", value: "0" },
+  { label: "A5", value: "1" },
+  { label: "A4", value: "2" }
+]);
 
+// 父组件传值
+const yq = defineModel<string>();
+// 列表数据
+const reportinstrList = ref<ReportItem[]>([]);
+// 弹窗状态
+const open = ref(false);
+const loading = ref(false);
+const showSearch = ref(true);
+const ids = ref<number[]>([]); // 修正：明确类型为number[]
+const single = ref(true); // 批量修改禁用：true=禁用（选中数!=1）
+const multiple = ref(true); // 批量删除禁用：true=禁用（选中数=0）
+const total = ref(0);
+const title = ref("");
+const menuname = ref("仪器报告模板");
+
+// 表单相关（修正：响应式定义 + 初始值类型）
+const data = reactive({
+  form: {
+    reportId: undefined as number | undefined,
+    reportYq: "",
+    reportBgdh: "",
+    reportType: "",
+    reportSize: "2",
+    reportRows: undefined,
+    reportMinrows: undefined,
+    reportMaxrows: undefined,
+    reportItems: "",
+    reportSort: 0,
+    status: "0", // 默认正常
+    remark: ""
+  },
+  queryParams: {
+    reportYq: undefined as string | undefined,
+    reportBgdh: undefined as string | undefined,
+    status: undefined as string | undefined,
+  },
+  // 修正：表单校验规则（动态文本需用函数）
+  rules: {
+    reportBgdh: [{
+      required: true,
+      message: () => `${menuname.value}名称不能为空`,
+      trigger: "blur"
+    }],
+    reportYq: [{
+      required: true,
+      message: () => `${menuname.value}仪器不能为空`,
+      trigger: "blur"
+    }],
+    reportSort: [{
+      required: true,
+      message: () => `${menuname.value}顺序不能为空`,
+      trigger: "blur"
+    }],
+  }
+});
+
+const { queryParams, form, rules } = toRefs(data);
+interface SelectOption {
+  label: string;
+  value: string;
+}
+// 修正：获取表单Ref（Vue3 + TS 正确写法）
+const reportinstrRef = ref<InstanceType<typeof ElForm>>();
+const queryRef = ref<InstanceType<typeof ElForm>>();
+const dictOptions = ref<SelectOption[]>([]); // 下拉/字典选项列表
+const dictLoading = ref(false); // 字典加载状态
+async function loadApiDict() {
+  const dictType ="0";
+  try {
+    dictLoading.value = true;
+    const response = await optionselect({ reportType: dictType })
+    if (response.code === 200 && Array.isArray(response.data)) {
+      dictOptions.value = response.data.map(item => ({
+        label: item.reportName || "",
+        value: item.reportId || ""
+      }));
+    } else {
+      ElMessage.warning("模板无有效数据");
+    }
+  } catch (error) {
+    ElMessage.error("字典请求失败");
+    console.error("字典API异常：", { dictType, error });
+  } finally {
+    dictLoading.value = false;
+  }
+}
+// ========== 3. 修正：核心方法 ==========
+/** 查询列表 */
+const getList = async (): Promise<void> => {
+  loading.value = true;
+  try {
+    // 修正：API入参格式（确保和后端一致）
+    queryParams.value.reportYq=yq.value
+    const response = await listreportinstr(queryParams.value)
+    reportinstrList.value = JSON.parse(JSON.stringify(response.data));
+    total.value = response.data.length;
+  } catch (error) {
+    ElMessage.error(`获取列表异常：${(error as Error).message}`);
+  } finally {
+    loading.value = false;
+  }
+};
+
+/** 取消按钮 */
+const cancel = () => {
+  open.value = false;
+  reset();
+};
+
+/** 表单重置 */
+const reset = () => {
+  form.value = {
+    reportId: undefined,
+    reportYq: yq.value||"",
+    reportBgdh: "",
+    reportType: "",
+    reportSize: "2",
+    reportRows: undefined,
+    reportMinrows: undefined,
+    reportMaxrows: undefined,
+    reportItems: "",
+    reportSort: 0,
+    status: "0",
+    remark: ""
+  };
+  // 修正：重置表单校验状态
+  if (reportinstrRef.value) {
+    reportinstrRef.value.clearValidate();
+  }
+};
+
+/** 搜索按钮操作 */
+const handleQuery = () => {
+  getList();
+};
+
+/** 重置按钮操作 */
+const resetQuery = () => {
+  // 修正：重置搜索表单
+  if (queryRef.value) {
+    queryRef.value.resetFields();
+  }
+  handleQuery();
+};
+
+/** 多选框选中数据 */
+const handleSelectionChange = (selection: ReportItem[]) => {
+  ids.value = selection.map(item => item.reportId);
+  // 修正：批量按钮禁用逻辑
+  single.value = selection.length !== 1; // 选中数!=1 → 批量修改禁用
+  multiple.value = selection.length === 0; // 选中数=0 → 批量删除禁用
+};
+
+/** 新增按钮操作 */
+const handleAdd = () => {
+  loadApiDict();
+  reset();
+  open.value = true;
+  title.value = `添加${menuname.value}`;
+};
+
+/** 批量修改按钮（原handleUpdate重名，拆分） */
+const handleUpdateBatch = () => {
+  if (ids.value.length !== 1) {
+    ElMessage.warning("请选择一条数据进行修改");
+    return;
+  }
+  handleUpdate({ reportId: ids.value[0] } as ReportItem);
+};
+
+/** 单行修改按钮 */
+const handleUpdate = async (row: ReportItem) => {
+  reset();
+  const reportId = row.reportId;
+  try {
+    const response = await getreportinstr(reportId)
+    form.value = response.data;
+    open.value = true;
+    title.value = `修改${menuname.value}`;
+  } catch (error) {
+    ElMessage.error(`获取详情失败：${(error as Error).message}`);
+  }
+};
+
+/** 提交按钮 */
+const submitForm = async () => {
+  if (!reportinstrRef.value) return;
+
+  // 修正：Vue3 表单校验写法
+  try {
+    await reportinstrRef.value.validate();
+
+    if (form.value.reportId !== undefined) {
+      // 修改
+      await updatereportinstr(form.value);
+      ElMessage.success("修改成功");
+    } else {
+      // 新增
+      await addreportinstr(form.value);
+      ElMessage.success("新增成功");
+    }
+    open.value = false;
+    getList();
+  } catch (error) {
+    ElMessage.error("表单校验失败，请检查必填项");
+  }
+};
+
+/** 批量删除按钮（原handleDelete重名，拆分） */
+const handleDeleteBatch = () => {
+  if (ids.value.length === 0) {
+    ElMessage.warning("请选择至少一条数据进行删除");
+    return;
+  }
+  handleDelete({ reportId: ids.value } as unknown as ReportItem);
+};
+
+/** 单行删除按钮 */
+const handleDelete = async (row: ReportItem) => {
+  const reportIds = Array.isArray(row.reportId) ? row.reportId : [row.reportId];
+  try {
+    await ElMessageBox.confirm(
+        `是否确认删除${menuname.value}编号为${reportIds.join(",")}的数据项？`,
+        "确认删除",
+        {
+          confirmButtonText: "确定",
+          cancelButtonText: "取消",
+          type: "warning"
+        }
+    );
+    await delreportinstr(reportIds);
+    ElMessage.success("删除成功");
+    getList();
+  } catch (error) {
+    // 取消删除不提示
+    if (error !== "cancel") {
+      ElMessage.error(`删除失败：${(error as Error).message}`);
+    }
+  }
+};
+
+/** 导出按钮操作（修正：参数传递 + 接口路径） */
+const handleExport = () => {
+};
+
+// ========== 4. 修正：生命周期 + 监听 ==========
+// 补充：获取当前实例（用于proxy）
+import { getCurrentInstance } from 'vue';
+
+// 监听yq变化
+watch(yq, (newVal) => {
+  if (newVal !== undefined) {
+    getList();
+  }
+}, { immediate: true, deep: true });
+
+// 修正：初始化调用（避免重复调用）
+onMounted(() => {
+  getList();
+});
 </script>
 
-<style scoped></style>
\ No newline at end of file
+<style scoped>
+.app-container {
+  display: flex;
+  flex-direction: column;
+  height: 90vh;
+  overflow: hidden;
+}
+.mb8 {
+  height: 30px;
+  margin-bottom: 8px; /* 补充margin，避免按钮重叠 */
+}
+.table-container {
+  flex: 1;
+  overflow: hidden;
+}
+/* 状态样式（替换dict-tag） */
+.status-normal {
+  color: #67c23a;
+  font-weight: 500;
+}
+.status-disable {
+  color: #f56c6c;
+  font-weight: 500;
+}
+/* 减小表格行高 */
+:deep(.report-table .el-table__row) {
+  height: 30px !important;
+  line-height: 30px !important;
+}
+/* 减小单元格内边距 */
+:deep(.report-table .el-table__cell) {
+  padding: 2px 4px !important;
+  height: 30px !important;
+  line-height: 1.2 !important;
+  vertical-align: middle !important;
+  font-size: 12px; /* 补充字体大小，适配矮行 */
+}
+/* 优化操作列按钮 */
+:deep(.report-table .el-button--link) {
+  padding: 0 4px !important;
+  font-size: 12px !important;
+}
+/* 对话框按钮间距 */
+.dialog-footer {
+  text-align: center;
+}
+</style>
\ No newline at end of file