Compare commits
2 Commits
25c4bb7573
...
zyj
| Author | SHA1 | Date | |
|---|---|---|---|
| 96ddc036b4 | |||
| 6d35811470 |
@@ -416,8 +416,10 @@ export default {
|
|||||||
|
|
||||||
let payRealAmountEnd = []
|
let payRealAmountEnd = []
|
||||||
let customerSettleAmountList = []
|
let customerSettleAmountList = []
|
||||||
|
let endTime = ''
|
||||||
this.selectedStaffList.forEach(item => {
|
this.selectedStaffList.forEach(item => {
|
||||||
this.endT = item.createTime
|
this.endT = item.createTime
|
||||||
|
endTime = item.createTime
|
||||||
payRealAmountEnd.push(item.actAmount ? item.actAmount : '0')
|
payRealAmountEnd.push(item.actAmount ? item.actAmount : '0')
|
||||||
|
|
||||||
customerSettleAmountList.push(item.customerSettleAmount ? item.customerSettleAmount : '0')
|
customerSettleAmountList.push(item.customerSettleAmount ? item.customerSettleAmount : '0')
|
||||||
@@ -440,8 +442,8 @@ export default {
|
|||||||
this.importData.confirmState = 0
|
this.importData.confirmState = 0
|
||||||
this.importData.settlementState = 0
|
this.importData.settlementState = 0
|
||||||
this.importData.createSource = 'XOIL_OMS_WEB'
|
this.importData.createSource = 'XOIL_OMS_WEB'
|
||||||
this.importData.orderStartDate = this.createT
|
this.importData.orderStartTime = this.selectedStaffList[0].createTime
|
||||||
this.importData.orderEndDate = this.endT
|
this.importData.orderEndTime = endTime
|
||||||
this.importData.settlementObjectName = this.selectedStaffList[0].customerName
|
this.importData.settlementObjectName = this.selectedStaffList[0].customerName
|
||||||
this.importData.settlementId = this.selectedStaffList[0].customerId
|
this.importData.settlementId = this.selectedStaffList[0].customerId
|
||||||
|
|
||||||
@@ -457,10 +459,10 @@ export default {
|
|||||||
this.$message.warning('请输入时间')
|
this.$message.warning('请输入时间')
|
||||||
return
|
return
|
||||||
}
|
}
|
||||||
if (!this.page.params.productType) {
|
// if (!this.page.params.productType) {
|
||||||
this.$message.warning('请选择油品类型')
|
// this.$message.warning('请选择油品类型')
|
||||||
return
|
// return
|
||||||
}
|
// }
|
||||||
this.loading = true
|
this.loading = true
|
||||||
this.page.currentPage = 1
|
this.page.currentPage = 1
|
||||||
this.getByPage()
|
this.getByPage()
|
||||||
|
|||||||
Reference in New Issue
Block a user