|
|
@@ -259,6 +259,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
url : "/apCheck/:id",
|
|
|
templateUrl : "static/tpl/index/fa/apCheck_detail.html",
|
|
|
controller: 'PurchaseApCheckDetailCtrl'
|
|
|
+ }).state('fa.apCheckList', {
|
|
|
+ url : "/apCheckList",
|
|
|
+ templateUrl : "static/tpl/index/fa/apCheckList.html",
|
|
|
+ controller: 'PurchaseApCheckListCtrl'
|
|
|
}).state('make', {
|
|
|
url : "/make",
|
|
|
views : {
|
|
|
@@ -3675,7 +3679,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
|
|
|
|
|
|
//应收对账单列表
|
|
|
- app.controller('PurchaseApCheckCtrl',['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', '$modal', 'toaster', 'Symbol', function($scope, FaApCheck, BaseService, ngTableParams, $modal, toaster, Symbol){
|
|
|
+ app.controller('PurchaseApCheckCtrl',['$scope', 'FaApCheck', 'BaseService', 'ngTableParams', 'toaster', 'Symbol', function($scope, FaApCheck, BaseService, ngTableParams, toaster, Symbol){
|
|
|
$scope.dateZoneText = '不限';
|
|
|
$scope.condition = {dateZone: -1};
|
|
|
$scope.currency = Symbol.currency;//将币别转化为对应的符号
|
|
|
@@ -3748,21 +3752,10 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
$scope.tableParams.page(1);
|
|
|
$scope.tableParams.reload();
|
|
|
};
|
|
|
-
|
|
|
-
|
|
|
- //打开模态框显示未对账单据列表
|
|
|
- $scope.showApCheckList = function() {
|
|
|
- $modal.open({
|
|
|
- templateUrl:'static/tpl/index/fa/apCheckList.html',
|
|
|
- controller:'PurchaseApCheckListCtrl',
|
|
|
- size:'lg'
|
|
|
- })
|
|
|
- }
|
|
|
-
|
|
|
}]);
|
|
|
|
|
|
//应收对账单详情
|
|
|
- app.controller('PurchaseApCheckDetailCtrl',['$scope','toaster','FaApCheck','$stateParams',function($scope,toaster,FaApCheck,$stateParams,$modal){
|
|
|
+ app.controller('PurchaseApCheckDetailCtrl',['$scope','toaster','FaApCheck','$stateParams',function($scope,toaster,FaApCheck,$stateParams){
|
|
|
$scope.haveSelected = true;
|
|
|
$scope.data = {};
|
|
|
//控制提交删除按钮的显示
|
|
|
@@ -3863,7 +3856,7 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
}]);
|
|
|
|
|
|
//未对账单据列表
|
|
|
- app.controller('PurchaseApCheckListCtrl',['$scope', '$modalInstance', 'FaApCheck', 'toaster', '$state','$filter', function($scope, $modalInstance, FaApCheck, toaster, $state, $filter){
|
|
|
+ app.controller('PurchaseApCheckListCtrl',['$scope', 'FaApCheck', 'toaster', '$state','$filter', function($scope, FaApCheck, toaster, $state, $filter){
|
|
|
$scope.data = {};// 列表数据
|
|
|
$scope.loading = true;
|
|
|
$scope.getData = function(){
|
|
|
@@ -3892,11 +3885,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
item[openParam] = !item[openParam];
|
|
|
}
|
|
|
|
|
|
- //关闭模态框
|
|
|
- $scope.modalClose = function(){
|
|
|
- $modalInstance.close();
|
|
|
- }
|
|
|
-
|
|
|
// 点击筛选根据条件选择数据
|
|
|
$scope.suuorname = '';
|
|
|
$scope.sdateFrom = '';
|
|
|
@@ -4145,7 +4133,6 @@ app.controller('SaleSendCtrl', ['$scope', '$filter', 'SaleSend', 'ngTableParams'
|
|
|
if($scope.sameCust && $scope.validQty) {
|
|
|
updateYCheckQty();
|
|
|
$scope.saveApCheck();
|
|
|
- $modalInstance.close();
|
|
|
}
|
|
|
}
|
|
|
}]);
|