|
|
@@ -743,7 +743,6 @@
|
|
|
},
|
|
|
createRejectedBill() {
|
|
|
let url = '{{url('order/createRejectedBill')}}';
|
|
|
-
|
|
|
axios.post(url,{data:this.checkData})
|
|
|
.then(res=>{
|
|
|
if (res.data.success){
|
|
|
@@ -803,31 +802,18 @@
|
|
|
setLogisticInfo(){
|
|
|
let content = ''
|
|
|
let _this = this
|
|
|
- this.tagOrders.forEach(function(order){
|
|
|
- let picktotraceids = _this.picktotraceidMap[order.orderno];
|
|
|
- if($.type(picktotraceids) ==='array'){
|
|
|
- picktotraceids.forEach(function(picktotraceid,index,array){
|
|
|
- if(array.length ===index+1)content+=picktotraceid;
|
|
|
- else content+=picktotraceid+','
|
|
|
- });
|
|
|
- }else{content+=order.soreference5}
|
|
|
- content+=' '+order.c_contact+order.c_tel2+order.c_province+order.c_city+' '+order.c_district+order.c_address1+'/'+_this.result_explain+"\n"
|
|
|
+ this.tagOrders.forEach(order=>{
|
|
|
+ content+=_this.getOrderLogisticNumbers(order)
|
|
|
+ content+=' '+order.c_contact+order.c_tel2+order.c_province+order.c_city+' '+order.c_district+order.c_address1+'\n'+_this.result_explain+"\n"
|
|
|
})
|
|
|
this.tagOrder.logisticInfo = content
|
|
|
},
|
|
|
setMerchantInfo(){
|
|
|
let content = ''
|
|
|
let _this = this
|
|
|
- this.tagOrders.forEach(function(order){
|
|
|
- content+=order.customer_descr_c+' '+order.soreference1+' '
|
|
|
- let picktotraceids = _this.picktotraceidMap[order.orderno];
|
|
|
- if($.type(picktotraceids) ==='array'){
|
|
|
- picktotraceids.forEach(function(picktotraceid,index,array){
|
|
|
- if(array.length ===index+1)content+=picktotraceid;
|
|
|
- else content+=picktotraceid+','
|
|
|
- });
|
|
|
- }else {content+=order.soreference5}
|
|
|
- content += '/'+_this.result_explain+ "\n";
|
|
|
+ this.tagOrders.forEach(order=>{
|
|
|
+ content+=order.issuepartyname+' '+order.customer_descr_c+' '+order.soreference1+' '+_this.getOrderLogisticNumbers(order)
|
|
|
+ content += '\n'+_this.result_explain+ "\n"
|
|
|
})
|
|
|
this.tagOrder.merchantInfo = content
|
|
|
},
|
|
|
@@ -849,6 +835,17 @@
|
|
|
tempTip.setDuration(2000)
|
|
|
tempTip.showSuccess('复制失败:'+e)
|
|
|
}
|
|
|
+ },
|
|
|
+ getOrderLogisticNumbers(order){
|
|
|
+ let char = '';
|
|
|
+ let picktotraceids = this.picktotraceidMap[order.orderno];
|
|
|
+ if($.type(picktotraceids) ==='array'){
|
|
|
+ picktotraceids.forEach(function(picktotraceid,index,array){
|
|
|
+ if(array.length ===index+1)char+=picktotraceid;
|
|
|
+ else char+=picktotraceid+','
|
|
|
+ });
|
|
|
+ }else {char+=order.soreference5}
|
|
|
+ return char;
|
|
|
}
|
|
|
},
|
|
|
});
|