|
|
@@ -187,16 +187,17 @@ Page({
|
|
|
let itemIndex = 0
|
|
|
let formData = JSON.parse(this.data.formData)
|
|
|
params.fromNo = (params.fromNo && params.fromNo.length > 0) ? params.fromNo[0] : null
|
|
|
- let item = this.data.item ? JSON.parse(this.data.item) : null
|
|
|
+ let item = this.data.item ? this.data.item : null
|
|
|
+ if (typeof item == 'string') {
|
|
|
+ item = JSON.parse(this.data.item)
|
|
|
+ }
|
|
|
//采购订单ID
|
|
|
params.fromId = item ? (item.fromId ? item.fromId : null) : null
|
|
|
params.sPurId = item ? (item.sPurId ? item.sPurId : null) : null
|
|
|
params.factAmt = params.intoingAmt
|
|
|
params.intoQty = this.convertToNegative(params.intoQty) ? this.convertToNegative(params.intoQty) : 0
|
|
|
params.intoAmt = this.convertToNegative(params.intoAmt) ? this.convertToNegative(params.intoAmt) : 0
|
|
|
- // params.returnQty = Math.abs(params.sumQuantity)
|
|
|
params.returnAddress = params.addressFull
|
|
|
- // params.returnAmt = Math.abs(params.sumAmount)
|
|
|
if (this.data.formMode == 'edit') {
|
|
|
delete params['intoType']
|
|
|
}
|
|
|
@@ -214,8 +215,6 @@ Page({
|
|
|
res.costAmt = Number(res.intoingQty * res.costPrice)
|
|
|
res.itemIndex = itemIndex++
|
|
|
res.intoingQty = Number(res.intoingQty)
|
|
|
- // res.returnQty = Math.abs(res.intoingQty)
|
|
|
- // res.returnAmt = Math.abs(res.intoingAmt)
|
|
|
})
|
|
|
let btnFormData = this.data.btnFormData ? JSON.parse(this.data.btnFormData) : ''
|
|
|
params.flgAutoHandle = btnFormData ? btnFormData.flag : false //自动出库标识
|
|
|
@@ -247,12 +246,17 @@ Page({
|
|
|
let changeList = this.searchEditList(this.data.searchEditList, params.itemList)
|
|
|
params.itemList = changeList
|
|
|
}
|
|
|
+ params.deleteItemList = params.deleteList ? params.deleteList : []
|
|
|
//大小编辑判断
|
|
|
if (params.itemList.length > 0) {
|
|
|
params.limitEdit = true
|
|
|
} else {
|
|
|
params.limitEdit = false
|
|
|
}
|
|
|
+ if (params.deleteItemList.length > 0) {
|
|
|
+ params.limitEdit = true
|
|
|
+
|
|
|
+ }
|
|
|
console.log('params', params)
|
|
|
return params
|
|
|
},
|
|
|
@@ -952,12 +956,15 @@ Page({
|
|
|
console.log(' this.data.item', this.data.item)
|
|
|
if (this.data.formMode != Constants.formMode.edit) {
|
|
|
let formData = JSON.parse(this.data.formData)
|
|
|
- let item = JSON.parse(this.data.item)
|
|
|
+ let item = this.data.item ? this.data.item : null
|
|
|
+ if (typeof item == 'string') {
|
|
|
+ item = JSON.parse(this.data.item)
|
|
|
+ }
|
|
|
formData.intoDate = utils.formatDayTime(new Date())
|
|
|
if (item) {
|
|
|
formData.fromNo = item.fromNo
|
|
|
formData.supId = item.supId
|
|
|
- formData.supName = item.supplierName
|
|
|
+ formData.supName = item.supplierName ? item.supplierName : item.supName
|
|
|
formData.returnAddress = item.returnAddress
|
|
|
formData.addressFull = item.returnAddress
|
|
|
//处理地址
|