|
@@ -194,7 +194,6 @@ export default {
|
|
|
strDate = "0" + strDate;
|
|
|
}
|
|
|
var currentdate = year + seperator1 + month + seperator1 + strDate;
|
|
|
- console.log(currentdate);
|
|
|
return currentdate;
|
|
|
},
|
|
|
// 格式化时间
|
|
@@ -272,6 +271,9 @@ export default {
|
|
|
* this.outputData 打印数据
|
|
|
*/
|
|
|
setPrintData(data) {
|
|
|
+ let salesOrderId , invoiceId
|
|
|
+ salesOrderId=data.invoicePickBeans[0].salesOrderId
|
|
|
+ invoiceId=data.invoicePickBeans[0].invoiceId
|
|
|
// 初始化打印次数
|
|
|
let printNum = 0;
|
|
|
//避免数据发生改变
|
|
@@ -308,13 +310,13 @@ export default {
|
|
|
});
|
|
|
}
|
|
|
}
|
|
|
- console.log(this.clonelData);
|
|
|
+
|
|
|
// 添加print输出数据
|
|
|
this.outputData.push({
|
|
|
pageNumber: `${len}-${index + 1}`,
|
|
|
printNum:printNum + 1,
|
|
|
- salesId: this.clonelData[0].invoicePickBeans[0].salesOrderId,
|
|
|
- invoiceId: this.clonelData[0].invoicePickBeans[0].invoiceId,
|
|
|
+ salesId: salesOrderId,
|
|
|
+ invoiceId: invoiceId,
|
|
|
type: data.type,
|
|
|
tiTui: data.type === 2 ? `退货人:${data.createBy}` : `提货人`,
|
|
|
takerPhone: data.takerPhone || "",
|