|
|
@ -60,8 +60,12 @@ Scene({ |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
} |
|
|
if(!result.data.outboundDeliveryOrderSettlementInfo.categoryId){ |
|
|
|
|
|
|
|
|
if(result.data.outboundDeliveryOrder.productName){ |
|
|
result.data.outboundDeliveryOrderSettlementInfo.categoryId = result.data.outboundDeliveryOrder.productId |
|
|
result.data.outboundDeliveryOrderSettlementInfo.categoryId = result.data.outboundDeliveryOrder.productId |
|
|
|
|
|
result.data.outboundDeliveryOrderSettlementInfo.categoryName = result.data.outboundDeliveryOrder.productName |
|
|
|
|
|
} else { |
|
|
|
|
|
result.data.outboundDeliveryOrderSettlementInfo.categoryId = null |
|
|
|
|
|
result.data.outboundDeliveryOrderSettlementInfo.categoryName = null |
|
|
} |
|
|
} |
|
|
if(Number(result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice) > 0){ |
|
|
if(Number(result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice) > 0){ |
|
|
result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice = math.times(result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice, 1000) |
|
|
result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice = math.times(result.data.outboundDeliveryOrderSettlementInfo.settleUnitPrice, 1000) |
|
|
@ -69,6 +73,7 @@ Scene({ |
|
|
if(Number(result.data.outboundDeliveryOrderSettlementInfo.settleWeight) > 0){ |
|
|
if(Number(result.data.outboundDeliveryOrderSettlementInfo.settleWeight) > 0){ |
|
|
result.data.outboundDeliveryOrderSettlementInfo.settleWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.settleWeight, 1000) |
|
|
result.data.outboundDeliveryOrderSettlementInfo.settleWeight = math.divide(result.data.outboundDeliveryOrderSettlementInfo.settleWeight, 1000) |
|
|
} |
|
|
} |
|
|
|
|
|
|
|
|
this.setData({ |
|
|
this.setData({ |
|
|
safeBottom: app.globalData.safeBottom, |
|
|
safeBottom: app.globalData.safeBottom, |
|
|
poundInfo: result.data.weightNote, |
|
|
poundInfo: result.data.weightNote, |
|
|
|