[R] R Services fix

master
liuxinxin 5 years ago
parent 642adc007f
commit b51a9760ef

@ -566,7 +566,7 @@
</if> </if>
<if test="source != 'ALL'"> <if test="source != 'ALL'">
AND AND
o.source != 'system' o.source != #{source}
</if> </if>
</where> </where>
GROUP BY o.order_id GROUP BY o.order_id

@ -98,6 +98,7 @@ define(['angular', 'uiBootstrap', 'uiRouter'], function (angular) {
$scope.loadTradeLogs(1); $scope.loadTradeLogs(1);
}; };
$scope.loadTradeLogs = function (page) { $scope.loadTradeLogs = function (page) {
$scope.params.source = $scope.serviceInfo.channel;
var params = angular.copy($scope.params); var params = angular.copy($scope.params);
if (params.datefrom) { if (params.datefrom) {
params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd'); params.datefrom = $filter('date')(params.datefrom, 'yyyyMMdd');

Loading…
Cancel
Save