投标附件存储错误修改

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

src/main/java/com/uas/platform/b2b/service/impl/PurchaseTenderServiceImpl.java

@@ -508,7 +508,8 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     @Override
     public void reply(List<SaleTenderItem> tenderItems, EnterpriseBaseInfo enBaseInfo, List<Attach> attaches) {
         enterpriseBaseInfoDao.save(enBaseInfo);
-        SaleTender saleTender = saleTenderDao.findOne(tenderItems.get(0).getSaleTender().getId());
+        SaleTenderItem item = saleTenderItemDao.findOne(tenderItems.get(0).getId());
+        SaleTender saleTender = item.getSaleTender();
         saleTender.setStatus("已投标");
         Set<Attach> attachSet = new HashSet<>();
         if (!CollectionUtils.isEmpty(attaches)) {
@@ -526,6 +527,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
             saleTenderItem.setCycle(tenderItem.getCycle());
             saleTenderItemDao.save(saleTenderItem);
         }
+
     }
 
 //    /**

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

@@ -10981,6 +10981,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 }
                 $scope.tender.tenderAttaches = $scope.attaches;
                 $scope.tender.shipAddress = $scope.tender.shipAdd.address + $scope.tender.shipAdd.addressdet + ' ' + $scope.tender.shipAdd.receiver + ' ' + $scope.tender.shipAdd.usertel;
+                console.log($scope.tender.shipAddress);
                 if (isPublish) { // 发布
                     toaster.pop('info', '提示', '正在发布，请稍候');
                     PurcTender.publish({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data){

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

@@ -298,7 +298,7 @@
                                     <span>单位</span>
                                     <span>采购数量</span>
                                     <span>采购周期</span>
-                                    <span>税率</span>
+                                    <span>税率（%）</span>
                                     <span>单价</span>
                                     <span>含税金额</span>
                                     <span ng-show = "bid.result == 1">评标结果</span>