|
|
@@ -3186,7 +3186,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
$scope.tableParams = new ngTableParams({
|
|
|
page : 1,
|
|
|
- count : 25
|
|
|
+ count : 10
|
|
|
}, {
|
|
|
total : 0,
|
|
|
counts: [10, 25, 50, 100],
|
|
|
@@ -10161,7 +10161,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
}, function(){
|
|
|
|
|
|
});
|
|
|
- }
|
|
|
+ };
|
|
|
|
|
|
// 已存在id的为查看招标单(用于在录入的招标单的发布和删除)
|
|
|
if( ! angular.isUndefined($stateParams.id)) {
|
|
|
@@ -10194,6 +10194,12 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
// }
|
|
|
// };
|
|
|
|
|
|
+ $scope.removeChecked = function() {
|
|
|
+ if ($scope.tenderProd.enterpriseBaseInfo.length > 0) {
|
|
|
+ $scope.tenderProd.enterpriseBaseInfo = [{}];
|
|
|
+ }
|
|
|
+ };
|
|
|
+
|
|
|
|
|
|
// 查找供应商
|
|
|
$scope.dbfindVendor = function(){
|
|
|
@@ -10230,7 +10236,6 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
});
|
|
|
};
|
|
|
-
|
|
|
// 删除一个供应商
|
|
|
$scope.removeVendor = function(index) {
|
|
|
$scope.tenderProd.enterpriseBaseInfo.splice(index, 1);
|
|
|
@@ -10289,7 +10294,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
|
|
|
// 保存和发布招标单
|
|
|
$scope.save = function(isPublish){
|
|
|
- if (!$scope.tender.ifOpen && !$scope.tenderProd.enterpriseBaseInfo) { // 指定供应商招标，而为选择供应商时
|
|
|
+ if (!$scope.tender.ifOpen && !$scope.tenderProd.enterpriseBaseInfo) { // 指定供应商招标，而未选择供应商时
|
|
|
toaster.pop('info','提示','请先指定供应商');
|
|
|
} else {
|
|
|
$scope.loading = true;
|
|
|
@@ -10462,7 +10467,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
PurcTender.getOne({id: $stateParams.id}, function(data){
|
|
|
data.$editing = false;
|
|
|
$scope.tender = data;
|
|
|
- $scope.tableParams = new NgTableParams({}, { dataset: data});
|
|
|
+ $scope.tableParams = new ngTableParams({}, { dataset: data});
|
|
|
$scope.tableParams.sorting($scope.sort.field, $scope.sort.desc);
|
|
|
$scope.loading = false;
|
|
|
}, function(response){
|
|
|
@@ -10565,9 +10570,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
|
|
|
// $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词 做导出时需要的字段
|
|
|
angular.forEach(page.content, function(purcTender) {
|
|
|
angular.forEach(purcTender.purchaseTenderProds[0].saleTenderItems, function(saleTenderItem) {
|
|
|
- if ($scope.currentEn.uu == saleTenderItem.saleTender.vendUU && saleTenderItem.price != null) { // 存在本企业投标明细，且价格已填，判定为已投标
|
|
|
+ if ($scope.currentEn.uu === saleTenderItem.saleTender.vendUU && saleTenderItem.price !== null) { // 存在本企业投标明细，且价格已填，判定为已投标
|
|
|
purcTender.vendorHasBid = true; // 是否投标
|
|
|
- if (seleTenderItem.applyStatus == 1) {
|
|
|
+ if (saleTenderItem.applyStatus === 1) {
|
|
|
purcTender.applyVendor = true; // 是否中标
|
|
|
} else {
|
|
|
purcTender.applyVendor = false; // 是否中标
|
dongbw