|
|
@@ -10969,16 +10969,16 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
//此次对账后新的已转数
|
|
|
$scope.newYCheckQty = 0;
|
|
|
if (check.$selected == true) {
|
|
|
- $scope.apCheck.custName = check.custName;
|
|
|
- $scope.apCheck.enUu = check.enUu;
|
|
|
- $scope.apCheck.checkAmount += (check.thisCheckQty || 0) * (check.orderPrice || 0);
|
|
|
- $scope.apCheck.apDate = check.piDate;
|
|
|
+ $scope.apCheck.custName = check.custname;
|
|
|
+ $scope.apCheck.enUu = check.enuu;
|
|
|
+ $scope.apCheck.checkAmount += (check.thischeckqty || 0) * (check.orderprice || 0);
|
|
|
+ $scope.apCheck.apDate = check.pidate;
|
|
|
$scope.apCheck.rate = check.rate;
|
|
|
|
|
|
//必须是同一家客户才能生成对账单，否则提示错误
|
|
|
if ($scope.apCheck.custUu == '') {
|
|
|
- $scope.apCheck.custUu = check.custUu;
|
|
|
- } else if ($scope.apCheck.custUu !== check.custUu) {
|
|
|
+ $scope.apCheck.custUu = check.custuu;
|
|
|
+ } else if ($scope.apCheck.custUu !== check.custuu) {
|
|
|
$scope.sameCust = false;
|
|
|
$scope.loading = false;
|
|
|
toaster.pop('error', '请选择同一家客户');
|
|
|
@@ -11014,7 +11014,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
|
|
|
|
|
|
//获取最小时间作为对账区间的起始时间
|
|
|
if ($scope.apCheck.beginDate == '') {
|
|
|
- $scope.apCheck.beginDate = check.piDate;
|
|
|
+ $scope.apCheck.beginDate = check.pidate;
|
|
|
} else {
|
|
|
$scope.apCheck.beginDate = $scope.apCheck.beginDate > check.pidate ? check.pidate : $scope.apCheck.beginDate;
|
|
|
}
|
hejq