处理注释的无效的方法

src/main/webapp/resources/js/index/app.js

@@ -931,137 +931,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
     }]);
 
-    /**
-     * 原消息提醒
-     */
-    // app.controller('PagingReleaseCtrl', ['$scope', 'PagingRelease', 'BaseService', 'ngTableParams', 'toaster', '$modalInstance', 'PagingReleaseInfo', function ($scope, PagingRelease, BaseService, ngTableParams, toaster, $modalInstance, PagingReleaseInfo) {
-    //     // BaseService.scrollBackToTop();
-    //     $scope.active = "todo";
-    //     $scope.searchStatus = false; // 默认从数据库直接获取
-    //     $scope.setActive = function (state) {
-    //         if ($scope.active != state) {
-    //             $scope.active = state;
-    //             if ($scope.tableParams.page() == 1)
-    //                 $scope.tableParams.reload();
-    //             else
-    //                 $scope.tableParams.page(1);
-    //         }
-    //     };
-    //
-    //     var getService = function () {
-    //         if ($scope.searchStatus) {
-    //             return PagingRelease;
-    //         } else {
-    //             return PagingReleaseInfo;
-    //         }
-    //     };
-    //
-    //     $scope.tableParams = new ngTableParams({
-    //         page: 1,
-    //         count: 20,
-    //         sorting: {
-    //             'id': 'desc'
-    //         }
-    //     }, {
-    //         total: 0,
-    //         counts: [5, 10, 25, 50],
-    //         getData: function ($defer, params) {
-    //             $scope.loading = true;
-    //             var pageParams = params.url();
-    //             var realActive = {};
-    //             pageParams.searchFilter = { // 筛选条件
-    //                 keyword: $scope.keyword
-    //                 // fromDate: getDateTime($scope.condition.dateFrom),
-    //                 // endDate: getDateTime($scope.condition.dateTo)
-    //             };
-    //             // AccountEnterprise.get({}, function(data){
-    //             //     $scope.currentEn = data;
-    //             // });
-    //             getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
-    //                 $scope.loading = false;
-    //                 if (page) {
-    //                     params.total(page.totalElement);
-    //                     $defer.resolve(page.content);
-    //                     // $scope.keywordXls = angular.copy($scope.keyword); // 保存当前取值的关键词  做导出时需要的字段
-    //                 }
-    //             }, function (response) {
-    //                 $scope.loading = false;
-    //                 toaster.pop('error', '数据加载失败', response.data);
-    //             });
-    //         }
-    //     });
-    //
-    //     $scope.close = function () {
-    //         $modalInstance.close();
-    //         window.location.reload();
-    //     };
-    //
-    //
-    //     $scope.checks = {
-    //         checked: false
-    //     };// 全选框
-    //
-    //     $scope.checkAll = function () {
-    //         angular.forEach($scope.tableParams.data, function (message) {
-    //             message.checked = $scope.checks.checked;
-    //         });
-    //     };
-    //
-    //     // 单选
-    //     $scope.checkOne = function (vendor) {
-    //         vendor.checked = true;
-    //
-    //         var checked = true;
-    //         angular.forEach($scope.tableParams.data, function (message) { // 单选全部时，全选选中
-    //             if (!message.checked) {
-    //                 checked = false;
-    //             }
-    //         });
-    //         $scope.checks.checked = checked;
-    //     };
-    //
-    //     // 单反选
-    //     $scope.unCheckOne = function (vendor) {
-    //         vendor.checked = false;
-    //         $scope.checks.checked = false;
-    //     };
-    //
-    //     // 标为已读
-    //     $scope.setRead = function () {
-    //         var selectedMessages = [];
-    //         angular.forEach($scope.tableParams.data, function (message) {
-    //             if (message.checked) {
-    //                 selectedMessages.push(message);
-    //             }
-    //         });
-    //         PagingRelease.setRead({}, selectedMessages, function (message) {
-    //             $scope.checks = {
-    //                 checked: false
-    //             };
-    //             toaster.pop("success", "成功", "设置成功");
-    //             $scope.tableParams.page(1);
-    //             $scope.tableParams.reload();
-    //         });
-    //     };
-    //
-    //     // 点击内容连接之后，信息标为已读
-    //     $scope.setOneRead = function (id) {
-    //         $modalInstance.close();
-    //         PagingRelease.setOneRead({id: id}, {}, function (data) {
-    //         }, function (response) {
-    //             toaster.pop('error', '提示', response.data);
-    //         });
-    //     };
-    //
-    //     // 搜索框回车
-    //     $scope.onSearch = function () {
-    //         $scope.searchStatus = true;
-    //         $scope.tableParams.page(1);
-    //         $scope.tableParams.reload();
-    //     };
-    //
-    // }]);
-
     /**
      * 新消息提醒（调用公共服务接口）  -2018-01-22 19:36:50
      * @author dongbw
@@ -1589,33 +1458,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
     app.controller('AuthCtrl', ['$scope', '$window', 'AuthenticationService', 'toaster', 'BaseService', '$modal', function ($scope, $window, AuthenticationService, toaster, BaseService, $modal) {
         $scope.isAuthed = AuthenticationService.isAuthed();		//AuthenticationService模块在common/下
-
-        //手机号码格式验证
-//		var checkTel = function(data){
-//			var userTel = data.userTel;
-//			$scope.checkResult = false;
-//			var telephone = /^1[3|4|5|7|8]\d{9}$/;
-//			if(!(telephone).test(userTel)){
-//				var modalInstance = $modal.open({
-//					animation: true,
-//					templateUrl: 'static/tpl/index/account/checkTel.html',
-//					controller: 'CheckTelCtrl',
-//					backdrop: 'static',
-//					keyboard: false,
-//					resolve: {
-//						user: function(){
-//							return data;
-//						},
-//					}
-//				});
-//				modalInstance.result.then(function(){
-//				}, function(){
-//
-//				});
-//			} else {
-//				$scope.checkResult = true;
-//			}
-//		};
         AuthenticationService.getAuthentication().success(function (data) {
             if (data.enterprises) {
                 data.enterprise = data.enterprises[data.enterprises.length - 1];
@@ -1635,8 +1477,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.isAuthed = false;
                 AuthenticationService.redirectSignin();
             } else {
-                //跳转到手机号码验证
-//				checkTel($scope.userInfo);
             }
         });
 
@@ -2118,20 +1958,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.dateTime = new Date();
         $scope.time = new Date().getTime();
     }]);
-    app.controller('TenderCtrl', ['$scope', 'SnapshotService', function ($scope, SnapshotService) {
-        // SnapshotService.getTender(250, function(data){
-        //     $scope.tenders = data;
-        //     var newDate = new Date();
-        //     newDate = newDate.setDate(newDate.getDate() - 3);
-        //     angular.forEach($scope.tenders, function(tender) {
-        //         if (tender.date > newDate) {
-        //             tender.isNew = true;
-        //         } else {
-        //             tender.isNew = false;
-        //         }
-        //     });
-        // });
 
+    app.controller('TenderCtrl', ['$scope', 'SnapshotService', function ($scope, SnapshotService) {
         SnapshotService.getOpenTender(5, function (data) {
             $scope.openTenders = data;
             var newDate = new Date();
@@ -3211,12 +3039,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         };
 
-//		// 采购单
-//		$scope.print = function(order) {
-//			PurcOrder.printCount({id: order.id},{});//增加打印此次
-//			ReportService.print(order.enUU, 'PURCLIST', "where purc$orders.pu_id=" + order.id);
-//		};
-
         //设置为已查看
         $scope.setDisplay = function (state, orderId) {
             if (orderId) {//设置单个
@@ -6475,22 +6297,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 保存并确认报价
         $scope.onReplyClick = function (mould, withSteps) {
             $scope.loading = true;
-////			var file = mould.attachFile.$viewValue, file = file && file.length > 0 ? file[0] : null;
-//			var file = mould.attachs[0];
-//			$scope.mould  = mould;
-//			$upload.upload({
-//				url: 'sale/mould/' + mould.id + '/send',
-//				method: 'POST',
-//				file: file,
-//				data: {
-//					json: $scope.mould
-//				}
-//			}).success(function(res){
-//				console.log("success");
-//				console.log(res);
-//			}).error(function(res){
-//				console.log("failure");
-//			});
 
             if (withSteps) {
                 PurcInquiryMould.reply({id: mould.id}, mould, function () {
@@ -6720,21 +6526,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         $scope.onReplyClick = function (mould, withSteps) {
             $scope.loading = true;
-//			var file = mould.attachs[0];
-//			$scope.mould  = mould;
-//			$upload.upload({
-//				url: 'sale/mould/' + mould.id + '/send',
-//				method: 'POST',
-//				file: file,
-//				data: {
-//					json: $scope.mould
-//				}
-//			}).success(function(res){
-//
-//			}).error(function(res){
-//				console.log(res);
-//			});
-
             if (withSteps) {
                 PurcInquiryMould.reply({id: mould.id}, mould, function () {
                     $scope.loading = false;
@@ -6763,7 +6554,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
     }]);
 
-
     // 主动报价 - 列表
     app.controller('SaleQuotationListCtrl', ['$scope', '$filter', 'Quotation', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', '$rootScope', 'QuotationInfo', 'CurrentRole', function ($scope, $filter, Quotation, PurcInquiry, ngTableParams, toaster, BaseService, $rootScope, QuotationInfo, CurrentRole) {
         BaseService.scrollBackToTop();
@@ -9736,19 +9526,11 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $scope.haveSelected = false;
                     window.location.href = '#/fa/apBillOut';
                     toaster.pop('success', '提示', '提交成功');
-                }else {
-                    /*$scope.haveSource = true;
-                     loadData();
-                     toaster.pop('error', '提示', '单据被反过账，请立即作废本单据');
-                     $scope.haveSelected = true;*/
-
+                } else {
                     $scope.loading = false;
                     toaster.pop('error', '提示', data.error);
                 }
-            }/*,function(){
-             $scope.loading = false;
-             toaster.pop('error', '提示', '更新已转数失败');
-             }*/);
+            })
         }
 
         //删除开票单(后台同时更新对账单明细表已开票数)
@@ -10050,25 +9832,22 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
 
                     //必须是相同币别才能生成对账单，否则提示错误
-                    if($scope.apBillOut.currency == ''){
+                    if ($scope.apBillOut.currency == '') {
                         $scope.apBillOut.currency = checkItem.apCheck.currency;
-                    }else if($scope.apBillOut.currency !== checkItem.apCheck.currency){
+                    } else if ($scope.apBillOut.currency !== checkItem.apCheck.currency) {
                         $scope.sameCust = false;
                         $scope.loading = false;
                         toaster.pop('error', '请选择同一种币别');
                     }
 
                     //本次对账数量必须小于总对账数量
-                    if(checkItem.checkQty > 0){
-                        //$scope.data.maxThisCheckQty = checkItem.CheckQty - checkItem.billed;
-                        //$scope.data.minThisCheckQty = 0;
-                        //if(checkItem.qty - (checkItem.yCheckQty || 0) < checkItem.CheckQty  || checkItem.CheckQty < 0 || checkItem.CheckQty == 0){
-                        if(checkItem.minThisBilledQty >checkItem.thisBilledQty || checkItem.maxThisBilledQty <checkItem.thisBilledQty) {
+                    if (checkItem.checkQty > 0) {
+                        if (checkItem.minThisBilledQty >checkItem.thisBilledQty || checkItem.maxThisBilledQty <checkItem.thisBilledQty) {
                             $scope.validQty = false;
                             $scope.loading = false;
                             toaster.pop('error','本次开票数量,填写有误!');
                         }
-                    }else if(check.qty < 0){
+                    } else if (check.qty < 0) {
                         $scope.data.maxCheckQty = 0;
                         $scope.data.minCheckQty = check.qty;
                         if(((-check.qty)-(-check.yCheckQty) < (-check.CheckQty)) || check.CheckQty > 0 || check.CheckQty == 0){
@@ -10094,27 +9873,12 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
 
                     //应收开票单明细行数据
-                    //$scope.item.orderCode = check.orderCode;
-                    //$scope.item.orderClass = check.piClass;
-                    //$scope.item.orderDetno = check.orderDetno;
                     $scope.item.price = checkItem.price;
-                    //$scope.item.price = check.orderPrice;
-                    //$scope.item.NowQty = check.checkQty;
-                    //$scope.item.amount = (check.CheckQty || 0)*(check.orderPrice || 0);
                     $scope.item.sourceId = checkItem.id;
                     $scope.item.sourceTable = 'PURC$APCHECKITEM';//瑕疵
                     $scope.item.NowQty = checkItem.thisBilledQty;
-                    //$scope.item.oldYCheckQty = check.yCheckQty;
                     $scope.item.prodCode = checkItem.prodCode;
-                    //$scope.item.prodTitle = check.prodTitle;
-                    ////$scope.item.prodSpec = check.prodSpec;
-                    //$scope.item.inoutno = check.inOutNo;
-                    //$scope.item.inoutnodetno = check.detno;
                     $scope.item.taxrate = checkItem.taxrate;
-                    //$scope.item.receiveCode = check.receiveCode;
-                    //$scope.item.receiveName = check.receiveName;
-                    //$scope.item.sendcode = check.sendcode;
-                    //$scope.item.whname = check.whname;
 
                     //来源表相关信息
                     $scope.sourceInfo.sourceId = checkItem.id;
@@ -10147,7 +9911,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         }
     }]);
 
-
     /**
      * 客户应付发票
      */
@@ -10647,7 +10410,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             loadData();
         }
 
-
         $scope.haveSource = false;
         //提交应收对账单
         $scope.submitApCheck = function () {
@@ -11106,21 +10868,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('error', '提示', response.data);
             });
         });
-        /*AccountEnterprise.growth({}, function (data) {
-            if (data != null && data.length > 0) {
-                var growth = [], years = [];
-                angular.forEach(data, function (d) {
-                    var date = new Date(d.date), year = date.getFullYear();
-                    d.date = (date.getMonth() + 1) + '月' + (date.getDate()) + '日';
-                    if (years.indexOf(year) == -1) {
-                        years.push(year);
-                        growth.push({year: year});
-                    }
-                    growth.push(d);
-                });
-                $scope.growth = growth;
-            }
-        });*/
 
         // 更新企业信息
         $scope.updateDetailInfo = function () {
@@ -11621,20 +11368,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             AccountUser.getUpdatePasswordUrl({}, function (data) {
                 newPage.location.href = data.url;
             });
-            // var modalInstance = $modal.open({
-            //     animation: true,
-            //     templateUrl: 'updatePassword.html',
-            //     controller: 'PasswordCtrl',
-            //     resolve: {
-            //         user: function () {
-            //             return $scope.user;
-            //         }
-            //     }
-            // });
-            //
-            // modalInstance.result.then(function () {
-            // }, function () {
-            // });
         };
 
         $scope.updateDetail = function () {
@@ -11858,81 +11591,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.cancel = function () {
             $modalInstance.close();
         }
-        /*$scope.loading = false;
-         $scope.btnState = false;
-         $scope.clicks = 0;
-         var storage = window.localStorage;
-         //手机验证码定时器
-         $scope.msgInfoError = false;
-         var setBtnTimeDown = function(value) {
-         if(value > 0) {
-         $scope.btnState = true;
-         $timeout(function() {
-         $scope.$apply(function(){
-         storage.setItem("btnTimes", $scope.btnTimes);
-         $scope.btnTimes --;
-         value --;
-         setBtnTimeDown (value);
-         });
-         }, 500);
-         }else{
-         $scope.btnState = false;
-         }
-         };
-         if(storage.btnTimes > 1){
-         $scope.btnTimes = storage.btnTimes;
-         setBtnTimeDown(storage.btnTimes)
-         }else{
-         storage.removeItem("btnTimes");
-         }
-         $scope.updateTel = function(phoneCode, userTel, uu){
-         $scope.loading = true;
-         $scope.msgInfoError = false;
-         $scope.result = false;
-         //更新联系方式
-         AccountUser.updateWithCode({code: phoneCode, tel : userTel, uu: uu},{}, function(data){
-         $scope.loading = false;
-         $scope.msgInfoError2 = false;
-         $scope.result = true;
-         AuthenticationService.getAuthentication().success(function(data) {
-         $timeout(function(){
-         $modalInstance.dismiss();
-         window.location.reload();
-         }, 1000);
-         }).error(function(response) {
-
-         });
-         }, function(response){
-         $scope.loading = false;
-         $scope.msgInfoError2 = response;
-         });
-         };
-         //获取验证码
-         $scope.getPhoneCode = function(userTel){
-         var timeInfo = 10;
-         $scope.clicks ++;
-         $scope.timeInfo = timeInfo;
-         if($scope.clicks >= 5){
-         $scope.errorloading = true;
-         $scope.msgInfoSuccess = false;
-         $scope.msgInfoError = false;
-         }else{
-         $scope.loading = true;
-         SendCheckMsg.sendMsgInfos({userTel: userTel},function(data){
-         $scope.loading = false;
-         $scope.msgInfoSuccess = data.success;
-         $scope.sendMsg = data;
-         $scope.btnTimes = 60;
-         setBtnTimeDown($scope.btnTimes);
-         $scope.msgInfoError = false;
-         },function(response){
-         $scope.loading = false;
-         $scope.msgInfoError = false;
-         $scope.sendCheckMsg = false;
-         $scope.msgInfoSuccess = true;
-         });
-         }
-         };	*/
     }]);
     app.controller('RemoveVendorCtrl', ['$scope', '$modalInstance', 'user', 'AccountUser', 'toaster', function ($scope, $modalInstance, user, AccountUser, toaster) {
         $scope.checkboxes = {
@@ -12005,17 +11663,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         AccountUser.findVendor({uu: user.userUU}, function (data) {
             $scope.enters = data;
             $scope.loading = false;
-//			angular.forEach($scope.enters, function(item) {
-//				if(item.distribute) {
-//					item:{
-//						$selected:false;
-//					}
-//				} else {
-//					item:{
-//						$selected:true;
-//					}
-//				}
-//			});
         })
         // 点击勾选全部的复选框
         $scope.checkAll = function () {
@@ -12039,9 +11686,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (save) {
                 if (user.userUU) {
                     angular.forEach($scope.enters, function (item, i) {
-//						if(item.distribute) {
                         chooseResult.push(item);
-//						}
                     });
                     if (chooseResult.length > 0) {
                         $scope.loading = true;
@@ -17015,18 +16660,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             };
             item.useruu = data.useruu;
             item.username = data.username;
-//			if($scope.AppFlow.appNodes.length != 0){
-//				for(var i = 0;i < $scope.AppFlow.appNodes.length; i++) {
-//					if($scope.AppFlow.appNodes[i] == item.useruu) {
-//						toaster.pop('info', '提示', '不能重复添加');
-//					} else {
-//						$scope.AppFlow.appNodes.push(item);
-//					}
-//				}
-//			} else {
             $scope.AppFlow.appNodes.push(item);
-//			}
-
         }
 
         $scope.SelectRole = function (data) {// 添加职位
@@ -17060,7 +16694,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
     }]);
 
-
     /***
      * 代采定单
      */
@@ -17168,10 +16801,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.print = function (deputyOrder) {
             DeputyOrder.printCount({id: deputyOrder.id}, {});//增加打印此次
             $scope.tableParams.reload();
-            // ReportService.print(deputyOrder.deputyuu, 'PURCNOTICE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 定向采购通知
-            // ReportService.print(deputyOrder.deputyuu, 'PURCHASE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 采购订单
-            // ReportService.print(deputyOrder.deputyuu, 'PAYCONFIRM', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 付款确认
-            // ReportService.print(deputyOrder.deputyuu, 'TRADECONTRACT', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 买卖合同
             ReportService.print(deputyOrder.deputyuu, 'PURCNOTICE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 定向采购通知
             ReportService.print(deputyOrder.deputyuu, 'PURCHASE', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 采购订单
             ReportService.print(deputyOrder.deputyuu, 'PAYCONFIRM', "where purc$deputyorders.deo_id=" + deputyOrder.id); // 付款确认
@@ -18432,7 +18061,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             return new Date();
         };
 
-
         // 选择查找日期
         $scope.onDateCondition = function () {
             $scope.tableParams.page(1);
@@ -18601,41 +18229,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         };
 
-        // // 获取产品类目联想词
-        // $scope.getSimilarKinds = function(value) {
-        //     if (value) {
-        //         // getSimilarLeafKinds  根据类目名获取末级联想词
-        //         // 获取类目联想词
-        //         return Search.getSimilarKinds({keyword : value}).$promise.then(function(data) {
-        //             return data.map(function(item) {
-        //                 return item;
-        //             })
-        //         });
-        //     }
-        // };
-
-        // // 点击联想词获取类目信息
-        // $scope.onAssociateKindClick = function(kind, submit) {
-        //     KindAPI.getParents({childId : kind.id}, {}, function(data) {
-        //         $scope.actives = data;
-        //         var size = data.length;
-        //         if (size > 0) {
-        //             submit.gradeOneKiName = $scope.actives[0].nameCn;
-        //             submit.kiName = submit.gradeOneKiName;
-        //             if (size > 1) {
-        //                 submit.gradeTwoKiName = $scope.actives[1].nameCn;
-        //                 submit.kiName = submit.gradeTwoKiName;
-        //                 if (kind.level < 3) {
-        //                     submit.gradeThreeKiName = null;
-        //                 } else if (size > 2) {
-        //                     submit.gradeThreeKiName = $scope.actives[2].nameCn;
-        //                     submit.kiName = submit.gradeThreeKiName;
-        //                 }
-        //             }
-        //         }
-        //     })
-        // };
-
         // 选择类目
         $scope.selectKind = function (prod) {
             var submit = [];
@@ -18672,36 +18265,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         };
 
-        // // 验证分类信息
-        // $scope.checkKind = function() {
-        //     setTimeout(function() {
-        //         if($scope.activesString == null) {
-        //             $scope.component.kindid = null;
-        //             return;
-        //         }
-        //         KindAPI.getKindByName({name : encodeURIComponent($scope.activesString)}, function(kind) {
-        //             $scope.component.kind = kind;
-        //             $scope.component.kindid = kind.id;
-        //             $scope.activesString = $scope.component.kind.nameCn;
-        //             KindAPI.getPropertiesValues({kindId: $scope.component.kindid}, function(data) {
-        //                 $scope.kindProperties = data;
-        //                 angular.forEach($scope.kindProperties, function(kp) {
-        //                     angular.forEach($scope.component.properties, function(pro) {
-        //                         if (pro.value && (kp.propertyId == pro.propertyid)) {
-        //                             kp.value = pro.value;
-        //                         }
-        //                     });
-        //                 });
-        //             }, function(response) {
-        //             });
-        //         }, function (response) {
-        //             $scope.component.kindid = null;
-        //             toaster.pop('error', response.data);
-        //         });
-        //     }, 500);
-        // };
-
-
         // 点击联想词获取品牌信息
         $scope.onAssociateBrandClick = function (brand, prod) {
             if (brand instanceof String) {
@@ -18727,20 +18290,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         };
 
-        // // 验证品牌是否正确
-        // $scope.checkBrand = function () {
-        //     setTimeout(function () {
-        //         BrandActiveAPI.findByName({name : encodeURIComponent($scope.component.brand.nameCn)}, function (data) {
-        //             // $scope.component.brand = brand;
-        //             // $scope.component.brandid = brand.id;
-        //         }, function (response) {
-        //             // $scope.component.brandid = null;
-        //             toaster.pop('error', response.data);
-        //         })
-        //     } , 500);
-        // };
-
-
         // 点击联想词获取器件信息 带入产品分类和品牌
         $scope.onAssociateCmpClick = function (cmp, prod) {
             ComponentActiveAPI.get({uuid: cmp.uuid}, {}, function (data) {
@@ -18888,13 +18437,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             }
         };
 
-        // $scope.validateNumber = function (value) { // 采购数量 正整数
-        //     var regex = /^\+?[1-9][0-9]*$/;
-        //     if (!regex.test(value) || value === 0 || value === null) {
-        //         toaster.pop('warning', '警告', '采购数量不合法，请重新填写');
-        //     }
-        // };
-
         // 查找供应商
         $scope.dbfindVendor = function () {
             var modalInstance = $modal.open({
@@ -19434,11 +18976,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 改变排序顺序
         $scope.changeOrder = function (type) {
             $scope.orderType = type;
-            // if(!$scope.dir || $scope.dir === '') {
-            //     $scope.dir = '-';
-            // }else {
-            //     $scope.dir = '';
-            // }
         };
 
         $scope.submit = function (tender) {
@@ -19469,7 +19006,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
     }]);
 
-
     /**
      *  客户招标
      *
@@ -19659,7 +19195,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             return new Date();
         };
 
-
         // 选择查找日期
         $scope.onDateCondition = function () {
             $scope.tableParams.page(1);
@@ -19817,7 +19352,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 return new Date();
             };
 
-
             // 选择查找日期
             $scope.onDateCondition = function () {
                 $scope.tableParams.page(1);
@@ -20183,15 +19717,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.tableParams.page(1);
             $scope.tableParams.reload();
         };
-        // $scope.setActive = function(state) {
-        //     if($scope.active != state) {
-        //         $scope.active = state;
-        //         if($scope.tableParams.page() == 1)
-        //             $scope.tableParams.reload();
-        //         else
-        //             $scope.tableParams.page(1);
-        //     }
-        // };
 
         var getOpenState = function (active) {
             var fn = 'getOpenAll';
@@ -20254,25 +19779,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             window.location.hash = '#/baseInfo/openTenderDetail/' + id;
         };
 
-        // var stautsItem = [];
-        // $scope.getTenderStatus = function (tender) {
-        //     angular.forEach(tender.purchaseTenderItems, function(thisItem){
-        //         if ($scope.currentEn.uu == thisItem.enterpriseBaseInfo.uu) {
-        //             stautsItem = thisItem;
-        //         }
-        //     });
-        //     if (!stautsItem.price) {
-        //         return "daitoubiao";
-        //     } else if (!stautsItem.applystatus) {
-        //         return "yitoubiao";
-        //     } else if (stautsItem.applystatus == 1) {
-        //         return "zhongbiao";
-        //     } else if (stautsItem.applystatus == 0) {
-        //         return "weizhongbiao";
-        //     }
-        // };
-
-
         // 搜索框回车
         $scope.onSearch = function () {
             $scope.tableParams.page(1);
@@ -20342,26 +19848,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         };
 
-        // // 提问记录
-        // $scope.showQuestionHistory = function (){
-        //     var modalInstance = $modal.open({
-        //         animation: true,
-        //         templateUrl: 'static/tpl/index/sale/tender_question_history.html',
-        //         controller: 'saleTenderQuestionHistoryCtrl',
-        //         size: 'lg',
-        //         resolve: {
-        //             saleTender: function () {
-        //                 return $scope.saleTender;
-        //             }	//传递当前投标单到模态框Controller
-        //         }
-        //     });
-        //     modalInstance.result.then(function () {
-        //
-        //     }, function () {
-        //
-        //     });
-        // };
-
         $scope.upload = function (myFile) {  // 上传附件
             var file = $scope.myFile, file = file && file.length > 0 ? file : null;
             $upload.upload({
@@ -20470,12 +19956,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             PurcTender.reply({}, saleTender, function (data) {
                 $scope.loading = false;
                 toaster.pop('info', '成功', '投标成功');
-                // $window.location.reload();
-                // if (tender.ifOpen) { // 根据是否公开，选择跳转
-                //     window.location.hash = '#/sale/opentender';
-                // } else {
                 window.location.hash = '#/sale/tender';
-                // }
             }, function (response) {
                 $scope.loading = false;
                 toaster.pop('error', '投标失败', response.data);
@@ -20540,19 +20021,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
     }]);
 
-    // /**
-    //  * 当前投标单提问记录
-    //  */
-    // app.controller('saleTenderQuestionHistoryCtrl', ['$scope', 'saleTender','$modalInstance', 'toaster', function($scope, saleTender, $modalInstance, toaster){
-    //     $scope.saleTender = saleTender;
-    //
-    //
-    //     $scope.cancel = function() {
-    //         $modalInstance.dismiss();
-    //     };
-    //
-    // }]);
-
     /**
      * 公开招标转投标单
      */
@@ -20577,8 +20045,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 data.$editing = false;
                 $scope.tender = data;
                 $scope.tenderProd = data.purchaseTenderProds;
-                // parseCertificate($scope.tender.certificate);
-                // $scope.firstProd = data.purchaseTenderProds[0];
 
                 $scope.currentHasBid = false; // 默认当前企业未转投标单
                 angular.forEach(data.purchaseTenderProds[0].saleTenderItems, function (item) {
@@ -20586,7 +20052,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         $scope.currentHasBid = true;
                     }
                 });
-                // $rootScope.tenderVendor = $scope.tenderProd.enterpriseBaseInfo;
                 $scope.loading = false;
 
                 $scope.attaches = $scope.tender.tenderAttaches;
@@ -20600,158 +20065,14 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.iWantToBid = function (id) {
             $scope.hasClick = true;
             PurcTender.addItems({id: id}, {}, function (data) { // 添加明细
-                // $scope.tender = data;
-                // angular.forEach(data.purchaseTenderProds, function(tenderProd) {
-                //     angular.forEach(tenderProd.saleTenderItems, function(saleTenderItem) {
-                //         if (!$scope.currentEn) {
-                //             AccountEnterprise.get({}, function(data){
-                //                 $scope.currentEn = data;
-                //             });
-                //         }
-                //         if (saleTenderItem.saleTender.vendUU === $scope.currentEn.uu) {
-                //             tenderProd.currentItem = saleTenderItem;
-                //             $scope.saleTender = saleTenderItem.saleTender;
-                //             $scope.attaches = saleTenderItem.saleTender.bidAttaches;
-                //             $scope.currentEnBaseInfo = saleTenderItem.saleTender.enterpriseBaseInfo;
-                //         }
-                //     });
-                // });
                 toaster.pop('success', '成功', '转投标单成功');
                 window.location.hash = "#/sale/tender/" + id;
             }, function (response) {
                 toaster.pop('error', '操作失败', response.data);
             });
 
-            // $scope.upload = function(myFile) {  // 上传附件
-            //     var file = $scope.myFile, file = file && file.length > 0 ? file : null;
-            //     $upload.upload({
-            //         url: 'tender/addTenderItemAttach',
-            //         file: file,
-            //         method: 'POST'
-            //     }).success(function (attach) {
-            //         $scope.attaches.push(attach);
-            //     });
-            // };
         };
 
-
-        // $scope.removeAttach = function(id, index) {
-        //     $scope.attaches.splice(index, 1);
-        //     PurcTender.removeAttach({attachId:id}, function() {
-        //
-        //     });
-        // };
-
-        // var taxrateYes = false;
-        // var cycleYes = false;
-        // var priceYes = false;
-        // $scope.canSave = false;
-        // $scope.validateThis = function(value, type) {
-        //     switch(type) {
-        //         case 'taxrate':
-        //             var regex = /^\+?[0-9][0-9]{0,1}$/;
-        //             if (regex.test(value)) {
-        //                 taxrateYes = true;
-        //             } else {
-        //                 toaster.pop('warning', '警告', '税率不合法，请重新填写');
-        //             }
-        //             break;
-        //         case 'cycle':
-        //             regex = /^\+?[1-9][0-9]*$/;
-        //             if (regex.test(value)) {
-        //                 cycleYes = true;
-        //             } else {
-        //                 toaster.pop('warning', '警告', '周期不合法，请重新填写');
-        //             }
-        //             break;
-        //         case 'price':
-        //             regex = /^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/;
-        //             if (regex.test(value) && value !== 0) {
-        //                 priceYes = true;
-        //             } else {
-        //                 if (!(value instanceof Number) || value) {
-        //                     toaster.pop('warning', '警告', '单价不合法，请重新填写');
-        //                 }
-        //             }
-        //             break;
-        //     }
-        // };
-        //
-        // $scope.emNumYes = true;
-        //
-        // $scope.validEmNum = function (value) {
-        //     var regex = /^\+?[1-9][0-9]*$/;
-        //     if (!regex.test(value) || value == 0 || value !== null) {
-        //         $scope.emNumYes = false;
-        //         toaster.pop('warning', '警告', '人数不合法，请重新填写');
-        //     }
-        // };
-        //
-        // $scope.validateProds = function(tenderProd) {
-        //     // angular.forEach(tenderProds, function (tenderProd) {
-        //     var cycleRegex = /^\+?[1-9][0-9]*$/;
-        //     var taxrateRegex = /^\+?[0-9][0-9]{0,1}$/;
-        //     var priceRegex = /^(([0-9]+\.[0-9]{1,6})|([0-9]*[1-9][0-9]*\.[0-9]{1,6})|([0-9]*[1-9][0-9]*))$/; // 非零最多六位小数正实数
-        //     // /^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/;
-        //     // 判断填写过的有为0或不符合正则式的，设置不能保存
-        //     if (tenderProd.currentItem.cycle !== null && (!cycleRegex.test(tenderProd.currentItem.cycle)) || (tenderProd.currentItem.taxrate !== null && !taxrateRegex.test(tenderProd.currentItem.taxrate)) || (tenderProd.currentItem.price !==null && (!priceRegex.test(tenderProd.currentItem.price) && tenderProd.currentItem.price !== 0))) {
-        //         $scope.canSave = false;
-        //     } else {
-        //         $scope.canSave = true;
-        //     }
-        //     // });
-        // };
-        //
-        // // 投标
-        // $scope.bidIt = function(tender, currentEnBaseInfo){
-        //     $scope.loading = true;
-        //     if(currentEnBaseInfo.enEstablishDate instanceof Date) {
-        //         currentEnBaseInfo.enEstablishDate = currentEnBaseInfo.enEstablishDate.getTime();
-        //     }
-        //     var saleTenderItems = [];
-        //     if (tender.ifOpen !== 1) { // 指定投标不把投标单主表设空会报header超长
-        //         angular.forEach(tender.purchaseTenderProds, function(tenderProd) {
-        //             if (tenderProd.currentItem) {
-        //                 tenderProd.currentItem.saleTender = {};
-        //                 saleTenderItems.push(tenderProd.currentItem);
-        //             }
-        //         });
-        //     } else {
-        //         angular.forEach(tender.purchaseTenderProds, function(tenderProd) {
-        //             if (tenderProd.currentItem) {
-        //                 saleTenderItems.push(tenderProd.currentItem);
-        //             }
-        //         });
-        //     }
-        //     PurcTender.reply({tenderItems: saleTenderItems, enBaseInfo: currentEnBaseInfo, attaches:$scope.attaches}, {}, function(data){
-        //         $scope.loading = false;
-        //         toaster.pop('info', '成功', '投标成功');
-        //         // $window.location.reload();
-        //         // if (tender.ifOpen) { // 根据是否公开，选择跳转
-        //         //     window.location.hash = '#/sale/opentender';
-        //         // } else {
-        //             window.location.hash = '#/sale/tender';
-        //         // }
-        //     }, function(response){
-        //         $scope.loading = false;
-        //         toaster.pop('error', '投标失败', '出现异常，投标失败');
-        //     });
-        //
-        // };
-        //
-        // $scope.condition = {
-        //     $fromOpened:false
-        // };
-        //
-        // $scope.getMaxDate = function() {
-        //     return $filter('date')(new Date(), 'yyyy-MM-dd');
-        // };
-        //
-        // $scope.openDatePicker = function($event, item, openParam) {
-        //     $event.preventDefault();
-        //     $event.stopPropagation();
-        //     item[openParam] = !item[openParam];
-        // };
     }]);
 
     // 基础资料客户详情