|
|
@@ -72,6 +72,7 @@ function printCN_XSW(printRow) {
|
|
|
productName, /*产品名*/
|
|
|
productSpecifications, /*规格*/
|
|
|
productColor, /*色泽*/
|
|
|
+ productColour, /*色泽2*/
|
|
|
lotNum, /*批次*/
|
|
|
levels,/*等级*/
|
|
|
directionOfTwist,/*捻向*/
|
|
|
@@ -80,9 +81,16 @@ function printCN_XSW(printRow) {
|
|
|
boxNum,/*箱号*/
|
|
|
packaging
|
|
|
} = printRow;
|
|
|
+ /*加一个色泽判断，因为productColor 和 productColour 的各文件应用次数较多无法完全替换*/
|
|
|
+ var color = "";
|
|
|
+ if(productColor == "" || productColor == null || productColor == undefined){
|
|
|
+ color = productColour;
|
|
|
+ }else{
|
|
|
+ color = productColor;
|
|
|
+ }
|
|
|
let res = [];
|
|
|
res.push({ key1: '品种', key2: productName || '', key3: '规格', key4: productSpecifications || '' })
|
|
|
- res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: productColor || '' })
|
|
|
+ res.push({ key1: '批号', key2: lotNum || '', key3: '色号', key4: color || '' })
|
|
|
res.push({ key1: '等级', key2: levels || '', key3: '箱号', key4: qrCode || '', key5: boxNum || '' })
|
|
|
res.push({ key1: '筒数', key2: canisterNum || '' + ' ' + tubeColor, key3: '捻向', key4: directionOfTwistLabel || ' ', })
|
|
|
res.push({
|
