- |
+ |
${buildDeliverySlipSignItem('仓库：', ' ', '80px')}
${buildDeliverySlipSignItem('审核：', ' ', '80px')}
@@ -165,15 +166,22 @@ function formatDeliverySlipProductGridCellContent(content: string): string {
return plain || ' '
}
-function buildProductRows(products: PlanProduct[] = [], ctx?: DeliverySlipRenderContext): string {
+function buildProductRows(
+ products: PlanProduct[] = [],
+ planNo = '',
+ ctx?: DeliverySlipRenderContext
+): string {
if (!products.length) {
- return ` | 暂无产品信息 | `
+ return ` | 暂无产品信息 | `
}
+ const planNoText = formatDeliverySlipProductGridCellContent(planNo)
+
const dataRows = products
.map((product) => {
const qty = product.outboundQty ?? product.outboundEstimateQty ?? product.quantity ?? ''
return `
+ | ${planNoText} |
${formatDeliverySlipProductGridCellContent(resolveSlipProductCode(product, ctx))} |
${formatDeliverySlipProductGridCellContent(product.productName || '')} |
${formatDeliverySlipProductGridCellContent(product.model || '')} |
@@ -220,13 +228,14 @@ export const DELIVERY_SLIP_PRINT_CSS = `
flex: 1 !important;
min-width: 0 !important;
display: flex !important;
- flex-wrap: wrap !important;
+ flex-wrap: nowrap !important;
justify-content: flex-start !important;
align-items: center !important;
- gap: 14px 18px !important;
+ gap: 10px 12px !important;
box-sizing: border-box !important;
font-size: 20px !important;
line-height: 1.35 !important;
+ white-space: nowrap !important;
}
.delivery-slip-doc .delivery-slip-type-check-item {
display: inline-flex !important;
@@ -577,17 +586,44 @@ const SIDE_LABEL_CELL = `border:none !important;padding:0 !important;vertical-al
const DELIVERY_SLIP_TYPE_CHECK_WRAP_STYLE = `${INFO_ROW}margin-top:-8px;margin-bottom:20px;`
const DELIVERY_SLIP_TYPE_CHECK_INNER_STYLE =
- 'flex:1;min-width:0;display:flex;flex-wrap:wrap;justify-content:flex-start;align-items:center;gap:14px 18px;box-sizing:border-box;font-size:20px;line-height:1.35;'
+ 'flex:1;min-width:0;display:flex;flex-wrap:nowrap;justify-content:flex-start;align-items:center;gap:10px 12px;box-sizing:border-box;font-size:20px;line-height:1.35;white-space:nowrap;'
function buildDeliverySlipTypeCheckboxesHtml(): string {
const item = (label: string) =>
``
return `
- 单据编号：
+ 日 期：
${item('自提')}${item('出库')}${item('直销')}
+ ${INFO_COLGROUP}
+
+ |
+
+ 收货单位：
+ {{receivingUnit}}
+
+ |
+
+
+ 收货联系方式：
+ {{receiveContact}}
+
+ |
+
+ ${buildDeliverySlipTypeCheckboxesHtml()}
+
+ 日 期：
+ {{planDateChinese}}
+
+ |
+
+ `
+}
+
function buildDeliverySlipTermsHtml(): string {
return `
1.本送货单如购销双方未签订合同，视为有效;
@@ -622,38 +658,7 @@ export function generateDeliverySlipTemplate(_plan?: Plan): string {
-
- ${INFO_COLGROUP}
-
- |
-
- 收货单位：
- {{receivingUnit}}
-
- |
-
- ${buildDeliverySlipTypeCheckboxesHtml()}
-
- 单据编号：
- {{planNo}}
-
- |
-
-
- |
-
- 收货联系方式：
- {{receiveContact}}
-
- |
-
-
- 日 期：
- {{planDateChinese}}
-
- |
-
-
+ ${buildDeliverySlipInfoTableHtml()}
@@ -661,6 +666,7 @@ export function generateDeliverySlipTemplate(_plan?: Plan): string {
${PRODUCT_COLGROUP}
{{productTable}}
- |
+ |
备注：{{remark}}
|
@@ -679,7 +685,7 @@ export function generateDeliverySlipTemplate(_plan?: Plan): string {
${buildDeliverySlipTermsHtml()}
|
-
+ |
${SEAL_BLOCK}
|
@@ -781,7 +787,7 @@ function patchDeliverySlipProductGridCellAttrs(attrs: string): string {
function normalizeDeliverySlipProductGridCell(html: string): string {
if (!html.includes('delivery-slip-doc') || !html.includes('delivery-slip-product-cell')) return html
- let result = html.replace(/]*)>\s*(\s*){7}\s*<\/tr>/g, (rowMatch) => {
+ let result = html.replace(/]*)>\s*(\s*){8}\s*<\/tr>/g, (rowMatch) => {
if (!rowMatch.includes('物料编号') || rowMatch.includes('colspan')) return rowMatch
let row = rowMatch.includes('delivery-slip-product-header')
? rowMatch
@@ -791,7 +797,7 @@ function normalizeDeliverySlipProductGridCell(html: string): string {
})
})
- result = result.replace(/]*)>\s*(]*colspan)[^>]*>[\s\S]*?<\/td>\s*){7}\s*<\/tr>/g, (rowMatch) => {
+ result = result.replace(/]*)>\s*(]*colspan)[^>]*>[\s\S]*?<\/td>\s*){8}\s*<\/tr>/g, (rowMatch) => {
if (
rowMatch.includes('备注') ||
rowMatch.includes('1.本送货单') ||
@@ -1120,9 +1126,10 @@ function normalizeDeliverySlipProductTableFooter(html: string): string {
let result = html
- result = result.replace(/]*colspan="7"[^>]*)>(\s*)备注：/g, (_match, attrs, space) => {
+ result = result.replace(/]*colspan="[78]"[^>]*)>(\s*)备注：/g, (_match, attrs, space) => {
+ const withSpan = String(attrs).replace(/colspan="[78]"/, 'colspan="8"')
const patched = patchProductFooterCellAttrs(
- attrs,
+ withSpan,
'delivery-slip-product-cell',
PRODUCT_TABLE_CELL_LEFT
)
@@ -1130,9 +1137,9 @@ function normalizeDeliverySlipProductTableFooter(html: string): string {
})
result = result.replace(
- /]*colspan="[45]"[^>]*)>\s*(]*colspan="[456]"[^>]*)>\s*( {
- const withSpan = String(attrs).replace(/colspan="[45]"/, 'colspan="5"')
+ const withSpan = String(attrs).replace(/colspan="[456]"/, 'colspan="5"')
const patched = patchProductFooterCellAttrs(
withSpan,
'delivery-slip-product-cell delivery-slip-terms-cell',
@@ -1145,7 +1152,7 @@ function normalizeDeliverySlipProductTableFooter(html: string): string {
result = result.replace(
/ ]*colspan="[23]"[^>]*)>\s* {
- const withSpan = String(attrs).replace(/colspan="[23]"/, 'colspan="2"')
+ const withSpan = String(attrs).replace(/colspan="[23]"/, 'colspan="3"')
const patched = patchProductFooterCellAttrs(withSpan, 'delivery-slip-product-cell', PRODUCT_TABLE_CELL_LEFT)
return ` \n ]*)>\s* ]*)>\s* {
if (attrs.includes('delivery-slip-terms-cell') && attrs.includes('border:0.3px solid #000') && /colspan="5"/.test(match)) {
return match
@@ -1227,10 +1234,15 @@ function normalizeDeliverySlipTermsText(html: string): string {
/** 刷新已有间距行的 inline 样式（TinyMCE 保存后可能丢失） */
function refreshDeliverySlipGapBeforeProduct(html: string): string {
- return html.replace(
- / [\s\S]*?<\/tr>/,
- ` \n | | \n `
- )
+ return html
+ .replace(
+ / [\s\S]*?<\/tr>/,
+ ` \n | | \n `
+ )
+ .replace(
+ / ]*>[\s\S]*?<\/div>/,
+ ` `
+ )
}
/** 在收货联系方式行与物料表之间插入间距行（兼容已保存模板） */
@@ -1243,32 +1255,42 @@ function normalizeDeliverySlipGapBeforeProduct(html: string): string {
return refreshDeliverySlipGapBeforeProduct(html)
}
- const gapRow = ` | | \n `
+ const gapRow = ` | | \n `
+ const productHeader = `(?:单据编号|物料编号)`
const withComment = html.replace(
- /( ]*>日(?: )?期：<\/span>[\s\S]*?<\/tr>\s*)( | |