Merge remote-tracking branch 'origin/develop' into develop

master
yuan 6 years ago
commit bf0c4366b7

@ -23,21 +23,24 @@ define(['angular', 'uiBootstrap', 'uiRouter', 'angularEcharts'], function (angul
$http.get('/actchairty/clients', {params: params}).then(function (resp) {
$scope.clients = resp.data.data;
$scope.pagination = resp.data.pagination;
})
};
$scope.loadClients();
$scope.new_conf = {};
$scope.ctrl = {dateInput: false};
$scope.submitClient = function () {
$scope.errmsg = null;
var client_moniker = $scope.new_conf.client_moniker;
$scope.msg = null;
var conf = {
date: $filter('date')($scope.new_conf.date, 'yyyy-MM-dd'),
};
$http.put('/actchairty/clients/' + $scope.new_conf.client_moniker, conf).then(function () {
$scope.new_conf = {};
$scope.loadClients();
$scope.msg = "商户创建成功商户ID"+ client_moniker + " 参加时间:" + conf.date;
}, function (resp) {
$scope.errmsg = resp.data.message;
$scope.msg = resp.data.message;
});
};
}]);

@ -23,7 +23,7 @@
</ul>
<div class="tab-content" ui-view>
<div class="modal-body">
<div class="alert alert-danger" ng-if="errmsg" ng-bind="errmsg"></div>
<div class="alert alert-info" ng-if="msg" ng-bind="msg"></div>
<div class="form-inline">
<div class="form-group">
<input class="form-control" placeholder="Client Moniker" ng-model="new_conf.client_moniker">
@ -74,6 +74,9 @@
next-text="&rsaquo;"
first-text="&laquo;"
last-text="&raquo;"></uib-pagination>
<div class="row">
<div class="col-xs-12">Total Records:{{pagination.totalCount}};Total Pages:{{pagination.totalPages}}</div>
</div>
</div>
</div>

Loading…
Cancel
Save