tangxh/ForgeFlow-ERP
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修复生产台账入库单摘要竖排问题

Browse Source
This commit is contained in:
汤学会 2026-06-13 00:55:13 +08:00
parent a00e817065
commit fc39d81564
3 changed files with 96 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
frontend/src/styles/main.css
View File

@ -16802,6 +16802,10 @@ body .login-production-layout .login-security-foot p {
padding: 14px; padding: 14px;
} }
.warehouse-document-section-grid > .warehouse-paper-summary-grid {
grid-column: 1 / -1;
}
.warehouse-document-section-grid > .stack-form, .warehouse-document-section-grid > .stack-form,
.warehouse-document-section-grid > .double-field, .warehouse-document-section-grid > .double-field,
.warehouse-document-section-grid > .triple-field, .warehouse-document-section-grid > .triple-field,
@ -16816,6 +16820,68 @@ body .login-production-layout .login-security-foot p {
grid-column: 1 / -1; grid-column: 1 / -1;
} }
.warehouse-paper-summary-grid {
display: grid;
grid-template-columns: repeat(4, minmax(0, 1fr));
gap: 0;
min-width: 0;
border-top: 1.5px solid var(--document-paper-grid, rgba(20, 14, 6, 0.88));
border-left: 1.5px solid var(--document-paper-grid, rgba(20, 14, 6, 0.88));
background: rgba(255, 250, 240, 0.42);
}
.warehouse-paper-summary-card {
display: grid;
grid-template-rows: auto minmax(48px, auto);
min-width: 0;
margin: 0;
border-right: 1.5px solid var(--document-paper-grid, rgba(20, 14, 6, 0.88));
border-bottom: 1.5px solid var(--document-paper-grid, rgba(20, 14, 6, 0.88));
background:
linear-gradient(90deg, rgba(31, 122, 74, 0.035), transparent 44%),
rgba(255, 250, 240, 0.52);
}
.warehouse-paper-summary-card-wide {
grid-column: span 2;
}
.warehouse-paper-summary-card span,
.warehouse-paper-summary-card strong {
min-width: 0;
margin: 0;
}
.warehouse-paper-summary-card span {
display: flex;
align-items: center;
min-height: 30px;
padding: 7px 10px;
color: rgba(23, 18, 10, 0.74);
border-bottom: 1px solid rgba(20, 14, 6, 0.48);
background:
linear-gradient(180deg, rgba(255, 255, 255, 0.2), transparent),
rgba(227, 207, 161, 0.5);
font-family: var(--ui-font-display);
font-size: 12px;
font-weight: 900;
letter-spacing: 0.06em;
}
.warehouse-paper-summary-card strong {
display: flex;
align-items: center;
min-height: 48px;
padding: 10px 11px;
color: #17120a;
font-family: "Songti SC", "SimSun", var(--ui-font-body);
font-size: 14px;
font-weight: 900;
line-height: 1.45;
overflow-wrap: anywhere;
word-break: normal;
}
.warehouse-document-action-bar--shared { .warehouse-document-action-bar--shared {
justify-content: flex-end; justify-content: flex-end;
gap: 14px; gap: 14px;
@ -16847,6 +16913,10 @@ body .login-production-layout .login-security-foot p {
.warehouse-document-section-grid { .warehouse-document-section-grid {
grid-template-columns: repeat(2, minmax(0, 1fr)); grid-template-columns: repeat(2, minmax(0, 1fr));
} }
.warehouse-paper-summary-grid {
grid-template-columns: repeat(2, minmax(0, 1fr));
}
} }
@media (max-width: 620px) { @media (max-width: 620px) {
@ -16863,6 +16933,14 @@ body .login-production-layout .login-security-foot p {
grid-template-columns: 1fr; grid-template-columns: 1fr;
} }
.warehouse-paper-summary-grid {
grid-template-columns: 1fr;
}
.warehouse-paper-summary-card-wide {
grid-column: 1 / -1;
}
.warehouse-document-action-bar--shared, .warehouse-document-action-bar--shared,
.warehouse-document-action-bar--shared.warehouse-document-action-bar--with-state { .warehouse-document-action-bar--shared.warehouse-document-action-bar--with-state {
align-items: stretch; align-items: stretch;

7
frontend/src/views/InventoryLedgerView.test.js
View File

@ -70,6 +70,13 @@ describe("InventoryLedgerView warehouse action layout", () => {
assert.match(source, /:business-date="new Date\(\)"/); assert.match(source, /:business-date="new Date\(\)"/);
}); });
it("keeps production inbound preview fields in a full-width paper grid", () => {
assert.doesNotMatch(source, /summary-grid compact-summary-grid/);
assert.match(source, /warehouse-paper-summary-grid/);
assert.match(mainCss, /\.warehouse-document-section-grid > \.warehouse-paper-summary-grid\s*\{[\s\S]*grid-column: 1 \/ -1;/);
assert.match(mainCss, /\.warehouse-paper-summary-grid\s*\{[\s\S]*grid-template-columns: repeat\(4, minmax\(0, 1fr\)\);/);
});
it("surfaces generated PDF archive feedback after independent warehouse saves", () => { it("surfaces generated PDF archive feedback after independent warehouse saves", () => {
[ [
["submitRawReturnOutbound", "退货出库"], ["submitRawReturnOutbound", "退货出库"],

22
frontend/src/views/InventoryLedgerView.vue
View File

@ -2054,17 +2054,17 @@
</select> </select>
</label> </label>
<div v-if="productionWorkOrderInboundPreview" class="summary-grid compact-summary-grid"> <div v-if="productionWorkOrderInboundPreview" class="warehouse-paper-summary-grid">
<article class="summary-card"><span>生产台账</span><strong>{{ productionWorkOrderInboundPreview.material_lot_no }} · {{ productionWorkOrderInboundPreview.product_name }}</strong></article> <article class="warehouse-paper-summary-card warehouse-paper-summary-card-wide"><span>生产台账</span><strong>{{ productionWorkOrderInboundPreview.material_lot_no }} · {{ productionWorkOrderInboundPreview.product_name }}</strong></article>
<article class="summary-card"><span>产品</span><strong>{{ productionWorkOrderInboundPreview.product_name }}</strong></article> <article class="warehouse-paper-summary-card"><span>产品</span><strong>{{ productionWorkOrderInboundPreview.product_name }}</strong></article>
<article class="summary-card"><span>材料库存批次号</span><strong>{{ productionWorkOrderInboundPreview.material_lot_no }}</strong></article> <article class="warehouse-paper-summary-card"><span>材料库存批次号</span><strong>{{ productionWorkOrderInboundPreview.material_lot_no }}</strong></article>
<article class="summary-card"><span>累计领料重量</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.total_issued_weight_kg) }}</strong></article> <article class="warehouse-paper-summary-card"><span>累计领料重量</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.total_issued_weight_kg) }}</strong></article>
<article class="summary-card"><span>库外未闭环重量</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.outside_weight_kg) }}</strong></article> <article class="warehouse-paper-summary-card"><span>库外未闭环重量</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.outside_weight_kg) }}</strong></article>
<article class="summary-card"><span>参考成品数量</span><strong>{{ formatQty(productionWorkOrderInboundPreview.reference_finished_qty) }}</strong></article> <article class="warehouse-paper-summary-card"><span>参考成品数量</span><strong>{{ formatQty(productionWorkOrderInboundPreview.reference_finished_qty) }}</strong></article>
<article class="summary-card"><span>单件毛重</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.gross_weight_per_piece_kg) }}</strong></article> <article class="warehouse-paper-summary-card"><span>单件毛重</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.gross_weight_per_piece_kg) }}</strong></article>
<article class="summary-card"><span>单件净重</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.net_weight_per_piece_kg) }}</strong></article> <article class="warehouse-paper-summary-card"><span>单件净重</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.net_weight_per_piece_kg) }}</strong></article>
<article class="summary-card"><span>已入库成品</span><strong>{{ formatQty(productionWorkOrderInboundPreview.finished_inbound_qty) }}</strong></article> <article class="warehouse-paper-summary-card"><span>已入库成品</span><strong>{{ formatQty(productionWorkOrderInboundPreview.finished_inbound_qty) }}</strong></article>
<article class="summary-card"><span>已入库废料</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.scrap_inbound_weight_kg) }}</strong></article> <article class="warehouse-paper-summary-card"><span>已入库废料</span><strong>{{ formatWeight(productionWorkOrderInboundPreview.scrap_inbound_weight_kg) }}</strong></article>
</div> </div>
<div class="triple-field"> <div class="triple-field">