|
@ -322,12 +322,10 @@ export default {
|
|
|
console.log(msg.data)
|
|
|
var msgobj = JSON.parse(msg.data)
|
|
|
if (msgobj.type == 'ShipInfo') {
|
|
|
debugger
|
|
|
var item = this.orderdetail[this.currindex]
|
|
|
if (msgobj.mess == ( item.layerNo +";"+ item.wayerNo) ) {
|
|
|
this.updateOrderOutStatus(item.id, 2, msgobj.mess)
|
|
|
.then(res=>{
|
|
|
debugger
|
|
|
this.currindex++;
|
|
|
if (this.orderdetail.length > this.currindex) {
|
|
|
this.$loading(`正在出第${this.currindex+1}个药..`)
|
|
@ -340,7 +338,6 @@ export default {
|
|
|
}
|
|
|
})
|
|
|
.catch(err=>{
|
|
|
debugger
|
|
|
console.error(err)
|
|
|
this.shipComplete("更新订单状态失败:"+ (err&&err.message))
|
|
|
})
|
|
@ -579,7 +576,6 @@ export default {
|
|
|
},
|
|
|
updateOrderOutStatus(shipmentLogId, status, msg){
|
|
|
return new Promise((resolve, reject)=>{
|
|
|
debugger
|
|
|
var p = {
|
|
|
shipmentLogId: shipmentLogId || '',
|
|
|
status: status || '',
|
|
@ -590,7 +586,6 @@ export default {
|
|
|
medicineAbinetApi
|
|
|
.updateOrderOutStatus(p)
|
|
|
.then(res=>{
|
|
|
debugger
|
|
|
if(res.status == 200){
|
|
|
resolve()
|
|
|
return
|
|
@ -598,7 +593,6 @@ export default {
|
|
|
reject()
|
|
|
})
|
|
|
.catch(err=>{
|
|
|
debugger
|
|
|
console.error(err)
|
|
|
reject()
|
|
|
})
|
|
@ -659,7 +653,6 @@ export default {
|
|
|
}
|
|
|
},
|
|
|
resetTimeoutInterval(){
|
|
|
return
|
|
|
this.clearTimeoutInterval()
|
|
|
timeoutInterval = setTimeout(()=>{
|
|
|
var msg = "出药超时,请联系管理员"
|