|
|
@@ -595,7 +595,7 @@ Page({
|
|
|
params.addressName = params.address.addressName ? params.address.addressName : params.address.name
|
|
|
// params.salesChannel = params.channelId
|
|
|
params.canNegativeFlag = false
|
|
|
- params.outDate = util.formatDayTime(new Date())
|
|
|
+ params.outDate = params.outDate ? params.outDate : util.formatDayTime(new Date())
|
|
|
|
|
|
params.btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
|
|
|
if (params.goodsList) { //算出 要收的钱
|
|
|
@@ -609,6 +609,7 @@ Page({
|
|
|
params.objInfo['cusPhone'] = params.cusPhone
|
|
|
params.objInfo['cusName'] = params.cusName
|
|
|
params.objInfo['objectId'] = params.cusId
|
|
|
+ params.objectId= params.cusId
|
|
|
params.objInfo['addressFull'] = params.addressFull
|
|
|
params.formType = 11
|
|
|
delete params['goodsList']
|
|
|
@@ -719,6 +720,8 @@ Page({
|
|
|
formData = res.data.data.data
|
|
|
//销售订单列表转出库
|
|
|
formData.fromNo = formData.fromNo ? formData.fromNo : formData.orderNo
|
|
|
+ console.log('formData',formData)
|
|
|
+ formData.outDate = util.formatDayTime(new Date(formData.outDate ? formData.outDate : formData.deliveryDate))
|
|
|
//处理地址
|
|
|
formData.address = this.setAddress(formData)
|
|
|
//处理明细
|