|
|
@@ -142,7 +142,7 @@ export default {
|
|
|
loadingLen = data.length;
|
|
|
for (let i = data.length; i > 0; i--) {
|
|
|
const newData = data[i - 1];
|
|
|
- await this.setPrintData(newData);
|
|
|
+ await this.setPrintData(newData,funcType);
|
|
|
loadingLen--;
|
|
|
}
|
|
|
} catch (error) {
|
|
|
@@ -273,7 +273,7 @@ export default {
|
|
|
* @param {object} data
|
|
|
* this.outputData 打印数据
|
|
|
*/
|
|
|
- setPrintData(data) {
|
|
|
+ setPrintData(data,funcType) {
|
|
|
let salesOrderId, invoiceId; //出库单号，发货单号 默认数据中的第一个
|
|
|
salesOrderId = data.invoicePickBeans[0].salesOrderId;
|
|
|
invoiceId = data.invoicePickBeans[0].invoiceId;
|
|
|
@@ -284,7 +284,8 @@ export default {
|
|
|
data.invoicePickBeans[0].refEnginRecordNo ||
|
|
|
"";
|
|
|
let remark;
|
|
|
- remark = data.invoicePickBeans[0].remark;
|
|
|
+ remark = funcType==='getDtailPrintDis'?data.invoicePickBeans[0].remark || "" : data.remark||"";
|
|
|
+ console.log(data.invoicePickBeans[0],'oo');
|
|
|
let tuiHuoRen = data.createBy;
|
|
|
// 数量合计
|
|
|
let total = 0;
|
howie