From c3b89a01ab5a1c37a6d9fbdc8261017efce9371e Mon Sep 17 00:00:00 2001
From: wyuu <czlis@wuyy>
Date: Tue, 23 Dec 2025 17:36:12 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=82=E6=95=B0=E6=A8=A1=E6=9D=BF=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/assets/styles/index.scss                  |   4 +-
 src/components/DictTag/index.vue              |  18 +-
 .../comopt/components/sysChannel/index.vue    |  41 +--
 src/views/liswork/xtwh/comopt/index.vue       |   2 +-
 src/views/liswork/xtwh/configdict/index.vue   | 321 +++++++-----------
 src/views/liswork/xtwh/reportItem/index.vue   |  27 +-
 src/views/liswork/xtwh/reportdict/index.vue   |  11 +
 src/views/liswork/xtwh/xmFeeInstr/index.vue   |   2 +-
 src/views/liswork/xtwh/xmReqItemVs/index.vue  |  56 +--
 9 files changed, 210 insertions(+), 272 deletions(-)
 create mode 100644 src/views/liswork/xtwh/reportdict/index.vue

diff --git a/src/assets/styles/index.scss b/src/assets/styles/index.scss
index 2109434..834f5b1 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 {
@@ -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/comopt/components/sysChannel/index.vue b/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
index f0b3b8e..bb13802 100644
--- a/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
+++ b/src/views/liswork/xtwh/comopt/components/sysChannel/index.vue
@@ -11,32 +11,20 @@
       <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">
-        <CustomTable ref="tableRef" :data="tableData" :columns="columns" :config="tableConfig"
-          @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>
-      </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>
 
@@ -45,13 +33,14 @@ 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 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 },
+  { label: '项目', prop: 'xmmc', visible: true, align: 'center', slot: 'xmmc', showOverflowTooltip: false, width: 250 },
   { label: '项目id', prop: 'xmid', visible: true, align: 'center' },
 ];
 const tableConfig = {
@@ -108,7 +97,9 @@ const allClear = () => {
 }
 const xmList = ref<Array<{ xmmc: string, xmdh: string }>>([]);
 const getXmList = () => {
+  loading.value = true;
   queryXmInfo({ yq: yq.value }).then((res: any) => {
+    loading.value = false;
     xmList.value = res.data.map((item: any) => {
       return {
         label: item.xmmc,
diff --git a/src/views/liswork/xtwh/comopt/index.vue b/src/views/liswork/xtwh/comopt/index.vue
index aadc9c6..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('SysParameter')
+const activeName = ref('SysGlobal')
 
 // 计算当前要渲染的组件
 const currentComponent = computed(() => {
diff --git a/src/views/liswork/xtwh/configdict/index.vue b/src/views/liswork/xtwh/configdict/index.vue
index 69166fe..fa13382 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 == 0) {
+            proxy.$modal.msgSuccess("修改成功");
+            open.value = false;
+            getList();
+          }
         });
       } else {
         addconfigdict(form.value).then(response => {
-          proxy.$modal.msgSuccess("新增成功");
-          open.value = false;
-          getList();
+          if (response.code == 0) {
+            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;
diff --git a/src/views/liswork/xtwh/reportItem/index.vue b/src/views/liswork/xtwh/reportItem/index.vue
index b8d01a1..dcaca6a 100644
--- a/src/views/liswork/xtwh/reportItem/index.vue
+++ b/src/views/liswork/xtwh/reportItem/index.vue
@@ -1,16 +1,18 @@
 <template>
-  <!-- 报告项目维护 -->
-<el-form ref="form" :model="formData" label-width="80px">
-  <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>
+  <div class="app-container">
+    <!-- 报告项目维护 -->
+    <el-form ref="form" :model="formData" label-width="80px">
+      <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>
 
-<CustomTable ref="tableRef" :data="dataList" :columns="columns" :enable-column-drag="true" @column-drag-end="handleColumnDragEnd"
-      :config="tableConfig"/>
+    <CustomTable ref="tableRef" :data="dataList" :columns="columns" :enable-column-drag="true"
+      @column-drag-end="handleColumnDragEnd" :config="tableConfig" />
+  </div>
 </template>
 
 <script setup lang="ts">
@@ -40,5 +42,4 @@ const handleColumnDragEnd = (data: any) => {
 }
 </script>
 
-<style scoped lang="scss">
-</style>
+<style scoped lang="scss"></style>
diff --git a/src/views/liswork/xtwh/reportdict/index.vue b/src/views/liswork/xtwh/reportdict/index.vue
new file mode 100644
index 0000000..2a7c850
--- /dev/null
+++ b/src/views/liswork/xtwh/reportdict/index.vue
@@ -0,0 +1,11 @@
+<template>
+  <div>
+    reportdict
+  </div>
+</template>
+
+<script setup lang="ts">
+
+</script>
+
+<style scoped></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 dc6d9cb..b4d138b 100644
--- a/src/views/liswork/xtwh/xmFeeInstr/index.vue
+++ b/src/views/liswork/xtwh/xmFeeInstr/index.vue
@@ -1,5 +1,5 @@
+<!--仪器收费项目对照-->
 <template>
-  <!--仪器收费项目对照-->
   <div class="app-container">
     <el-row>
       <el-form ref="form" :model="formData" label-width="80px" inline>
diff --git a/src/views/liswork/xtwh/xmReqItemVs/index.vue b/src/views/liswork/xtwh/xmReqItemVs/index.vue
index 646f180..3018786 100644
--- a/src/views/liswork/xtwh/xmReqItemVs/index.vue
+++ b/src/views/liswork/xtwh/xmReqItemVs/index.vue
@@ -1,5 +1,5 @@
+<!-- 收费项目，报告项目对照 -->
 <template>
-  <!-- 收费项目，报告项目对照 -->
   <div class="app-container">
     <el-form ref="form" :model="formData" label-width="80px" inline>
       <el-form-item label="仪器" prop="yq">
@@ -9,7 +9,7 @@
         <el-input placeholder="请输入项目名称" v-model="formData.xmdh" style="width: 200px;"></el-input>
       </el-form-item>
       <el-form-item>
-        <el-checkbox v-model="checked" label="只看仪器对照收费项目" :value="xmValue"></el-checkbox>
+        <el-checkbox v-model="formData.sl" label="只看仪器对照收费项目" true-value="1" false-value="" @change="getList" />
       </el-form-item>
     </el-form>
 
@@ -19,16 +19,17 @@
       <el-button type="primary" icon="Edit" @click="onClickSave">保存</el-button>
     </el-row>
 
-    <el-row>
-      <el-col :span="6">
-        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :enable-column-drag="true"
-          @column-drag-end="handleColumnDragEnd" :config="tableConfig" @row-click="rowClickLeft" />
+    <el-row :gutter="20" class="table-row">
+      <el-col :span="8" class="table-col">
+        <CustomTable ref="tableRefLeft" :data="dataListLeft" :columns="columnsLeft" :config="tableConfig"
+          @row-click="rowClickLeft" />
       </el-col>
-      <el-col :span="18">
+      <el-col :span="16" class="table-col">
         <CustomTable ref="tableRefRight" :data="dataListRight" :columns="columnsRight" :enable-column-drag="true"
           @column-drag-end="handleColumnDragEnd" :config="tableConfig">
           <template #xmdh="{ row }">
             {{ row.xmdh }} {{ row.xmmc }}
+            <!-- <SelectTable v-model:data="row.xmdh" :tableData="dataListLeft" class="full-width-input" /> -->
           </template>
           <template #tdh="{ row }">
             <el-input placeholder="" v-model="row.tdh" class="full-width-input"></el-input>
@@ -52,46 +53,43 @@ import YQSelectTable from '@/components/SelectTable/YQSelectTable/index.vue';
 import CustomTable from '@/components/elTable/index.vue'
 
 const formData = ref({
-  yq: '',
-  xmdh: ''
+  yq: '46',
+  xmdh: '',
+  sl: ''
 })
 const dataListLeft = ref([])
 const dataListRight = ref([])
-const checked = ref(false);
-const xmValue = '1';
-
 
 //退拽属性
 const handleColumnDragEnd = (data: any) => {
   // 更新列配置
-  columnsLeft.value = data.columns;
   columnsRight.value = data.columns;
 }
 
 const tableConfig = ref({
   border: true, // 边框
-  height: '76vh', // 高度
+  height: '100%', // 高度
   highlightCurrentRow: true, // 高亮当前行
-  // cellStyle: cellStyleHd
 })
 
 const columnsLeft = ref([
-  { prop: 'sqxmmc', label: '申请/收费项目名称', visible: true, align: 'center', width: 200 },
-  { prop: 'sqxmdh', label: '申请/收费项目代号', visible: true, align: 'center', width: 130 },
+  { prop: 'sqxmmc', label: '申请/收费项目名称', visible: true, align: 'center', },
+  { prop: 'sqxmdh', label: '申请/收费项目代号', visible: true, align: 'center', },
 ]);
 
 const columnsRight = ref([
-  { prop: 'xmdh', label: '报告项目', visible: true, align: 'center', width: 300, slot: 'xmdh' },
-  { prop: 'tdh', label: '双工代号', visible: true, align: 'center', width: 100, slot: 'tdh' },
-  { prop: 'mrz', label: '默认值', visible: true, align: 'center', width: 100, slot: 'mrz' },
-  { prop: 'seq', label: '序号', visible: true, align: 'center', width: 100 },
-  { prop: 'def', label: '非必做', visible: true, align: 'center', width: 100, slot: 'def' },
+  { 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: 'def', label: '非必做', visible: true, align: 'center', slot: 'def' },
 ]);
 
 // 获取数据列表
 const getList = async () => {
-  const res = await queryListService({ yq: formData.value.yq })
+  const res = await queryListService(formData.value)
   dataListLeft.value = res.data
+  rowClickLeft(dataListLeft.value[0] || { sqxmdh: '', sqxmmc: '' })
 }
 
 const onClickAdd = () => {
@@ -111,6 +109,16 @@ const rowClickLeft = async (row: any) => {
   const res = await queryDetailService({ sqxmdh: row.sqxmdh, sqxmmc: row.sqxmmc, yq: formData.value.yq })
   dataListRight.value = res.rows
 }
+getList()
 </script>
 
-<style scoped lang="scss"></style>
+<style scoped lang="scss">
+.table-row {
+  height: calc(100% - 90px);
+  padding-top: 10px;
+
+  .table-col {
+    height: 100%;
+  }
+}
+</style>