Merge remote-tracking branch 'origin/main'

This commit is contained in:
zhangzq
2026-07-23 18:37:54 +08:00
10 changed files with 135 additions and 35 deletions

View File

@@ -336,6 +336,7 @@ export default {
const orderNo = dtl.order_no || ''
const itemNo = dtl.item_no || ''
const skuCode = dtl.sku_code || ''
const house_code = dtl.house_code || ''
const skuName = dtl.sku_name || ''
const qty = dtl.qty || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#'
@@ -345,11 +346,12 @@ export default {
html += '<div class="label">'
html += '<h3>上海诺力</h3>'
html += '<table>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="5"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="6"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">行号</td><td class="val">' + itemNo + '</td></tr>'
html += '<tr><td class="lbl">物料编码</td><td class="val">' + skuCode + '</td></tr>'
html += '<tr><td class="lbl">物料名称</td><td class="val">' + skuName + '</td></tr>'
html += '<tr><td class="lbl">数量</td><td class="val">' + qty + '</td></tr>'
html += '<tr><td class="lbl">仓库</td><td class="val">' + house_code + '</td></tr>'
html += '</table></div>'
}
html += '</body></html>'

View File

@@ -284,6 +284,7 @@ export default {
const orderNo = dtl.order_no || ''
const itemNo = dtl.item_no || ''
const skuCode = dtl.sku_code || ''
const house_code = dtl.house_code || ''
const skuName = dtl.sku_name || ''
const qty = dtl.qty || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#'
@@ -293,11 +294,12 @@ export default {
html += '<div class="label">'
html += '<h3>上海诺力</h3>'
html += '<table>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="5"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="6"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">行号</td><td class="val">' + itemNo + '</td></tr>'
html += '<tr><td class="lbl">物料编码</td><td class="val">' + skuCode + '</td></tr>'
html += '<tr><td class="lbl">物料名称</td><td class="val">' + skuName + '</td></tr>'
html += '<tr><td class="lbl">数量</td><td class="val">' + qty + '</td></tr>'
html += '<tr><td class="lbl">仓库</td><td class="val">' + house_code + '</td></tr>'
html += '</table></div>'
}
html += '</body></html>'

View File

@@ -353,6 +353,7 @@ export default {
const itemNo = dtl.item_no || ''
const skuCode = dtl.sku_code || ''
const skuName = dtl.sku_name || ''
const house_code = dtl.house_code || ''
const qty = dtl.qty || ''
const qrText = orderNo + '#' + itemNo + '#' + skuCode + '#' + skuName + '##' + qty + '#'
const imgSrc = await QRCode.toDataURL(qrText, {
@@ -361,11 +362,12 @@ export default {
html += '<div class="label">'
html += '<h3>上海诺力</h3>'
html += '<table>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="5"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">单据号</td><td class="val">' + orderNo + '</td><td class="qr" rowspan="6"><img src="' + imgSrc + '" width="150" height="150" /></td></tr>'
html += '<tr><td class="lbl">行号</td><td class="val">' + itemNo + '</td></tr>'
html += '<tr><td class="lbl">物料编码</td><td class="val">' + skuCode + '</td></tr>'
html += '<tr><td class="lbl">物料名称</td><td class="val">' + skuName + '</td></tr>'
html += '<tr><td class="lbl">数量</td><td class="val">' + qty + '</td></tr>'
html += '<tr><td class="lbl">仓库</td><td class="val">' + house_code + '</td></tr>'
html += '</table></div>'
}
html += '</body></html>'