diff --git a/klp-ui/src/assets/styles/btn.scss b/klp-ui/src/assets/styles/btn.scss index e6ba1a8e..45f65930 100644 --- a/klp-ui/src/assets/styles/btn.scss +++ b/klp-ui/src/assets/styles/btn.scss @@ -41,11 +41,11 @@ @include colorBtn($yellow) } -.pan-btn { +.el-button.pan-btn { font-size: 14px; color: #fff; - padding: 14px 36px; - border-radius: 8px; + padding: 4px !important; + border-radius: 4px; border: none; outline: none; transition: 600ms ease all; @@ -81,7 +81,7 @@ } } -.custom-button { +.el-button.custom-button { display: inline-block; line-height: 1; white-space: nowrap; @@ -93,7 +93,7 @@ box-sizing: border-box; outline: 0; margin: 0; - padding: 10px 15px; + padding: 2px !important; font-size: 14px; - border-radius: 4px; + border-radius: 2px; } diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss index 363092a6..4ad1d7b6 100644 --- a/klp-ui/src/assets/styles/element-ui.scss +++ b/klp-ui/src/assets/styles/element-ui.scss @@ -1,10 +1,148 @@ -// cover some element-ui styles +/* 基础变量定义 - 工业风浅色配色 */ +:root { + --secondary-color: #78909c; /* 辅助色 */ + --accent-color: #e67e22; /* 强调色,用于突出按钮和重要操作 */ + --background-color: #f5f7fa; /* 浅色背景 */ + --card-bg-color: #ffffff; /* 卡片背景 */ + --border-color: #cfd8dc; /* 边框颜色 */ + --text-primary: #263238; /* 主要文本色 */ + --text-secondary: #546e7a; /* 次要文本色 */ + --spacing-sm: 4px; + --spacing-md: 8px; + --spacing-lg: 16px; + --spacing-base: 8px; /* 基础间距,表单、表格统一用这个值做倍数调整 */ + --form-item-margin: var(--spacing-base); /* 表单项底部间距 */ + --btn-height: 20px; /* 按钮统一高度 */ +} + +/* 全局样式调整 */ +body { + background-color: var(--background-color); + color: var(--text-primary); + font-size: 14px; + line-height: 1.5; +} + +/* 面包屑导航优化 */ +.el-breadcrumb { + padding: var(--spacing-md) 0; +} .el-breadcrumb__inner, .el-breadcrumb__inner a { font-weight: 400 !important; + color: var(--text-secondary) !important; } +.el-breadcrumb__separator { + margin: 0 var(--spacing-sm); + color: var(--border-color); +} + +/* 按钮样式优化 */ +.el-button { + padding: 6px 12px; + border-radius: 2px; + font-size: 13px; + transition: all 0.2s ease; +} + +.el-button--success { + background-color: #2ecc71; + border-color: #2ecc71; +} + +.el-button--warning { + background-color: var(--accent-color); + border-color: var(--accent-color); +} + +.el-button--mini { + padding: 2px 4px; + font-size: 12px; +} + +/* 卡片组件优化 */ +.el-card { + border-radius: 2px; + border: 1px solid var(--border-color); + box-shadow: 0 1px 3px rgba(0, 0, 0, 0.05); + overflow: hidden; +} + +.el-card__header { + padding: var(--spacing-md) var(--spacing-lg); + border-bottom: 1px solid var(--border-color); + background-color: #f9fafb; +} + +.el-card__body { + padding: var(--spacing-lg); +} + +/* 表格样式优化 - 紧凑布局 */ +.el-table { + border: 1px solid var(--border-color); + border-radius: 2px; + margin-top: 0 !important; +} + +.el-table th, +.el-table td { + padding: 2px 4px; + font-size: 13px; +} + +.el-table--border th, +.el-table--border td { + border-right: 1px solid var(--border-color); +} + +.el-table--border thead tr:last-child th { + border-bottom: 1px solid var(--border-color); +} + +/* 输入框样式优化 */ +.el-input__inner, +.el-textarea__inner { + padding: 7px 11px; + border-radius: 2px; + border: 1px solid var(--border-color); + font-size: 13px; + transition: border-color 0.2s ease; +} + +.el-input__inner:focus, +.el-textarea__inner:focus { + border-color: var(--primary-color); + box-shadow: none; +} + +/* 下拉菜单优化 */ +.el-dropdown-menu { + border-radius: 2px; + border: 1px solid var(--border-color); + box-shadow: 0 2px 8px rgba(0, 0, 0, 0.1); + padding: var(--spacing-sm) 0; +} + +.el-dropdown-menu__item { + padding: 6px 16px; + font-size: 13px; +} + +.el-dropdown-menu a { + display: block; +} + +/* 标签样式优化 */ +.el-tag { + padding: 2px 8px; + border-radius: 2px; + font-size: 12px; +} + +/* 上传组件优化 */ .el-upload { input[type="file"] { display: none !important; @@ -15,12 +153,69 @@ display: none; } -.cell { - .el-tag { - margin-right: 0px; +.upload-container { + .el-upload { + width: 100%; + + .el-upload-dragger { + width: 100%; + height: 200px; + border-radius: 2px; + border: 2px dashed var(--border-color); + } } } +/* 对话框样式优化 */ +.el-dialog { + transform: none; + left: 0; + position: relative; + margin: 0 auto; + border-radius: 2px; + box-shadow: 0 4px 12px rgba(0, 0, 0, 0.15); +} + +.el-dialog__header { + padding: var(--spacing-lg); + border-bottom: 1px solid var(--border-color); +} + +.el-dialog__body { + padding: var(--spacing-lg); +} + +.el-dialog__footer { + padding: var(--spacing-md) var(--spacing-lg); + border-top: 1px solid var(--border-color); +} + +/* 日期选择器优化 */ +.el-range-editor.el-input__inner { + display: inline-flex !important; +} + +.el-range-separator { + box-sizing: content-box; +} + +/* 菜单样式优化 */ +.el-menu { + border-right: 1px solid var(--border-color); +} + +.el-menu-item, +.el-submenu__title { + padding: 0 16px !important; + height: 40px !important; + line-height: 40px !important; +} + +.el-menu--collapse > div > .el-submenu > .el-submenu__title .el-submenu__icon-arrow { + display: none; +} + +/* 自定义工具类 - 紧凑布局 */ .small-padding { .cell { padding-left: 5px; @@ -39,54 +234,127 @@ .cell { padding: 0 10px; text-align: center; - - .el-tag { - margin-right: 0px; - } } } -// to fixed https://github.com/ElemeFE/element/issues/2461 -.el-dialog { - transform: none; - left: 0; - position: relative; - margin: 0 auto; +.el-tag { + margin-right: 0px; + padding: 1px !important; + height: auto !important; + border-radius: 0 !important; } -// refine element ui upload -.upload-container { - .el-upload { - width: 100%; - - .el-upload-dragger { - width: 100%; - height: 200px; - } +.cell { + .el-tag { + margin-right: 0px; } } -// dropdown -.el-dropdown-menu { - a { - display: block +/* 表单样式优化 */ +.el-form-item { + margin-bottom: 12px; +} + +.el-form-item__label { + padding-right: 10px; + font-size: 13px; +} + +/* 分页组件优化 */ +.el-pagination { + margin-top: 16px; + padding: 8px 0; +} + +.el-pager li { + margin: 0 2px; + min-width: 30px; + height: 30px; + line-height: 30px; +} + +div.pagination-container { + background-color: transparent !important; + padding: 0 !important; + + .el-pagination { + padding: 0 !important; + margin: 0 !important; } } -// fix date-picker ui bug in filter-item -.el-range-editor.el-input__inner { - display: inline-flex !important; +.el-table--medium .el-table__cell { + padding: 0 !important; } -// to fix el-date-picker css style -.el-range-separator { - box-sizing: content-box; +.el-table--mini .el-table__cell { + padding: 0 !important; } -.el-menu--collapse - > div - > .el-submenu - > .el-submenu__title - .el-submenu__icon-arrow { - display: none; +.el-table .el-table__header-wrapper th, +.el-table .el-table__fixed-header-wrapper th { + height: auto; + padding: 0 !important; +} + +/* 【优化】表单项整体布局:压缩间距、对齐标签 */ +.el-form-item { + margin-bottom: var(--form-item-margin) !important; + /* 让标签和表格列头对齐,可根据实际需求微调 */ + label-align: right; +} + +/* 【优化】表单标签:缩小文字大小,匹配表格列头 */ +.el-form-item__label { + font-size: 13px; + padding-right: var(--spacing-base); +} + +/* 【优化】表单输入框:统一高度、压缩内边距 */ +.el-input__inner, +.el-textarea__inner, +.el-select .el-input__inner { + height: var(--btn-height); + padding: 0 var(--spacing-base); + font-size: 13px; +} + +/* 【优化】表格与表单的间距:避免表单和表格贴太近 */ +.el-table { + margin-top: calc(var(--form-item-margin) * 2); +} + +/* 【补充】搜索按钮组:如果是 inline 布局,强制对齐 */ +.search-form .el-form-item { + display: inline-block; + margin-right: var(--spacing-base); + vertical-align: middle; +} + +/* 【补充】适配原有工具类,让紧凑度更统一 */ +.small-padding .cell { + padding-left: calc(var(--spacing-base)/2); + padding-right: calc(var(--spacing-base)/2); +} + +.el-input { + height: var(--btn-height); +} + + + +.el-input--small .el-input__inner, +.el-input--medium .el-input__inner { + height: var(--btn-height); + line-height: var(--btn-height); +} + +// .el-input-number--medium .el-input-number__increase, +// .el-input-number--medium .el-input-number__decrease { +// height: calc(var(--btn-height) - 2px); +// line-height: calc(var(--btn-height) - 2px); +// } + +.el-input--medium .el-input__icon { + line-height: var(--btn-height); } \ No newline at end of file diff --git a/klp-ui/src/assets/styles/sidebar.scss b/klp-ui/src/assets/styles/sidebar.scss index abe5b631..6442aed4 100644 --- a/klp-ui/src/assets/styles/sidebar.scss +++ b/klp-ui/src/assets/styles/sidebar.scss @@ -86,6 +86,7 @@ & .theme-dark .is-active > .el-submenu__title { color: $base-menu-color-active !important; + // border-right: 3px solid $base-menu-color-active !important; } & .nest-menu .el-submenu>.el-submenu__title, @@ -225,3 +226,7 @@ } } } + +.el-menu-item.is-active { + border-left: 4px solid !important; +} \ No newline at end of file diff --git a/klp-ui/src/components/Breadcrumb/index.vue b/klp-ui/src/components/Breadcrumb/index.vue index 1696f547..d00aaee4 100644 --- a/klp-ui/src/components/Breadcrumb/index.vue +++ b/klp-ui/src/components/Breadcrumb/index.vue @@ -65,6 +65,7 @@ export default { font-size: 14px; line-height: 50px; margin-left: 8px; + padding: 0; .no-redirect { color: #97a8be; diff --git a/klp-ui/src/components/Crontab/day.vue b/klp-ui/src/components/Crontab/day.vue index f6c4026d..9a5679e5 100644 --- a/klp-ui/src/components/Crontab/day.vue +++ b/klp-ui/src/components/Crontab/day.vue @@ -15,23 +15,23 @@ 周期从 - - - 日 + - + 从 - 号开始,每 - 日执行一次 + 号开始,每 + 日执行一次 每月 - 号最近的那个工作日 + 号最近的那个工作日 diff --git a/klp-ui/src/components/Crontab/hour.vue b/klp-ui/src/components/Crontab/hour.vue index 098b7112..e0a34f8b 100644 --- a/klp-ui/src/components/Crontab/hour.vue +++ b/klp-ui/src/components/Crontab/hour.vue @@ -9,16 +9,16 @@ 周期从 - - - 小时 + - + 小时 从 - 小时开始,每 - 小时执行一次 + 小时开始,每 + 小时执行一次 diff --git a/klp-ui/src/components/Crontab/min.vue b/klp-ui/src/components/Crontab/min.vue index 43cab900..2f2bb562 100644 --- a/klp-ui/src/components/Crontab/min.vue +++ b/klp-ui/src/components/Crontab/min.vue @@ -9,16 +9,16 @@ 周期从 - - - 分钟 + - + 分钟 从 - 分钟开始,每 - 分钟执行一次 + 分钟开始,每 + 分钟执行一次 diff --git a/klp-ui/src/components/Crontab/month.vue b/klp-ui/src/components/Crontab/month.vue index fd0ac384..5ae6cd08 100644 --- a/klp-ui/src/components/Crontab/month.vue +++ b/klp-ui/src/components/Crontab/month.vue @@ -9,16 +9,16 @@ 周期从 - - - 月 + - + 从 - 月开始,每 - 月月执行一次 + 月开始,每 + 月月执行一次 diff --git a/klp-ui/src/components/Crontab/second.vue b/klp-ui/src/components/Crontab/second.vue index e7b77617..978d9069 100644 --- a/klp-ui/src/components/Crontab/second.vue +++ b/klp-ui/src/components/Crontab/second.vue @@ -9,16 +9,16 @@ 周期从 - - - 秒 + - + 从 - 秒开始,每 - 秒执行一次 + 秒开始,每 + 秒执行一次 diff --git a/klp-ui/src/components/Crontab/week.vue b/klp-ui/src/components/Crontab/week.vue index 1cec700e..639c79e1 100644 --- a/klp-ui/src/components/Crontab/week.vue +++ b/klp-ui/src/components/Crontab/week.vue @@ -40,7 +40,7 @@ 第 - 周的星期 + 周的星期 {{item.value}} diff --git a/klp-ui/src/components/Crontab/year.vue b/klp-ui/src/components/Crontab/year.vue index 5487a6c7..73faa45e 100644 --- a/klp-ui/src/components/Crontab/year.vue +++ b/klp-ui/src/components/Crontab/year.vue @@ -15,16 +15,16 @@ 周期从 - - - + - + 从 - 年开始,每 - 年执行一次 + 年开始,每 + 年执行一次 diff --git a/klp-ui/src/components/KLPService/BomPanel/BomItem.vue b/klp-ui/src/components/KLPService/BomPanel/BomItem.vue index 7e1db32d..74658b00 100644 --- a/klp-ui/src/components/KLPService/BomPanel/BomItem.vue +++ b/klp-ui/src/components/KLPService/BomPanel/BomItem.vue @@ -128,7 +128,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, bomId: this.bomId, attrKey: undefined, attrValue: undefined, diff --git a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue index 6234f951..5a86655e 100644 --- a/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue +++ b/klp-ui/src/components/KLPService/RawMaterialSelect/index.vue @@ -6,7 +6,7 @@ 未搜索到原材料,点击添加
未搜索到原材料
-
{{ item.rawMaterialName }} @@ -117,7 +117,9 @@ export default { } }, mounted() { - this.options = this.rawMaterialList; + if (this.rawMaterialList.length < 0) { + this.$store.dispatch('category/getRawMaterialMap') + } }, computed: { ...mapGetters(['rawMaterialList']) diff --git a/klp-ui/src/components/KLPService/VendorSelect/index.vue b/klp-ui/src/components/KLPService/VendorSelect/index.vue index 9127320b..02a6a853 100644 --- a/klp-ui/src/components/KLPService/VendorSelect/index.vue +++ b/klp-ui/src/components/KLPService/VendorSelect/index.vue @@ -47,7 +47,7 @@ export default { this.vendorLoading = true; listSupplier({ pageNum: 1, - pageSize: 10, + pageSize: 20, name: query }).then(response => { this.vendorList = response.rows; diff --git a/klp-ui/src/components/KLPService/WarehouseTree/index.vue b/klp-ui/src/components/KLPService/WarehouseTree/index.vue index 0d4a2eca..5a3b19cd 100644 --- a/klp-ui/src/components/KLPService/WarehouseTree/index.vue +++ b/klp-ui/src/components/KLPService/WarehouseTree/index.vue @@ -56,7 +56,7 @@ export default { }; - + --> diff --git a/klp-ui/src/components/KLPUI/KLPTable/index.vue b/klp-ui/src/components/KLPUI/KLPTable/index.vue new file mode 100644 index 00000000..62e8ba0d --- /dev/null +++ b/klp-ui/src/components/KLPUI/KLPTable/index.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/klp-ui/src/components/Pagination/index.vue b/klp-ui/src/components/Pagination/index.vue index 56f5a6b9..13573cb3 100644 --- a/klp-ui/src/components/Pagination/index.vue +++ b/klp-ui/src/components/Pagination/index.vue @@ -8,6 +8,7 @@ :page-sizes="pageSizes" :pager-count="pagerCount" :total="total" + small v-bind="$attrs" @size-change="handleSizeChange" @current-change="handleCurrentChange" @@ -46,7 +47,7 @@ export default { }, layout: { type: String, - default: 'total, sizes, prev, pager, next, jumper' + default: 'total, sizes, prev, pager, next' }, background: { type: Boolean, diff --git a/klp-ui/src/components/dvplanSelect/index.vue b/klp-ui/src/components/dvplanSelect/index.vue index 1e50f59b..c4389034 100644 --- a/klp-ui/src/components/dvplanSelect/index.vue +++ b/klp-ui/src/components/dvplanSelect/index.vue @@ -148,7 +148,7 @@ // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, planCode: null, planName: null, planType: this.planType, diff --git a/klp-ui/src/components/dvsubjectSelect/multi.vue b/klp-ui/src/components/dvsubjectSelect/multi.vue index 99334b53..a7f5127a 100644 --- a/klp-ui/src/components/dvsubjectSelect/multi.vue +++ b/klp-ui/src/components/dvsubjectSelect/multi.vue @@ -93,7 +93,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, subjectCode: null, subjectName: null, subjectType: this.subjectType, diff --git a/klp-ui/src/components/dvsubjectSelect/single.vue b/klp-ui/src/components/dvsubjectSelect/single.vue index 414cc484..1cea4ae9 100644 --- a/klp-ui/src/components/dvsubjectSelect/single.vue +++ b/klp-ui/src/components/dvsubjectSelect/single.vue @@ -89,7 +89,7 @@ // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, subjectCode: null, subjectName: null, subjectType: this.subjectType, diff --git a/klp-ui/src/components/machinerySelect/index.vue b/klp-ui/src/components/machinerySelect/index.vue index 638d5e5b..1579a1d2 100644 --- a/klp-ui/src/components/machinerySelect/index.vue +++ b/klp-ui/src/components/machinerySelect/index.vue @@ -145,7 +145,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, machineryCode: null, machineryName: null, machineryBrand: null, diff --git a/klp-ui/src/components/machinerySelect/single.vue b/klp-ui/src/components/machinerySelect/single.vue index 9cbd3b1f..7d20e77c 100644 --- a/klp-ui/src/components/machinerySelect/single.vue +++ b/klp-ui/src/components/machinerySelect/single.vue @@ -157,7 +157,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, machineryCode: null, machineryName: null, machineryBrand: null, diff --git a/klp-ui/src/components/userSelect/multi.vue b/klp-ui/src/components/userSelect/multi.vue index f35c0b5e..61fa5d81 100644 --- a/klp-ui/src/components/userSelect/multi.vue +++ b/klp-ui/src/components/userSelect/multi.vue @@ -150,7 +150,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, userName: undefined, phonenumber: undefined, status: undefined, diff --git a/klp-ui/src/components/userSelect/single.vue b/klp-ui/src/components/userSelect/single.vue index 81365588..5404bfff 100644 --- a/klp-ui/src/components/userSelect/single.vue +++ b/klp-ui/src/components/userSelect/single.vue @@ -153,7 +153,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, userName: undefined, phonenumber: undefined, status: undefined, diff --git a/klp-ui/src/main.js b/klp-ui/src/main.js index ced9cc70..5c8dc618 100644 --- a/klp-ui/src/main.js +++ b/klp-ui/src/main.js @@ -39,6 +39,7 @@ import DictTag from '@/components/DictTag' import VueMeta from 'vue-meta' // 字典数据组件 import DictData from '@/components/DictData' +import KLPTable from '@/components/KLPUI/KLPTable/index.vue' // 全局方法挂载 Vue.prototype.getDicts = getDicts @@ -60,7 +61,7 @@ Vue.component('Editor', Editor) Vue.component('FileUpload', FileUpload) Vue.component('ImageUpload', ImageUpload) Vue.component('ImagePreview', ImagePreview) - +Vue.component('KLPTable', KLPTable) Vue.use(vueFlvPlayer) Vue.use(directive) diff --git a/klp-ui/src/views/components/FlowTable.vue b/klp-ui/src/views/components/FlowTable.vue index 9219bb0d..76ee7aed 100644 --- a/klp-ui/src/views/components/FlowTable.vue +++ b/klp-ui/src/views/components/FlowTable.vue @@ -65,7 +65,7 @@ export default { todoList: [], queryParams: { pageNum: 1, - pageSize: 10 + pageSize: 20 }, dateRange: [] } diff --git a/klp-ui/src/views/demo/demo/index.vue b/klp-ui/src/views/demo/demo/index.vue index 6ff47247..f496e69d 100644 --- a/klp-ui/src/views/demo/demo/index.vue +++ b/klp-ui/src/views/demo/demo/index.vue @@ -243,7 +243,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, testKey: undefined, value: undefined, createTime: undefined, diff --git a/klp-ui/src/views/finance/document/components/detail.vue b/klp-ui/src/views/finance/document/components/detail.vue index 6a61e1b3..3f47782c 100644 --- a/klp-ui/src/views/finance/document/components/detail.vue +++ b/klp-ui/src/views/finance/document/components/detail.vue @@ -230,7 +230,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, voucherNo: undefined, lineNo: undefined, entryDate: undefined, diff --git a/klp-ui/src/views/finance/document/index.vue b/klp-ui/src/views/finance/document/index.vue index ce392053..c088c234 100644 --- a/klp-ui/src/views/finance/document/index.vue +++ b/klp-ui/src/views/finance/document/index.vue @@ -136,7 +136,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, docNo: undefined, docType: undefined, docDate: undefined, diff --git a/klp-ui/src/views/finance/jounery/index.vue b/klp-ui/src/views/finance/jounery/index.vue index ec9e6520..89996758 100644 --- a/klp-ui/src/views/finance/jounery/index.vue +++ b/klp-ui/src/views/finance/jounery/index.vue @@ -155,7 +155,7 @@ export default { // 查询参数 queryParams: { pageNum: 1, - pageSize: 10, + pageSize: 20, journalDate: undefined, summary: undefined, transType: undefined, diff --git a/klp-ui/src/views/finance/pay/index.vue b/klp-ui/src/views/finance/pay/index.vue index 6aea7a8e..3f63ac64 100644 --- a/klp-ui/src/views/finance/pay/index.vue +++ b/klp-ui/src/views/finance/pay/index.vue @@ -156,7 +156,7 @@ - +