From 426cad0dd0eef1aefb59c6aaa2e2a2448773dc0b Mon Sep 17 00:00:00 2001 From: yuxc <653031404@qq.com> Date: 星期一, 24 七月 2023 17:29:24 +0800 Subject: [PATCH] 1、修改查询按钮时的条件,使用编码来查询。 2、增加申请编码时增加设置默认的租户编码。 3、对传入in('条件sql拼接报错问题进行了修改。 4、模板的启用前进行了对分类启用状态的一个判断工作。 --- Source/UBCS-WEB/src/views/MasterData/items.vue | 11 +++++++++-- 1 files changed, 9 insertions(+), 2 deletions(-) diff --git a/Source/UBCS-WEB/src/views/MasterData/items.vue b/Source/UBCS-WEB/src/views/MasterData/items.vue index 5a94682..e3b674b 100644 --- a/Source/UBCS-WEB/src/views/MasterData/items.vue +++ b/Source/UBCS-WEB/src/views/MasterData/items.vue @@ -1,7 +1,7 @@ <template> <el-container> <el-aside> - <basic-container style="height: 85vh; max-height: 155vh; overflow-y: scroll;"> + <basic-container style="overflow: hidden;"> <!-- 鏍戠粍浠�--> <master-tree @codeClassifyOid="codeClassifyOidList" @coderuleoid="coderuleoidList" :pageSize="this.pageSize" :currentPage="this.currentPage" @tableDataArray="tableDataArrays" @tableHeadDataFateher="tableHeadDatas" @@ -85,4 +85,11 @@ } </script> -<style scoped></style> +<style scoped> +.el-aside { + height: calc(100% - 30px); +} +.el-main { + height: calc(100% - 30px); +} +</style> -- Gitblit v1.9.3