From 7be41c30582d1fcd3b963ca243760cadf8506c31 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=8E=E4=BD=97?= <huatuo@gentronhealth.com>
Date: Tue, 2 Jun 2026 16:45:34 +0800
Subject: [PATCH] =?UTF-8?q?feat:=20=E6=95=B0=E6=8D=AE=E5=AD=97=E5=85=B8?=
 =?UTF-8?q?=E7=AE=A1=E7=90=86=E6=A8=A1=E5=9D=97=20el-table=20=E2=86=92=20V?=
 =?UTF-8?q?xeTable=20=E8=BF=81=E7=A7=BB?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

- definition/index.vue: 2 个表格替换为 vxe-table
- 修复 westernmedicine/index.vue SCSS 括号闭合问题
- 编译验证通过
---
 .../views/datadictionary/definition/index.vue | 144 +++++++++---------
 .../westernmedicine/index.vue                 |   2 +-
 2 files changed, 71 insertions(+), 75 deletions(-)

diff --git a/openhis-ui-vue3/src/views/datadictionary/definition/index.vue b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue
index bf1e0f81c..4a68a8730 100755
--- a/openhis-ui-vue3/src/views/datadictionary/definition/index.vue
+++ b/openhis-ui-vue3/src/views/datadictionary/definition/index.vue
@@ -82,19 +82,18 @@
             </el-form-item>
             <!-- </el-col> -->
           </el-row>
-          <el-table
+          <vxe-table
             v-loading="loading"
             :data="definitionList"
-            tooltip-effect="dark"
-            :show-overflow-tooltip="true"
+            show-overflow
           >
-            <el-table-column
-              type="selection"
+            <vxe-column
+              type="checkbox"
               width="40"
               align="center"
               fixed="left"
             />
-            <el-table-column
+            <vxe-column
               label="项目名称"
               width="200"
               prop="chargeName"
@@ -103,8 +102,8 @@
               <template #default="scope">
                 {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="所属科室"
               width="200"
               prop="orgId_dictText"
@@ -113,8 +112,8 @@
               <template #default="scope">
                 {{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="财务类别"
               width="200"
               prop=" typeCode_dictText"
@@ -127,8 +126,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="医保类别"
               width="200"
               prop="ybType_dictText"
@@ -139,8 +138,8 @@
                   scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="基础价格"
               width="200"
               prop="price"
@@ -149,8 +148,8 @@
               <template #default="scope">
                 {{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="费用明细个数"
               width="200"
               prop="detailCount"
@@ -170,8 +169,8 @@
                   {{ scope.row.detailCount == 0 ? "0" : "-" }}
                 </div>
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="状态"
               width="200"
               prop="statusEnum_enumText"
@@ -184,8 +183,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               min-width="290"
               label="操作"
               align="center"
@@ -201,8 +200,8 @@
                   修改
                 </el-button>
               </template>
-            </el-table-column>
-          </el-table>
+            </vxe-column>
+          </vxe-table>
           <pagination
             v-show="total > 0"
             v-model:page="queryParams.pageNo"
@@ -281,19 +280,18 @@
             </el-form-item>
             <!-- </el-col> -->
           </el-row>
-          <el-table
+          <vxe-table
             v-loading="loading"
             :data="definitionList"
-            tooltip-effect="dark"
-            :show-overflow-tooltip="true"
+            show-overflow
           >
-            <el-table-column
-              type="selection"
+            <vxe-column
+              type="checkbox"
               width="40"
               align="center"
               fixed="left"
             />
-            <el-table-column
+            <vxe-column
               label="项目名称"
               width="200"
               prop="chargeName"
@@ -302,8 +300,8 @@
               <template #default="scope">
                 {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="所属科室"
               width="200"
               prop="orgId_dictText"
@@ -312,8 +310,8 @@
               <template #default="scope">
                 {{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="财务类别"
               width="200"
               prop=" typeCode_dictText"
@@ -326,8 +324,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="医保类别"
               width="200"
               prop="ybType_dictText"
@@ -338,8 +336,8 @@
                   scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="基础价格"
               width="200"
               prop="price"
@@ -348,8 +346,8 @@
               <template #default="scope">
                 {{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="费用明细个数"
               width="200"
               prop="detailCount"
@@ -369,8 +367,8 @@
                   {{ scope.row.detailCount == 0 ? "0" : "-" }}
                 </div>
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="状态"
               width="200"
               prop="statusEnum_enumText"
@@ -383,8 +381,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               min-width="290"
               label="操作"
               align="center"
@@ -400,8 +398,8 @@
                   修改
                 </el-button>
               </template>
-            </el-table-column>
-          </el-table>
+            </vxe-column>
+          </vxe-table>
           <pagination
             v-show="total > 0"
             v-model:page="queryParams.pageNo"
@@ -480,19 +478,18 @@
             </el-form-item>
             <!-- </el-col> -->
           </el-row>
-          <el-table
+          <vxe-table
             v-loading="loading"
             :data="definitionList"
-            tooltip-effect="dark"
-            :show-overflow-tooltip="true"
+            show-overflow
           >
-            <el-table-column
-              type="selection"
+            <vxe-column
+              type="checkbox"
               width="40"
               align="center"
               fixed="left"
             />
-            <el-table-column
+            <vxe-column
               label="项目名称"
               width="200"
               prop="chargeName"
@@ -501,8 +498,8 @@
               <template #default="scope">
                 {{ scope.row.chargeName ? scope.row.chargeName : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="所属科室"
               width="200"
               prop="orgId_dictText"
@@ -511,8 +508,8 @@
               <template #default="scope">
                 {{ scope.row.orgId_dictText ? scope.row.orgId_dictText : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="财务类别"
               width="200"
               prop=" typeCode_dictText"
@@ -525,8 +522,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="医保类别"
               width="200"
               prop="ybType_dictText"
@@ -537,8 +534,8 @@
                   scope.row.ybType_dictText ? scope.row.ybType_dictText : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="基础价格"
               width="200"
               prop="price"
@@ -547,8 +544,8 @@
               <template #default="scope">
                 {{ scope.row.price ? thousandNumber(scope.row.price) : "-" }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="费用明细个数"
               width="200"
               prop="detailCount"
@@ -568,8 +565,8 @@
                   {{ scope.row.detailCount == 0 ? "0" : "-" }}
                 </div>
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               label="状态"
               width="200"
               prop="statusEnum_enumText"
@@ -582,8 +579,8 @@
                     : "-"
                 }}
               </template>
-            </el-table-column>
-            <el-table-column
+            </vxe-column>
+            <vxe-column
               min-width="290"
               label="操作"
               align="center"
@@ -599,8 +596,8 @@
                   修改
                 </el-button>
               </template>
-            </el-table-column>
-          </el-table>
+            </vxe-column>
+          </vxe-table>
           <pagination
             v-show="total > 0"
             v-model:page="queryParams.pageNo"
@@ -617,13 +614,12 @@
       width="600px"
       append-to-body
     >
-      <el-table
+      <vxe-table
         v-loading="detailLoading"
         :data="definitionDetailList"
-        tooltip-effect="dark"
-        :show-overflow-tooltip="true"
+        show-overflow
       >
-        <el-table-column
+        <vxe-column
           label="条件"
           prop="conditionCode_enumText"
           align="center"
@@ -635,8 +631,8 @@
                 : "-"
             }}
           </template>
-        </el-table-column>
-        <el-table-column
+        </vxe-column>
+        <vxe-column
           label="价格"
           width="200"
           prop="amount"
@@ -645,8 +641,8 @@
           <template #default="scope">
             {{ scope.row.amount ? scope.row.amount : "-" }}
           </template>
-        </el-table-column>
-      </el-table>
+        </vxe-column>
+      </vxe-table>
     </el-dialog>
     <edit
       :title="title"
diff --git a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
index 9f2972ad0..1af11a4b7 100755
--- a/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
+++ b/openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
@@ -1588,7 +1588,7 @@ function validate() {
 }
 
 :deep(.el-table--border th),
-:deep(.el-table--border th.gutter:last-of-type {
+:deep(.el-table--border th.gutter:last-of-type) {
   border-color: #dddde0;
 }
 </style>