首页显示招标单据问题修改。

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

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

@@ -592,7 +592,7 @@ public class PurchaseTenderController {
     public List<PurchaseTender> getLatestTender(PageParams params) {
         PageInfo info = new PageInfo(params);
         info.sorting("date", Direction.DESC); // 按发布日期倒序
-        return purchaseTenderService.findAllByPageInfo(info);
+        return purchaseTenderService.findAll();
     }
 
     /**

src/main/java/com/uas/platform/b2b/service/PurchaseTenderService.java

@@ -1,7 +1,6 @@
 package com.uas.platform.b2b.service;
 
 import com.uas.platform.b2b.model.*;
-import com.uas.platform.core.model.PageInfo;
 import org.apache.poi.ss.usermodel.Workbook;
 import org.springframework.ui.ModelMap;
 
@@ -99,7 +98,7 @@ public interface PurchaseTenderService {
      *
      * @return
      */
-    List<PurchaseTender> findAllByPageInfo(PageInfo info);
+    List<PurchaseTender> findAll();
 
     List<PurchaseTender> findOpen();
 

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

@@ -7,7 +7,6 @@ import com.uas.platform.b2b.service.PurchaseTenderService;
 import com.uas.platform.b2b.support.SystemSession;
 import com.uas.platform.b2b.temporary.model.PurcTenderProd;
 import com.uas.platform.core.model.Constant;
-import com.uas.platform.core.model.PageInfo;
 import org.apache.poi.ss.usermodel.Cell;
 import org.apache.poi.ss.usermodel.Row;
 import org.apache.poi.ss.usermodel.Sheet;
@@ -161,7 +160,7 @@ public class PurchaseTenderServiceImpl implements PurchaseTenderService {
     }
 
     @Override
-    public List<PurchaseTender> findAllByPageInfo(PageInfo info) {
+    public List<PurchaseTender> findAll() {
         List<SaleTender> saleTenders = saleTenderDao.findAll(new Specification<SaleTender>() {
             @Override
             public Predicate toPredicate(Root<SaleTender> root, CriteriaQuery<?> query, CriteriaBuilder cb) {

src/main/webapp/resources/css/index.css

@@ -2618,4 +2618,7 @@ input.ng-invalid.ng-dirty,textarea.ng-invalid.ng-dirty {
 		-o-transform:translate3d(0,0,0);
 		transform:translate3d(0,0,0)
 	}
-}
+
+}
+
+input:-webkit-autofill { box-shadow: 0 0 0 1000px white inset !important;}

src/main/webapp/resources/js/common/services.js

@@ -187,13 +187,13 @@ define(['angular', 'toaster'], function(angular) {
                 });
             },
             getTender: function(count, success) {
-                var request = $http.get(rootPath + '/tender/latestTender?page=1&count=' + count);
+                var request = $http.get(rootPath + '/tender/latestTender');
                 request.success(function(data) {
                     success.call(null, data.content);
                 });
             },
             getOpenTender: function(count, success) {
-                var request = $http.get(rootPath + '/tender/latestOpenTender?page=1&count=' + count);
+                var request = $http.get(rootPath + '/tender/latestOpenTender');
                 request.success(function(data) {
                     success.call(null, data.content);
                 });

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

@@ -10053,8 +10053,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
             }
             console.log($scope.tender.purchaseTenderProds);
             $scope.tender.tenderAttaches = $scope.attaches;
-
-            $scope.tender.shipAddress = $scope.tender.shipAddress.address + $scope.tender.shipAddress.addressdet + ' ' + $scope.tender.shipAddress.receiver + ' ' + $scope.tender.shipAddress.usertel;
+            if ($scope.tender.shipAddress.address !== null && $scope.tender.shipAddress.addressdet !== null) {
+                $scope.tender.shipAddress = $scope.tender.shipAddress.address + $scope.tender.shipAddress.addressdet + ' ' + $scope.tender.shipAddress.receiver + ' ' + $scope.tender.shipAddress.usertel;
+            }
             if (isPublish) { // 发布
                 toaster.pop('info', '提示', '正在发布，请稍候');
                 PurcTender.publish({tender: $scope.tender, enterpriseBaseInfo: $scope.tenderProd.enterpriseBaseInfo}, {},  function(data){
@@ -10082,7 +10083,7 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
 
         // 删除（在录入状态）
         $scope.deleteThis = function(id) {
-            PurcTender.deleteOne({id: $stateParams.id}, function() {
+            PurcTender.deleteOne({}, id, function() {
                 toaster.pop('info', '提示', '删除成功');
                 window.location.hash = '#/purc/tender';
             });
@@ -10589,7 +10590,9 @@ define([ 'toaster', 'charts', 'ngTable', 'common/services', 'service/Purc', 'ser
                 var taxrateRegex = /^\+?[0-9][0-9]{0,1}$/;
                 var priceRegex = /^(0|[0-9][0-9]{0,9})(\.[0-9]{1,6})?$/;
                 if (!cycleRegex.test(tenderProd.currentItem.cycle) || !taxrateRegex.test(tenderProd.currentItem.taxrate) || !priceRegex.test(tenderProd.currentItem.price)) {
-                    toaster.pop('warning', '警告', '填写内容不合法，请重新填写');
+                    if ((tenderProd.currentItem.cycle !== null && !cycleRegex.test(tenderProd.currentItem.cycle)) || (tenderProd.currentItem.taxrate !== null && !cycleRegex.test(tenderProd.currentItem.taxrate)) || (tenderProd.currentItem.price !== null && !cycleRegex.test(tenderProd.currentItem.price)) ) {
+                        toaster.pop('warning', '警告', '填写内容不合法，请重新填写');
+                    }
                     $scope.canSave = false;
                 }
             });

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

@@ -502,7 +502,7 @@
                 </div>
                 <div class="col-xs-12" style="padding: 30px;">
                     <div class="col-xs-2 pull-right btn-publish">
-                        <button class="btn" ng-click="publishSaved(tender.id)">发布</button>
+                        <button class="btn" ng-click="publishSaved(tender)">发布</button>
                     </div>
                     <div class="col-xs-2 pull-right btn-delete">
                         <button class="btn btn-danger" ng-click="deleteThis(tender.id)">删除</button>

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

@@ -460,8 +460,8 @@
                             <dl>
                                 <dt>
                                     <span>序号</span>
-                                    <span class="wid01">产品名称</span>
                                     <span class="wid01">型号</span>
+                                    <span class="wid01">产品名称</span>
                                     <span class="wid02">品牌</span>
                                     <span>单位</span>
                                     <span>采购数量</span>
@@ -470,8 +470,8 @@
                                 <div class="scroll-y">
                                     <dd ng-repeat="prod in tenderProd">
                                         <span>{{$index + 1}}</span>
-                                        <span class="wid01"><input type="text" ng-model="prod.prodTitle" placeholder="点击填入产品名称" required/></span>
                                         <span class="wid01"><input type="text"  ng-model="prod.prodCode" placeholder="点击填入型号" required/></span>
+                                        <span class="wid01"><input type="text" ng-model="prod.prodTitle" placeholder="点击填入产品名称" required/></span>
                                         <span class="wid02"><input type="text" ng-model="prod.brand" placeholder="点击填入品牌" required/></span>
                                         <span><input type="text" ng-model="prod.unit" placeholder="点击填入单位" required/></span>
                                         <span><input type="text" ng-model="prod.qty" placeholder="点击填入数量" required/></span>