|
@@ -56,7 +56,8 @@ function codeListPrint(data, domId) {
|
|
|
theNumber--;
|
|
|
res += (printFormat == 3 ? '' : preHtml);
|
|
|
// let qrCodeData = '123456';
|
|
|
- let temp = id + '@' + uuid + '@' + canisterNum + '@' + suttle + '@' + grossWeight + '@' + lotNum + '@' + productName + '@' + productSpecifications + '@' + productColor + '@' + levels + '@' + qrCode + '@' + boxNum
|
|
|
+ // let temp = id + '@' + uuid + '@' + canisterNum + '@' + suttle + '@' + grossWeight + '@' + lotNum + '@' + productName + '@' + productSpecifications + '@' + productColor + '@' + levels + '@' + qrCode + '@' + boxNum
|
|
|
+ let temp = id + '@' + uuid + '@' + canisterNum + '@' + suttle + '@' + grossWeight + '@' + qrCode
|
|
|
let resStr = encodeURIComponent(temp)
|
|
|
if (printFormat == 3) {//打印英文版
|
|
|
uuidList.push({
|
|
@@ -126,6 +127,7 @@ function printCN(uuid, item, res) {
|
|
|
lotNum, //批次
|
|
|
levels,//等级
|
|
|
directionOfTwist,//捻向
|
|
|
+ directionOfTwistLabel,
|
|
|
qrCodeData,
|
|
|
boxNum,//箱号
|
|
|
packaging
|
|
@@ -157,7 +159,7 @@ function printCN(uuid, item, res) {
|
|
|
<td style="width: ${w}px;" colspan="1">筒数</td>
|
|
|
<td style="width: ${w * 3}px;">${canisterNum}   ${tubeColor}</td>
|
|
|
<td style="width: ${w}px;" colspan="1">捻向</td>
|
|
|
- <td style="width: ${w * 3}px;" colspan="2">${directionOfTwist}</td>
|
|
|
+ <td style="width: ${w * 3}px;" colspan="2">${directionOfTwistLabel}</td>
|
|
|
</tr>
|
|
|
<tr style="text-align: center;">
|
|
|
<td style="width: ${w}px;" colspan="1">班次</td>
|