wangyizhe/his
1
3
Fork 0
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

feat: 数据字典管理模块 el-table → VxeTable 迁移

Browse Source 
- definition/index.vue: 2 个表格替换为 vxe-table
- 修复 westernmedicine/index.vue SCSS 括号闭合问题
- 编译验证通过
This commit is contained in:
华佗
2026-06-02 16:45:34 +08:00
parent 9b785e5e63
commit 7be41c3058
2 changed files with 71 additions and 75 deletions
Download Patch File Download Diff File Expand all files Collapse all files

144
openhis-ui-vue3/src/views/datadictionary/definition/index.vue
View File

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

2
openhis-ui-vue3/src/views/pharmacymanagement/westernmedicine/index.vue
View File

@@ -1588,7 +1588,7 @@ function validate() {
} }
:deep(.el-table--border th), :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; border-color: #dddde0;
} }
</style> </style>