|
@@ -665,7 +665,8 @@
|
|
|
taxrate: '',
|
|
taxrate: '',
|
|
|
sendcode: '',
|
|
sendcode: '',
|
|
|
whname: '',
|
|
whname: '',
|
|
|
- custUserUU: ''
|
|
|
|
|
|
|
+ custUserUU: '',
|
|
|
|
|
+ sourceDate: ''
|
|
|
}
|
|
}
|
|
|
|
|
|
|
|
// 应收对账单明细行来源表信息
|
|
// 应收对账单明细行来源表信息
|
|
@@ -725,35 +726,7 @@
|
|
|
this.setRemindText('本次对账数量,填写有误!')
|
|
this.setRemindText('本次对账数量,填写有误!')
|
|
|
}
|
|
}
|
|
|
}
|
|
}
|
|
|
- if (this.ShowApcheckChooseTime) {
|
|
|
|
|
- let _time1 = this.isShowApcheckList.objTime.value.fromDate
|
|
|
|
|
- _time1 = _time1.replace(/-/g, '/')
|
|
|
|
|
- let _start = new Date(_time1)
|
|
|
|
|
- let _time2 = this.isShowApcheckList.objTime.value.fromDate
|
|
|
|
|
- _time2 = _time2.replace(/-/g, '/')
|
|
|
|
|
- let _end = new Date(_time2)
|
|
|
|
|
- // 获取筛选时间的开始时间为对账的开始时间
|
|
|
|
|
- apCheck.beginDate = _start.getTime()
|
|
|
|
|
- // 获取筛选的截止时间为对账的截止时间
|
|
|
|
|
- apCheck.endDate = _end.getTime()
|
|
|
|
|
- } else {
|
|
|
|
|
- this.isShowApcheckList.startTime = this.isShowApcheckList.thisMonth + '-01'
|
|
|
|
|
- let _time1 = this.isShowApcheckList.startTime
|
|
|
|
|
- _time1 = _time1.replace(/-/g, '/')
|
|
|
|
|
- let _d = new Date(_time1)
|
|
|
|
|
- _d.setDate(1)
|
|
|
|
|
- _d.setMonth(_d.getMonth() + 1)
|
|
|
|
|
- _d.setDate(_d.getDate() - 1)
|
|
|
|
|
-
|
|
|
|
|
- // 获取筛选时间的开始时间为对账的开始时间
|
|
|
|
|
- let _time2 = this.isShowApcheckList.startTime
|
|
|
|
|
- _time2 = _time2.replace(/-/g, '/')
|
|
|
|
|
- apCheck.beginDate = new Date(_time2).getTime()
|
|
|
|
|
- // 获取筛选的截止时间为对账的截止时间
|
|
|
|
|
- apCheck.endDate = _d.getTime()
|
|
|
|
|
- }
|
|
|
|
|
-
|
|
|
|
|
- // 应收对账单明细行数据
|
|
|
|
|
|
|
+ // 应收对账单明细行数据
|
|
|
item.orderCode = check.ordercode
|
|
item.orderCode = check.ordercode
|
|
|
item.orderClass = check.piclass
|
|
item.orderClass = check.piclass
|
|
|
item.orderDetno = check.orderdetno
|
|
item.orderDetno = check.orderdetno
|
|
@@ -775,6 +748,7 @@
|
|
|
item.sendcode = check.sendcode
|
|
item.sendcode = check.sendcode
|
|
|
item.whname = check.whname
|
|
item.whname = check.whname
|
|
|
item.custUserUU = check.custuseruu
|
|
item.custUserUU = check.custuseruu
|
|
|
|
|
+ item.sourceDate = check.pidate
|
|
|
|
|
|
|
|
// 来源表相关信息
|
|
// 来源表相关信息
|
|
|
sourceInfo.sourceid = check.sourceid
|
|
sourceInfo.sourceid = check.sourceid
|
|
@@ -787,6 +761,33 @@
|
|
|
// 如果是同一家客户,生成对账单的同时,关闭模态框
|
|
// 如果是同一家客户,生成对账单的同时,关闭模态框
|
|
|
}
|
|
}
|
|
|
})
|
|
})
|
|
|
|
|
+ if (this.ShowApcheckChooseTime) {
|
|
|
|
|
+ let _time1 = this.isShowApcheckList.objTime.value.fromDate
|
|
|
|
|
+ _time1 = _time1.replace(/-/g, '/')
|
|
|
|
|
+ let _start = new Date(_time1)
|
|
|
|
|
+ let _time2 = this.isShowApcheckList.objTime.value.fromDate
|
|
|
|
|
+ _time2 = _time2.replace(/-/g, '/')
|
|
|
|
|
+ let _end = new Date(_time2)
|
|
|
|
|
+ // 获取筛选时间的开始时间为对账的开始时间
|
|
|
|
|
+ apCheck.beginDate = _start.getTime()
|
|
|
|
|
+ // 获取筛选的截止时间为对账的截止时间
|
|
|
|
|
+ apCheck.endDate = _end.getTime()
|
|
|
|
|
+ } else {
|
|
|
|
|
+ this.isShowApcheckList.startTime = this.isShowApcheckList.thisMonth + '-01'
|
|
|
|
|
+ let _time1 = this.isShowApcheckList.startTime
|
|
|
|
|
+ _time1 = _time1.replace(/-/g, '/')
|
|
|
|
|
+ let _d = new Date(_time1)
|
|
|
|
|
+ _d.setDate(1)
|
|
|
|
|
+ _d.setMonth(_d.getMonth() + 1)
|
|
|
|
|
+ _d.setDate(_d.getDate() - 1)
|
|
|
|
|
+
|
|
|
|
|
+ // 获取筛选时间的开始时间为对账的开始时间
|
|
|
|
|
+ let _time2 = this.isShowApcheckList.startTime
|
|
|
|
|
+ _time2 = _time2.replace(/-/g, '/')
|
|
|
|
|
+ apCheck.beginDate = new Date(_time2).getTime()
|
|
|
|
|
+ // 获取筛选的截止时间为对账的截止时间
|
|
|
|
|
+ apCheck.endDate = _d.getTime()
|
|
|
|
|
+ }
|
|
|
if (sameCust && validQty) {
|
|
if (sameCust && validQty) {
|
|
|
this.saveApCheck(apCheck, _list)
|
|
this.saveApCheck(apCheck, _list)
|
|
|
}
|
|
}
|