diff --git a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java index dad60b45..0a6dc5b7 100644 --- a/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java +++ b/klp-erp/src/main/java/com/klp/erp/service/impl/ErpPurchaseOrderServiceImpl.java @@ -70,7 +70,7 @@ public class ErpPurchaseOrderServiceImpl implements IErpPurchaseOrderService { private LambdaQueryWrapper buildQueryWrapper(ErpPurchaseOrderBo bo) { LambdaQueryWrapper lqw = Wrappers.lambdaQuery(); - lqw.eq(StringUtils.isNotBlank(bo.getOrderCode()), ErpPurchaseOrder::getOrderCode, bo.getOrderCode()); + lqw.like(StringUtils.isNotBlank(bo.getOrderCode()), ErpPurchaseOrder::getOrderCode, bo.getOrderCode()); lqw.eq(bo.getSupplierId() != null, ErpPurchaseOrder::getSupplierId, bo.getSupplierId()); lqw.eq(bo.getOrderDate() != null, ErpPurchaseOrder::getOrderDate, bo.getOrderDate()); lqw.eq(bo.getExpectedArrival() != null, ErpPurchaseOrder::getExpectedArrival, bo.getExpectedArrival()); diff --git a/klp-ui/src/assets/styles/element-ui.scss b/klp-ui/src/assets/styles/element-ui.scss index ff645e93..6408bb53 100644 --- a/klp-ui/src/assets/styles/element-ui.scss +++ b/klp-ui/src/assets/styles/element-ui.scss @@ -318,7 +318,7 @@ body { .el-table { background: $--table-bg; // border: 1px solid $--border-color-light; - border-radius: 8px; + border-radius: 0px; box-shadow: 0 6px 16px rgba(20, 30, 50, 0.08); color: $--color-text-regular; overflow: hidden; @@ -336,93 +336,16 @@ body { color: $--color-text-primary; font-weight: 600; border-bottom: 1px solid $--border-color-lighter; - padding: 4px !important; // 紧凑 padding + padding: 0 !important; // 紧凑 padding height: auto; font-size: 13px; } } - - // 表体(奇偶行交替 + hover高亮) - .el-table__body-wrapper { - .el-table__row { - - // 奇数行 - &:nth-child(odd) .el-table__cell { - background: $--color-background-light; - color: $--color-text-regular; - } - - // 偶数行 - &:nth-child(even) .el-table__cell { - background: $--color-background-light; - color: $--color-text-regular; - } - - // hover - &:hover .el-table__cell { - background: rgba($--color-primary, 0.12); - color: #4a4a4a; - } - &:hover .el-table__cell { - background: rgba($--color-primary, 0.12); - color: #4a4a4a; - } - - // 当前行 - &.current-row .el-table__cell { - background: rgba($--color-primary, 0.35); - color: $--color-text-primary; - font-weight: 600; - } - } - - // 单元格(统一边框 + 紧凑 padding) - .el-table__cell { - border-bottom: 1px solid $--border-color-lighter; - color: $--color-text-regular; - padding: 2px 4px !important; // 超紧凑 - font-size: 13px; - } - } - - // 表尾 - .el-table__footer-wrapper { - border-top: 1px solid $--border-color-lighter; - - td { - background: linear-gradient(0deg, $--color-background-light, $--color-background); - color: $--color-text-secondary; - padding: 4px !important; - } - } - - // 列宽调整线 - .el-table__column-resize-proxy { - background-color: $--color-primary; - } - - // 展开图标 - .el-table__expand-icon { - color: $--color-text-secondary; - - &.is-expanded, - &:hover { - color: $--color-primary; - } - } - - &__empty-block { - background: lighten($--color-background, 8%); - } - - // 适配尺寸类(统一紧凑) - &.el-table--medium .el-table__cell, - &.el-table--mini .el-table__cell { - padding: 0 !important; - } } -.el-table__fixed-right { +.el-table__fixed, +.el-table__fixed-right, +.el-table__fixed-left { // 表头(深灰黑 + 纯白文字) .el-table__fixed-header-wrapper { th.el-table__cell { @@ -430,35 +353,10 @@ body { color: $--color-text-primary; font-weight: 600; border-bottom: 1px solid $--border-color-lighter; - padding: 4px !important; // 紧凑 padding + padding: 0 !important; // 紧凑 padding font-size: 13px; } } - - // 表体(奇偶行交替 + hover高亮) - .el-table__fixed-body-wrapper { - .el-table__row { - - // 奇数行 - &:nth-child(odd) .el-table__cell { - background: $--color-background-light; - color: $--color-text-regular; - } - - // 偶数行 - &:nth-child(even) .el-table__cell { - background: $--color-background-light; - color: $--color-text-regular; - } - - // 当前行 - &.current-row .el-table__cell { - background: rgba($--color-primary, 0.35); - color: $--color-text-primary; - font-weight: 600; - } - } - } } // ---------------------- 3.2 日期范围选择器 ---------------------- diff --git a/klp-ui/src/components/KLPService/OrderDetailSelect/index.vue b/klp-ui/src/components/KLPService/OrderDetailSelect/index.vue new file mode 100644 index 00000000..9251caca --- /dev/null +++ b/klp-ui/src/components/KLPService/OrderDetailSelect/index.vue @@ -0,0 +1,79 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/components/KLPService/OrderSelect/index.vue b/klp-ui/src/components/KLPService/OrderSelect/index.vue new file mode 100644 index 00000000..4d2068ef --- /dev/null +++ b/klp-ui/src/components/KLPService/OrderSelect/index.vue @@ -0,0 +1,82 @@ + + + \ No newline at end of file diff --git a/klp-ui/src/views/erp/purchase/index.vue b/klp-ui/src/views/erp/purchase/index.vue index aee58767..e0413db7 100644 --- a/klp-ui/src/views/erp/purchase/index.vue +++ b/klp-ui/src/views/erp/purchase/index.vue @@ -30,14 +30,16 @@ - + - + @@ -91,7 +93,8 @@
- + +
查询 @@ -130,7 +133,8 @@
- + + @@ -226,10 +230,12 @@ - + + - + + @@ -259,10 +265,10 @@ - + - + @@ -292,10 +298,11 @@ - +
- + + 查询 重置
@@ -328,8 +335,11 @@ + + + - + @@ -368,9 +378,19 @@ import { getPurchasePriceTrend, getSupplierQuality } from '@/api/erp/purchase' +import RawMaterialSelect from '@/components/KLPService/RawMaterialSelect' +import ProductSelect from '@/components/KLPService/ProductSelect' +import OrderSelect from '@/components/KLPService/OrderSelect' +import OrderDetailSelect from '@/components/KLPService/OrderDetailSelect' export default { name: 'ErpPurchaseWorkbench', + components: { + RawMaterialSelect, + ProductSelect, + OrderSelect, + OrderDetailSelect, + }, data() { return { mappingRows: [{ productId: '', rawMaterialId: '', conversionRate: 1 }], @@ -585,6 +605,7 @@ export default { // 退货明细 openReturnItemDialog() { this.returnItemDialog.visible = true + this.loadReturnItems() }, loadReturnItems() { @@ -607,7 +628,7 @@ export default { this.returnItemFormDialog.form = { ...row } this.returnItemFormDialog.title = '编辑退货明细' } else { - this.returnItemFormDialog.form = { returnId: '', itemId: '', returnQty: 0 } + this.returnItemFormDialog.form = { returnId: '', itemId: '', returnQty: 0, orderId: row.orderId } this.returnItemFormDialog.title = '新增退货明细' } this.returnItemFormDialog.visible = true diff --git a/klp-ui/src/views/erp/receipt/index.vue b/klp-ui/src/views/erp/receipt/index.vue index 22a2cbfa..3c865f0f 100644 --- a/klp-ui/src/views/erp/receipt/index.vue +++ b/klp-ui/src/views/erp/receipt/index.vue @@ -6,8 +6,10 @@ 新增收货
- - + + + + @@ -62,10 +64,12 @@ - + + - + + @@ -98,9 +102,15 @@ import { updatePurchaseReceipt, delPurchaseReceipt } from '@/api/erp/purchase' +import OrderSelect from '@/components/KLPService/OrderSelect' +import OrderDetailSelect from '@/components/KLPService/OrderDetailSelect' export default { name: 'ErpPurchaseReceipt', + components: { + OrderSelect, + OrderDetailSelect + }, data() { return { query: { pageNum: 1, pageSize: 10, orderId: null, itemId: null }, diff --git a/klp-ui/src/views/erp/requirement/index.vue b/klp-ui/src/views/erp/requirement/index.vue index 2d5a21b4..067bae91 100644 --- a/klp-ui/src/views/erp/requirement/index.vue +++ b/klp-ui/src/views/erp/requirement/index.vue @@ -9,14 +9,16 @@
- + - + @@ -82,9 +84,15 @@