|
@@ -14,28 +14,26 @@
|
|
v-for="(item,index) in list"
|
|
v-for="(item,index) in list"
|
|
:key="index"
|
|
:key="index"
|
|
class="print-pages"
|
|
class="print-pages"
|
|
- style="font-size: 9px;padding:3pt 16pt;">
|
|
|
|
- <div class="storeName" style="text-align: center;font-weight: bold;margin: 2pt 0;">
|
|
|
|
|
|
+ style="font-size: 12px;padding:3pt 5pt;">
|
|
|
|
+ <div class="storeName" style="text-align: center;margin: 2pt 0 4pt;">
|
|
{{ nowData.dealerName }}
|
|
{{ nowData.dealerName }}
|
|
</div>
|
|
</div>
|
|
<div style="overflow: hidden;">
|
|
<div style="overflow: hidden;">
|
|
- <div style="float: left;width:60%;">
|
|
|
|
- <div class="shelfName" style="margin-bottom: 2pt;">
|
|
|
|
|
|
+ <div style="float: left;width:65%;padding-top: 5pt;">
|
|
|
|
+ <div class="shelfName" style="margin-bottom: 3pt;">
|
|
{{ nowData.shelfInfo.shelfName }}
|
|
{{ nowData.shelfInfo.shelfName }}
|
|
</div>
|
|
</div>
|
|
- <div class="productCode" style="font-weight: bold;">{{ item.productCode }}</div>
|
|
|
|
|
|
+ <div class="productCode" style="margin-bottom: 2pt;">{{ item.productCode }}</div>
|
|
<div class="productName">{{ item.product.name }}</div>
|
|
<div class="productName">{{ item.product.name }}</div>
|
|
- <div class="userName" style="margin-top: 2pt;font-size: 8px;">
|
|
|
|
|
|
+ <div class="userName" style="margin-top: 4pt;">
|
|
<span style="margin: 0 5pt 0 0;">{{ moment().format('YYYY-MM-DD HH:mm') }}</span>
|
|
<span style="margin: 0 5pt 0 0;">{{ moment().format('YYYY-MM-DD HH:mm') }}</span>
|
|
- </div>
|
|
|
|
- <div class="userName" style="margin-top: 2pt;font-size: 8px;">
|
|
|
|
<span>{{ nowData.parintUser }}</span>
|
|
<span>{{ nowData.parintUser }}</span>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
- <div style="float: right;width: 40%;">
|
|
|
|
|
|
+ <div style="float: right;width: 34%;">
|
|
<div class="productSno" style="font-size: 15pt;text-align: center;">{{ item.shelfPlaceCode }}</div>
|
|
<div class="productSno" style="font-size: 15pt;text-align: center;">{{ item.shelfPlaceCode }}</div>
|
|
<div class="qrcode" ref="qrCodeUrl" style="text-align: center;">
|
|
<div class="qrcode" ref="qrCodeUrl" style="text-align: center;">
|
|
- <vue-qr :text="`dealerSn=${nowData.dealerSn}&shelfSn=${item.shelfSn}&productSn=${item.productSn}&productCode=${item.productCode}&shelfPlaceCode=${item.shelfPlaceCode}&shelfPlaceSn=${item.shelfPlaceSn}`" :margin="0" :size="70"></vue-qr>
|
|
|
|
|
|
+ <vue-qr :text="`${item.shelfSn}&${item.productCode}`" :margin="0" :size="70"></vue-qr>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
</div>
|
|
@@ -78,11 +76,10 @@ export default {
|
|
const printBox = document.querySelectorAll('.print-pages')
|
|
const printBox = document.querySelectorAll('.print-pages')
|
|
console.log(printBox)
|
|
console.log(printBox)
|
|
for (let i = 0; i < printBox.length; i++) {
|
|
for (let i = 0; i < printBox.length; i++) {
|
|
- const htmlStr = printBox[i].outerHTML.replace(/<\s?img[^>]*>/gi, '')
|
|
|
|
|
|
+ const htmlStr = printBox[i].outerHTML
|
|
const item = this.list[i]
|
|
const item = this.list[i]
|
|
- const nowData = this.nowData
|
|
|
|
- this.list[i].qrCodeContent = `dealerSn=${nowData.dealerSn}&shelfSn=${item.shelfSn}&productCode=${item.productCode}&shelfPlaceCode=${item.shelfPlaceCode}`
|
|
|
|
- JGPrintTag(htmlStr, '45mm', '30mm', this.list[i])
|
|
|
|
|
|
+ this.list[i].qrCodeContent = `${item.shelfSn}&${item.productCode}`
|
|
|
|
+ JGPrintTag(htmlStr, '60mm', '40mm', this.list[i])
|
|
}
|
|
}
|
|
},
|
|
},
|
|
setData (nowData, list) {
|
|
setData (nowData, list) {
|