Merge branch 'dev' of ssh://10.10.101.21/source/platform-b2b into authority

src/main/java/com/uas/platform/b2b/controller/PurchaseTenderController.java

@@ -259,7 +259,6 @@ public class PurchaseTenderController {
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
         pageParams.getFilters().put("pt_result", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
@@ -288,10 +287,9 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("tp_ptid", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("pt_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("pt_overdue", Constant.YES);
         pageParams.getFilters().put("pt_result", Constant.NO);
-        pageParams.getFilters().put("pt_status", "待评标");
+//        pageParams.getFilters().put("pt_status", "待评标");
         return searchService.searchPurcTenderIds(keyword, pageParams);
     }
 
@@ -320,7 +318,6 @@ public class PurchaseTenderController {
         pageParams.getFilters().put(SearchConstants.SORT_KEY, sortList);
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu());
         pageParams.getFilters().put("st_ispublish", Constant.YES);
-//        pageParams.getFilters().put("pt_ifopen", Constant.NO);
         pageParams.getFilters().put("st_overdue", Constant.NO);
         pageParams.getFilters().put("st_status", "已投标");
         return searchService.searchSaleTenderIds(keyword, pageParams);

src/main/java/com/uas/platform/b2b/dao/EnterpriseDao.java

@@ -49,7 +49,7 @@ public interface EnterpriseDao extends JpaSpecificationExecutor<Enterprise>,JpaR
 	 * @param names
 	 * @return
 	 */
-	@Query("select e.uu,e.enName from Enterprise e where e.enName IN (:names)")
+	@Query("select e.uu,e.enName,e.enBussinessCode,e.enAddress,e.enCorporation from Enterprise e where e.enName IN (:names)")
 	public List<Object[]> findByEnNames(@Param("names") List<String> names);
 
 	/**

src/main/java/com/uas/platform/b2b/model/Enterprise.java

@@ -257,6 +257,24 @@ public class Enterprise implements Serializable {
 	@Column(name = "en_tags")
 	private String tags;
 
+	/**
+	 * 联系人
+	 */
+	@Column(name = "en_contactman")
+	private String contactMan;
+
+	/**
+	 * 联系人电话
+	 */
+	@Column(name = "en_contacttel")
+	private String contactTel;
+
+	/**
+	 * 联系人email
+	 */
+	@Column(name = "en_contactemail")
+	private String contactEmail;
+
 	/**
 	 * en_info 公司简介
 	 */
@@ -707,4 +725,28 @@ public class Enterprise implements Serializable {
 	public void setTags(String tags) {
 		this.tags = tags;
 	}
+
+	public String getContactMan() {
+		return contactMan;
+	}
+
+	public void setContactMan(String contactMan) {
+		this.contactMan = contactMan;
+	}
+
+	public String getContactTel() {
+		return contactTel;
+	}
+
+	public void setContactTel(String contactTel) {
+		this.contactTel = contactTel;
+	}
+
+	public String getContactEmail() {
+		return contactEmail;
+	}
+
+	public void setContactEmail(String contactEmail) {
+		this.contactEmail = contactEmail;
+	}
 }

src/main/java/com/uas/platform/b2b/model/EnterpriseDetail.java

@@ -1,11 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import org.springframework.util.CollectionUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.util.CollectionUtils;
-
 
 /**
  * 企业信息明细对外查询接口的模型
@@ -22,6 +22,8 @@ public class EnterpriseDetail {
 	private String management; //经营模式
 	private String products;  //主营产品
 	private String infos;
+	private String businessCode; // 营业执照
+	private String corporation; // 法人代表
 	public String getName() {
 		return name;
 	}
@@ -82,6 +84,8 @@ public class EnterpriseDetail {
 		this.management=enterprise.getEnManagement();
 		this.products=enterprise.getEnProducts();
 		this.infos=enterprise.getEnInfo();
+		this.businessCode = enterprise.getEnBussinessCode();
+		this.corporation = enterprise.getEnCorporation();
 		
 	}
 

src/main/java/com/uas/platform/b2b/model/QueriableMember.java

@@ -1,11 +1,11 @@
 package com.uas.platform.b2b.model;
 
+import org.springframework.util.CollectionUtils;
+
 import java.util.ArrayList;
 import java.util.Collection;
 import java.util.List;
 
-import org.springframework.util.CollectionUtils;
-
 /**
  * 企业信息对外查询接口的模型
  * 
@@ -18,6 +18,8 @@ public class QueriableMember {
 	private String shortName;
 	private Long uu;
 	private String address;
+	private String businessCode; // 营业执照
+	private String corporation; // 法人代表
 
 	public String getName() {
 		return name;
@@ -51,15 +53,29 @@ public class QueriableMember {
 		this.address = address;
 	}
 
-	public QueriableMember() {
+    public String getBusinessCode() {
+        return businessCode;
+    }
 
-	}
+    public void setBusinessCode(String businessCode) {
+        this.businessCode = businessCode;
+    }
+
+    public String getCorporation() {
+        return corporation;
+    }
+
+    public void setCorporation(String corporation) {
+        this.corporation = corporation;
+    }
 
-	public QueriableMember(Enterprise enterprise) {
+    public QueriableMember(Enterprise enterprise) {
 		this.name = enterprise.getEnName();
 		this.shortName = enterprise.getEnShortname();
 		this.uu = enterprise.getUu();
 		this.address = enterprise.getEnAddress();
+		this.corporation = enterprise.getEnCorporation();
+		this.businessCode = enterprise.getEnBussinessCode();
 	}
 
 	public static List<EnterpriseDetail> getMembers(Collection<Enterprise> enterprises) {

src/main/java/com/uas/platform/b2b/v2/service/impl/EnterpriseServiceImpl.java

@@ -51,6 +51,11 @@ public class EnterpriseServiceImpl implements EnterpriseService {
 		enterprise.setEnType(detail.getType());
 		enterprise.setEnUrl(detail.getUrl());
 		enterprise.setLogUrl(detail.getLogoImage());
+		enterprise.setTags(detail.getTags());
+		enterprise.setProfession(detail.getProfession());
+		enterprise.setContactMan(detail.getContactMan());
+		enterprise.setContactTel(detail.getContactTel());
+		enterprise.setContactEmail(detail.getContactEmail());
 		enterprise = enterpriseDao.save(enterprise);
 
 		if (isNew) {

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

@@ -1791,7 +1791,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     app.controller('TenderCtrl', ['$scope', 'SnapshotService', function ($scope, SnapshotService) {
         // SnapshotService.getTender(250, function(data){
         //     $scope.tenders = data;
-        //     console.log(data);
         //     var newDate = new Date();
         //     newDate = newDate.setDate(newDate.getDate() - 3);
         //     angular.forEach($scope.tenders, function(tender) {
@@ -1880,7 +1879,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             AccountUser.getEnTransfer ({custUU: customer.myEnterprise.uu}, function(data) {
                 customer.enTransfer = data.result;
                 //是管理员，或者被转移了权限时
-                console.log($scope.thisUser);
                 if ($scope.enabled || customer.enTransfer) {
                     var modalInstance = $modal.open({
                         animation: true,
@@ -2318,8 +2316,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 }
             });
             $scope.transfer = transfer;
-            console.log($scope.havedone);
-            console.log($scope.transfer);
             $scope.isChanged = !angular.equals($scope.havedone, $scope.transfer);
         };
         $scope.isChanged = false;
@@ -2393,7 +2389,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                             toaster.pop('error', '保存失败', "您未选择权限转移对象");
                         } else {
                             $scope.loading = true;
-                            console.log($scope.target);
                             AccountUser.transferMyDistribute({custUU: customer.myEnterprise.uu, userUU: $scope.target.userUU}, {} ,function (data) {
                                 $scope.loading = false;
                                 toaster.pop('success', '提示', '保存成功');
@@ -2938,7 +2933,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 getService()[getState($scope.active)].call(null, BaseService.parseParams(pageParams), function (page) {
                     $scope.loading = false;
                     if (page) {
-                    	console.log(page);
                         //获取每个明细单最新回复数
                         angular.forEach(page.content, function(order){
                             angular.forEach(order.orderItems, function(item){
@@ -3450,7 +3444,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
     }]);
 
     //客户采购询价
-    app.controller('SaleInquiryCtrl', ['$scope', '$filter', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', 'PurcInquiryInfo', '$upload', '$rootScope', 'token', function ($scope, $filter, PurcInquiry, ngTableParams, toaster, BaseService, PurcInquiryInfo, $upload, $rootScope, token) {
+    app.controller('SaleInquiryCtrl', ['$scope', '$filter', 'PurcInquiry', 'ngTableParams', 'toaster', 'BaseService', 'PurcInquiryInfo', '$upload', '$rootScope', 'token', '$timeout', function ($scope, $filter, PurcInquiry, ngTableParams, toaster, BaseService, PurcInquiryInfo, $upload, $rootScope, token, $timeout) {
         BaseService.scrollBackToTop();
         if ($rootScope.active) {
             $scope.active = $rootScope.active;
@@ -3691,7 +3685,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     PurcInquiry.reply({itemId: item.id, token: $scope.token}, item, function () {
                         $scope.loading = false;
                         toaster.pop('info', '提示', '报价成功');
-                        $scope.tableParams.reload();
+                        $timeout(function () {
+                            $scope.tableParams.reload();
+                        }, 300);
                     }, function (response) {
                         $scope.loading = false;
                         toaster.pop('error', '询价失效', response.data);
@@ -3700,7 +3696,9 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     PurcInquiry.saveItem({itemId: item.id, token: $scope.token}, item, function () {
                         $scope.loading = false;
                         toaster.pop('info', '提示', '保存成功');
-                        $scope.tableParams.reload();
+                        $timeout(function () {
+                            $scope.tableParams.reload();
+                        }, 300);
                     }, function (response) {
                         $scope.loading = false;
                         toaster.pop('error', '保存失败', response.data);
@@ -3778,7 +3776,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     attach.type = attach.name.substr(attach.name.lastIndexOf('.') + 1);
                 });
                 $scope.inquiry = inquiry;
-                console.log($scope.inquiry);
             });
         };
         loadData();
@@ -4058,7 +4055,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         };
 
         $scope.removeChecked = function () {
-            console.log($scope.vendors);
             if ($scope.vendors.length > 0) {
                 $scope.vendors = [];
                 $rootScope.tenderVendor = '';
@@ -4225,7 +4221,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             modalInstance.result.then(function (data) {
                 angular.forEach(data, function (prod) {
-                    console.log(prod);
                     $scope.inquiry.inquiryItems.push(prod);
                     for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
                         if ($scope.inquiry.inquiryItems[i].prodCode == null) { // 如果没有填写就删除这行数据
@@ -4880,7 +4875,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // };
 
         $scope.nowdate = new Date().getTime() - 24 * 3600 * 1000;
-        console.log($scope.nowdate);
         var getOpenState = function (active) {
             var fn = 'getOpenAll';
             switch (active) {
@@ -4957,7 +4951,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 $scope.inquiryItem = data.inquiryItem;
                 if (data.id) {
                     $scope.id = data.id;
-                    console.log($scope.id);
                     $scope.currentHasBid = true;
                 }
             }, function (response) {
@@ -5791,7 +5784,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
         //是否不能被点击
         $scope.isDisabled = function () {
-        	console.log($scope.item);
             return $scope.item.quotation.status == 101 && $scope.item.agreed == null;
         }
 
@@ -8309,7 +8301,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         var loadData = function () {
             FaApBillOut.get({id:$stateParams.id},function (data) {
                 $scope.data = data;
-                console.log(data);
                 if($scope.data.status){
 
                 }else{
@@ -8480,7 +8471,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
                             });
                             $scope.data = data;
-                            console.log($scope.data);
                             $scope.checkboxes.checked = true;
                             $scope.getTotalMoney();
                         } else {
@@ -8508,7 +8498,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         $scope.checkAll = function () {
             $scope.totalMoney = 0;
             $scope.filteredData = $filter('filter')($scope.data, $scope.condition.prodTitle || $scope.condition.uuorname || $scope.condition.venduuorname ||  $scope.condition.prodSpec || $scope.condition.factory);
-            console.log($scope.filteredData );
             var uuorname = $scope.suuorname;
             var venduuorname = $scope.venduuorname;
             var dateFrom = $scope.condition.dateFrom;
@@ -8616,7 +8605,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 //本次开票新的开票数
                 //$scope.thisBilledQty = 0;
                 if(checkItem.$selected == true) {
-                    console.log(checkItem);
                     $scope.apBillOut.custName = checkItem.apCheck.custName;
                     $scope.apBillOut.enUu = checkItem.apCheck.enUu;
 
@@ -8694,7 +8682,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
 
                     //应收开票单明细行数据
-                    console.log(checkItem);
                     //$scope.item.orderCode = check.orderCode;
                     //$scope.item.orderClass = check.piClass;
                     //$scope.item.orderDetno = check.orderDetno;
@@ -8865,7 +8852,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         var loadData = function () {
             FaApBill.get({id: $stateParams.id}, function (data) {
                 $scope.bill = data;
-                console.log(data);
                 $scope.loading = false;
             });
         };
@@ -10409,7 +10395,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
          setBtnTimeDown($scope.btnTimes);
          $scope.msgInfoError = false;
          },function(response){
-         console.log(response);
          $scope.loading = false;
          $scope.msgInfoError = false;
          $scope.sendCheckMsg = false;
@@ -10608,7 +10593,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (save) {
                 if (user.userUU) {
                     user.roles = $scope.checked;
-                    console.log(user.roles);
                     AccountUser.update({}, user, function () {
                         toaster.pop('success', '提示', '保存成功');
                         $modalInstance.close(true);
@@ -13550,7 +13534,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // 分配权限
         $scope.addUserInfo = function (customer) {
             //TODO
-            console.log($scope.thisUser);
             if ($scope.thisUser.sys) {
                 var modalInstance = $modal.open({
                     animation: true,
@@ -15786,7 +15769,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('info', '提示', '交货时间未选择');
             } else {
                 angular.forEach($scope.deOrder.deputyOrderItems, function (orderitem, index) {
-                    console.log(orderitem);
                     if (orderitem.prodname == null) {
                         toaster.pop('info', '提示', '订单明细第' + (index + 1) + '行产品名称未填写');
                     } else if (orderitem.prodcode == null) {
@@ -16250,7 +16232,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                 toaster.pop('info', '提示', '交货时间未选择');
             } else {
                 angular.forEach($scope.deOrder.deputyOrderItems, function (orderitem, index) {
-                    console.log(orderitem);
                     if (orderitem.prodname == null) {
                         toaster.pop('info', '提示', '订单明细第' + (index + 1) + '行产品名称未填写');
                     } else if (orderitem.prodcode == null) {
@@ -16794,7 +16775,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         // $scope.onAssociateKindClick = function(kind, submit) {
         //     KindAPI.getParents({childId : kind.id}, {}, function(data) {
         //         $scope.actives = data;
-        //         console.log(data);
         //         var size = data.length;
         //         if (size > 0) {
         //             submit.gradeOneKiName = $scope.actives[0].nameCn;
@@ -16810,7 +16790,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         //                 }
         //             }
         //         }
-        //         console.log(submit);
         //     })
         // };
 
@@ -18052,7 +18031,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
      */
     app.controller('SaleVendorTenderDetailCtrl', ['$scope', '$filter', 'PurcTender', 'ngTableParams', 'toaster', 'BaseService', '$stateParams', '$modal', '$rootScope', function ($scope, $filter, PurcTender, ngTableParams, toaster, BaseService, $stateParams, $modal, $rootScope) {
         $scope.loading = true;
-        console.log($stateParams);
         PurcTender.getVendorSaleTenderDetail({tenderId: $stateParams.id, vendUU:$stateParams.vendUU}, function (data) {
             $scope.saleTender = data.saleTender;
             $scope.tender = data.tender;
@@ -18080,7 +18058,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         PurcTender.getSaleTenderDetail({tenderId: $stateParams.id}, function (data) {
             $scope.saleTender = data.saleTender;
             $scope.tender = data.tender;
-            console.log(data);
             $scope.loading = false;
         }, function (response) {
             $scope.loading = false;
@@ -18107,7 +18084,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         var priceYes = false;
         $scope.canSave = false;
         $scope.validateThis = function (value, type) {
-            if (value != "") {
+            if ("" != value) {
                 switch (type) {
                     case 'taxrate':
                         var regex = /^\+?[0-9][0-9]{0,1}$/;
@@ -18183,19 +18160,15 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             if (saleTender.enterpriseBaseInfo.enEstablishDate instanceof Date) {
                 saleTender.enterpriseBaseInfo.enEstablishDate = saleTender.enterpriseBaseInfo.enEstablishDate.getTime();
             }
-            console.log($scope.attaches);
-            console.log(saleTender.bidAttaches);
             saleTender.bidAttaches.push.apply(saleTender.bidAttaches, $scope.attaches);
-            console.log(saleTender.bidAttaches);
-            // var saleTenderItems = [];
-            // angular.forEach(tender.purchaseTenderProds, function (tenderProd) {
-            //     if (tenderProd.currentItem) {
-            //         if ("" !== tenderProd.currentItem.price && "" !== tenderProd.currentItem.taxrate && "" !== tenderProd.currentItem.cycle) {
-            //             tenderProd.currentItem.saleTender = {};
-            //             saleTenderItems.push(tenderProd.currentItem);
-            //         }
-            //     }
-            // });
+            angular.forEach(saleTender.saleTenderItems, function (item) {
+                item.tenderProd = {};
+                if ("" == item.price && "" == item.taxrate && "" == item.cycle) {
+                    item.price = 0;
+                    item.cycle = 0;
+                    item.taxrate = 0;
+                }
+            });
             PurcTender.reply({}, saleTender, function (data) {
                 $scope.loading = false;
                 toaster.pop('info', '成功', '投标成功');
@@ -18260,7 +18233,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     }
                 });
                 // $rootScope.tenderVendor = $scope.tenderProd.enterpriseBaseInfo;
-                // console.log($scope.tenderProd.enterpriseBaseInfo);
                 $scope.loading = false;
 
                 $scope.attaches = $scope.tender.tenderAttaches;
@@ -18368,7 +18340,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         //     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或不符合正则式的，设置不能保存
-        //     console.log(tenderProd.currentItem.cycle);
         //     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 {
@@ -19015,7 +18986,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
 
             modalInstance.result.then(function (data) {
                 angular.forEach(data, function (prod) {
-                    console.log(prod);
                     $scope.inquiry.inquiryItems.push(prod);
                     for (var i = 0; i < $scope.inquiry.inquiryItems.length; i++) {
                         if ($scope.inquiry.inquiryItems[i].prodCode == null) { // 如果没有填写就删除这行数据
@@ -20263,7 +20233,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
         //提交
         $scope.submit = function (prodInfo) {
             $scope.prodInfo.isPurchase = 1;
-            console.log(prodInfo);
             var file = $scope.myFiles, file = file && file.length > 0 ? file[0] : null;// 可以不传附件
             $upload.upload({
                 url: 'product/baseInfo/addNewProduct',

src/main/webapp/resources/tpl/index/sale/tenderlist.html

@@ -445,8 +445,7 @@
                 <th width="150">状态</th>
             </tr>
             </thead>
-            <tbody class="is-done" ng-repeat="tender in $data  | orderBy:'-id'"
-                   ng-show="active == 'end' || active == 'waiting'">
+            <tbody class="is-done" ng-repeat="tender in $data  | orderBy:'-id'" ng-show="active == 'end' || active == 'waiting'">
             <tr class="pro-line-sty01">
                 <td class="list-notnum" width="350">
                     <div>招标标题：{{tender.title}}</div>
@@ -482,21 +481,18 @@
                 <td>
                     <!-- 投标单状态 -->
                     <!-- 已评标 start -->
-                    <div ng-if="tender.status == '已结标' && tenderProd.currentItem.applyStatus == 1 && tenderProd.currentItem.price">
+                    <div ng-if="tender.result == 1 && tender.status == '已结标' && tenderProd.currentItem.applyStatus == 1 && tenderProd.currentItem.price">
                         <img src="static/img/tender/zhongbiao.png">
                     </div>
-                    <div ng-if="(tender.status == '已结标' && !tenderProd.currentItem.applyStatus) || tender.status == '流标' || (tender.status == '待评标' && tender.result == 1) || tender.status == '待投标'">
+                    <div ng-if="tender.result == 1 && ((tender.status == '已结标' && !tenderProd.currentItem.applyStatus) || tender.status == '流标' || (tender.status == '待评标' && tender.result == 1) || tender.status == '待投标')">
                         <!-- 报了到期没评、评了没有采纳 -->
                         <img src="static/img/tender/weizhongbiao.png">
                     </div>
                     <!-- 已评标end -->
                     <!-- 已投标start -->
-                    <div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1">
+                    <div ng-if="tender.overdue == 1 && tender.result != 1">
                         <img src="static/img/tender/daipingbiao.png">
                     </div>
-                    <!--<div ng-if="tender.status == '待评标' && tender.overdue == 1 && tender.result != 1 && !tenderProd.currentItem.price">-->
-                    <!--<img src="static/img/tender/weitoubiao.png">-->
-                    <!--</div>-->
                     <div ng-if="tender.status == '待评标' && tender.overdue != 1 && (tenderProd.currentItem.price && tenderProd.currentItem.saleTender.auditStatus != 0)">
                         <img src="static/img/tender/yitoubiao.png">
                     </div>