|
|
@@ -123,7 +123,6 @@ export default {
|
|
|
let loadingLen
|
|
|
// 兼容多个打印数据
|
|
|
ids = ids instanceof Array ? ids : [ids]
|
|
|
- console.log(ids)
|
|
|
// 清空之前打印的数据
|
|
|
this.outputData = []
|
|
|
// 筛选id
|
|
|
@@ -244,7 +243,6 @@ export default {
|
|
|
}
|
|
|
funcType = addPrints
|
|
|
}
|
|
|
- console.log(requestParams,'ddsd');
|
|
|
const promise = await funcType(requestParams)
|
|
|
// 清空当前克隆数据，避免重复添加次数
|
|
|
this.clonelData = []
|
|
|
@@ -299,7 +297,8 @@ export default {
|
|
|
refEnginRecordNo = data.refEnginRecordNo || data.invoicePickBeans[0].refEnginRecordNo || ''
|
|
|
let remark
|
|
|
remark = funcType === 'getDtailPrintDis' ? data.invoicePickBeans[0].remark || '' : data.remark || ''
|
|
|
- console.log(data.invoicePickBeans[0], 'oo')
|
|
|
+ let createTime_
|
|
|
+ createTime_ = funcType === 'getDtailPrintDis' ? data.invoicePickBeans[0].approvalTime || '' : data.createTime || ''
|
|
|
const tuiHuoRen = data.createBy
|
|
|
let address = null
|
|
|
if (data.pickType === 2) {
|
|
|
@@ -325,11 +324,10 @@ export default {
|
|
|
for (let e = newInvoicePickBeans.length; e > 0; e--) {
|
|
|
const tempData = newInvoicePickBeans[e - 1]
|
|
|
total += Math.abs(+tempData.refundableQty)
|
|
|
-
|
|
|
// 添加表格数据
|
|
|
table.push({
|
|
|
id: tempData.id,
|
|
|
- createTime: tempData.id ? this.dateToDayFilter(data.createTime) : '',
|
|
|
+ createTime: tempData.id ? this.dateToDayFilter(createTime_) : '',
|
|
|
enginOrderType:
|
|
|
tempData.orderType == 'HOME' ||
|
|
|
tempData.orderType == 'TRADE' ||
|
|
|
@@ -357,7 +355,6 @@ export default {
|
|
|
tiTui: data.type === 2 ? `退货人` : `提货人`,
|
|
|
takerPhone: data.takerPhone || '',
|
|
|
pickTypeName: data.pickType === null ? '' : data.pickType === 1 ? '商家自提' : '物流配送',
|
|
|
-
|
|
|
headerRemark: remark,
|
|
|
total_num: data.total_num,
|
|
|
total: total,
|
linwenxin