投标单添加isPublish字段过滤。 供应商联系人可以不选，js里赋值前判空

git-svn-id: svn+ssh://10.10.101.21/source/platform/platform-b2b@8569 f3bf4e98-0cf0-11e4-a00c-a99a8b9d557d

src/main/java/com/uas/platform/b2b/erp/controller/TenderController.java

@@ -239,6 +239,7 @@ public class TenderController {
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
         pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);
     }
@@ -266,6 +267,7 @@ public class TenderController {
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
         pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         pageParams.getFilters().put("st_status", "已结标");
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);
@@ -294,6 +296,7 @@ public class TenderController {
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
         pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         pageParams.getFilters().put("st_status", "已投标");
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);
@@ -323,6 +326,7 @@ public class TenderController {
         HashMap<String, Object> map = new HashMap<>();
         map.put("st_auditstatus", Constant.YES); // 非已提交状态
         pageParams.setNotEqualFilters(map);
+        pageParams.getFilters().put("st_ispublish", Constant.YES); // 已发布
         pageParams.getFilters().put("st_venduu", SystemSession.getUser().getEnterprise().getUu()); // 投标单属于本企业
         pageParams.getFilters().put("st_status", "待投标");
         return searchService.erpSearchSaleTenderIds(keyword, pageParams);

src/main/java/com/uas/platform/b2b/erp/model/SaleTenderErp.java

@@ -102,6 +102,12 @@ public class SaleTenderErp implements Serializable {
     @Column(name = "st_ifopen")
     private Short ifOpen;
 
+    /**
+     * 是否发布（1为发布，0为保存）
+     */
+    @Column(name = "st_ispublish")
+    private Short isPublish;
+
     /**
      * 是否含税（1含税，0不含税）
      */
@@ -274,6 +280,14 @@ public class SaleTenderErp implements Serializable {
         this.ifOpen = ifOpen;
     }
 
+    public Short getIsPublish() {
+        return isPublish;
+    }
+
+    public void setIsPublish(Short isPublish) {
+        this.isPublish = isPublish;
+    }
+
     public Short getIfTax() {
         return ifTax;
     }

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

@@ -105,6 +105,12 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
     @Column(name = "st_ifopen")
     private Short ifOpen;
 
+    /**
+     * 是否开放报名（1为发布，0为保存）
+     */
+    @Column(name = "st_ispublish")
+    private Short isPublish;
+
     /**
      * 是否含税（1含税，0不含税）
      */
@@ -183,6 +189,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setEndDate(tender.getEndDate());
         this.setEnterprise(tender.getEnterprise());
         this.setIfOpen(tender.getIfOpen());
+        this.setIsPublish(tender.getIsPublish());
         this.setIfTax(tender.getIfTax());
         this.setInvoiceType(tender.getInvoiceType());
         this.setModified(tender.getModified());
@@ -202,6 +209,7 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.setEndDate(tender.getEndDate());
         this.setEnterprise(tender.getEnterprise());
         this.setIfOpen(tender.getIfOpen());
+        this.setIsPublish(tender.getIsPublish());
         this.setIfTax(tender.getIfTax());
         this.setInvoiceType(tender.getInvoiceType());
         this.setModified(tender.getModified());
@@ -315,6 +323,14 @@ public class SaleTender implements Serializable, Comparable<SaleTender> {
         this.ifOpen = ifOpen;
     }
 
+    public Short getIsPublish() {
+        return isPublish;
+    }
+
+    public void setIsPublish(Short isPublish) {
+        this.isPublish = isPublish;
+    }
+
     public Short getIfTax() {
         return ifTax;
     }

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

@@ -12989,8 +12989,10 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                         contactTel: null
                     };
                     enInfo.vendUU = enterpriseBaseInfo.uu;
-                    enInfo.contact = enterpriseBaseInfo.contact.venduser;
-                    enInfo.contactTel = enterpriseBaseInfo.contact.tel;
+                    if (typeof enterpriseBaseInfo.contact !== 'undefined') {
+                        enInfo.contact = enterpriseBaseInfo.contact.venduser;
+                        enInfo.contactTel = enterpriseBaseInfo.contact.tel;
+                    }
                     enInfos.push(enInfo);
                 });
                 if (isPublish) { // 发布

src/main/webapp/resources/tpl/index/purc/tender.html

@@ -975,7 +975,7 @@ input[type="radio"], input[type="checkbox"] {
                         <!--</div>-->
                         <div for="enName{{$index + 1}}" style="width: 40px; float: left;">名称:</div>
                         <div class="col-xs-3">
-                            <input class="f14" ng-model="en.enName" type="text" style="width: 100%;" class="tender-input01" readonly id="enName{{$index + 1}}"
+                            <input ng-model="en.enName" type="text" style="width: 100%;" class="tender-input01 f14" readonly id="enName{{$index + 1}}"
                                    ng-required="tender.ifOpen == 0">
                         </div>
                         <div style="width: 60px; float: left;">联系人：</div>