公共询价服务-发布询价单，公共询价列表显示

src/main/java/com/uas/platform/b2c/trade/seek/model/SeekPurchase.java

@@ -143,9 +143,6 @@ public class SeekPurchase {
     @Column(name = "sp_boughtAmount")
     private Double boughtAmount;
 
-
-
-
     /**
      * Bom清单id
      */

src/main/webapp/resources/js/common/query/seekPurchase.js

@@ -7,11 +7,11 @@ define([ 'ngResource' ], function() {
         method: 'GET'
       },
       getSeekPushGoodsPageInfo: {
-        url: 'seek/offer/getSeekPushGoodsPageInfo',
+        url: 'http://10.1.51.88:8080/inquiry/public',
         method: 'GET',
       },
       saveOneSeekPurchase: {
-        url: 'seek/saveOneSeekPurchase',
+        url: 'http://10.1.51.88:8080/inquiry/buyer/save',
         method: 'POST'
       },
       saveOffer: {
@@ -19,7 +19,7 @@ define([ 'ngResource' ], function() {
         method: 'POST'
       },
       getUserSeekPageInfo: {
-        url: 'seek/getUserSeekPageInfo',
+        url: 'http://10.1.51.88:8080/inquiry/public',
         method: 'GET'
       },
       getMallGoodsList: {
@@ -32,7 +32,7 @@ define([ 'ngResource' ], function() {
         method: 'GET'
       },
       getMyOfferPageInfo: {
-        url: 'seek/offer/getMyOfferPageInfo',
+        url: 'http://10.1.51.88:8080/inquiry/public/quotation/list',
         method: 'GET'
       },
       updateSeekPurchaseStatus: {

src/main/webapp/resources/js/usercenter/controllers/forstore/seek_purchase_ctrl.js

@@ -183,7 +183,33 @@ define(['app/app'], function (app) {
           $scope.release = function () {
             // 校验
             if ($scope.checkAll()) {
-              seekPurchase.saveOneSeekPurchase($scope.applyObj,
+              var inquiry = {};
+              var inquiryItem = {};
+              inquiry.recorderUU = $scope.userInfo.userUU;
+              inquiry.enUU = $scope.userInfo.enterprise.uu;
+              inquiry.code = "MALL" + $filter('date')(new Date, 'yyyyMMddsss');
+              inquiry.date = new Date();
+              inquiry.recorder = $scope.userInfo.userName;
+              inquiry.endDate = $scope.applyObj.deadline;
+              inquiry.sourceapp = "MALL";
+              inquiry.amount = 1;
+              inquiryItem.userUU = $scope.userInfo.userUU;
+              inquiryItem.userName = $scope.userInfo.userName;
+              inquiryItem.userTel = $scope.userInfo.userTel;
+              inquiryItem.needquantity = $scope.applyObj.amount;
+              inquiryItem.inbrand = $scope.applyObj.brand;
+              inquiryItem.currency = $scope.applyObj.currency;
+              inquiryItem.cmpCode = $scope.applyObj.code;
+              inquiryItem.unitPrice = $scope.applyObj.unitPrice;
+              inquiryItem.produceDate = $scope.applyObj.produceDate;
+              inquiryItem.date = new Date();
+              inquiryItem.endDate = $scope.applyObj.deadline;
+              inquiryItem.encapsulation = $scope.applyObj.encapsulation;
+              var inquiryItems = [];
+              inquiryItems.push(inquiryItem);
+              inquiry.inquiryItems = inquiryItems;
+
+              seekPurchase.saveOneSeekPurchase(inquiry,
                   function (data) {
                     $scope.showUseFlag = false;
                     $scope.seekPurchaseTableParams.reload();
@@ -244,14 +270,16 @@ define(['app/app'], function (app) {
             total: 0,
             getData: function ($defer, params) {
               const param = BaseService.parseParams(params.url());
+              param.userUU = $scope.userInfo.userUU;
+              param.enUU = $scope.userInfo.enterprise.uu;
               // param.isMallGoods = $scope.isMallGoods;
               // param.deadline = $scope.deadline;
-              // param.keyWord = $scope.keyWord;
+              param.keyword = $scope.keyWord;
               // param.status = $scope.searchStatus;
-              // param.minReleaseDate = $scope.startDate
-              //     ? $scope.startDate.getTime() : null;
-              // param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
-              //     : null;
+              param.fromDate = $scope.startDate
+                  ? $scope.startDate.getTime() : null;
+              param.endDate = $scope.endDate ? $scope.endDate.getTime()
+                  : null;
               if ($scope.isSearch) {
                 param.page = 1;
                 params.page(1);

src/main/webapp/resources/js/vendor/controllers/forstore/purchase_offer_ctrl.js

@@ -14,17 +14,21 @@ define(['app/app'], function(app) {
 
         // 获取我的报价列表
         $scope.seekPurchaseTableParams = new ngTableParams({
-            page : 1,
-            count : 10
+          pageNumber: 1,
+          pageSize: 10
         }, {
             total : 0,
             getData : function ($defer, params) {
                 const param = BaseService.parseParams(params.url());
-                param.deadline = $scope.deadline;
-                param.status = $scope.status;
-                param.keyWord = $scope.keyWord;
-                param.minReleaseDate = $scope.startDate ? $scope.startDate.getTime() : null;
-                param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
+                filter = {};
+                filter.vendUU = $scope.userInfo.enterprise.uu;
+                param.filter = filter;
+                // param.enUU = $scope.userInfo.enterprise.uu;
+                // param.deadline = $scope.deadline;
+                // param.status = $scope.status;
+                // param.keyWord = $scope.keyWord;
+                // param.minReleaseDate = $scope.startDate ? $scope.startDate.getTime() : null;
+                // param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime() : null;
               if ($scope.isSearch) {
                 param.page = 1;
                 params.page(1);

src/main/webapp/resources/js/vendor/controllers/forstore/seek_purchase_ctrl.js

@@ -11,19 +11,19 @@ define(['app/app'], function (app) {
 
           // 获取当前卖家求购推送列表
           $scope.seekPurchaseTableParams = new ngTableParams({
-            page: 1,
-            count: 10
+            pageNumber: 1,
+            pageSize: 10
           }, {
             total: 0,
             getData: function ($defer, params) {
               const param = BaseService.parseParams(params.url());
-              param.deadline = $scope.deadline;
-              param.status = $scope.status;
-              param.keyWord = $scope.keyWord;
-              param.minReleaseDate = $scope.startDate
-                  ? $scope.startDate.getTime() : null;
-              param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
-                  : null;
+              // param.deadline = $scope.deadline;
+              // param.status = $scope.status;
+              // param.keyWord = $scope.keyWord;
+              // param.minReleaseDate = $scope.startDate
+              //     ? $scope.startDate.getTime() : null;
+              // param.maxReleaseDate = $scope.endDate ? $scope.endDate.getTime()
+              //     : null;
               if ($scope.isSearch) {
                 param.page = 1;
                 params.page(1);

src/main/webapp/resources/view/usercenter/forstore/seekPurchase.html

@@ -691,10 +691,10 @@
             </thead>
             <tbody ng-repeat="seek in seekListData.content">
             <tr class="default-row">
-                <td ng-bind="seek.releaseDate | date:'yyyy-MM-dd HH:mm:ss'"></td>
-                <td ng-bind="seek.code || '-'" title="{{seek.code}}"></td>
-                <td ng-bind="seek.brand || '-'" title="{{seek.brand}}"></td>
-                <td ng-bind="seek.amount || '-'"></td>
+                <td ng-bind="seek.date | date:'yyyy-MM-dd HH:mm:ss'"></td>
+                <td ng-bind="seek.cmpCode || '-'" title="{{seek.cmpCode}}"></td>
+                <td ng-bind="seek.inbrand || '-'" title="{{seek.inbrand}}"></td>
+                <td ng-bind="seek.needquantity || '-'"></td>
                 <td>
                     <span title="{{seek.currency + seek.unitPrice | currencyStr}}">{{seek.currency + seek.unitPrice | currencyStr}}</span>
                 </td>
@@ -702,10 +702,11 @@
                 <td ng-bind="seek.produceDate || '-'" title="{{seek.produceDate}}">2012-12-12</td>
                 <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
-                <td ng-switch="seek.status">
-                    <span ng-switch-when="200" style="color:red;">待报价</span>
-                    <span ng-switch-when="201">已报价</span>
-                    <span ng-switch-when="202" style="color:green;">已采纳</span>
+                <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
+                <td>
+                    <span ng-if="seek.offerAmount == null || seek.offerAmount == 0" style="color:red;">待报价</span>
+                    <span ng-if="seek.offerAmount > 0">已报价</span>
+                    <span ng-if="seek.agreed == 1" style="color:green;">已采纳</span>
                 </td>
                 <td class="operate-seek">
                     <span ng-if="seek.offerAmount > 0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 2)">查看报价&nbsp;<i class="fa fa-angle-double-down"></i></span>

src/main/webapp/resources/view/vendor/forstore/seekPurchase.html

@@ -455,27 +455,30 @@
             <tbody ng-repeat="seek in seekListData" ng-class="{'active': seek.$active}">
                 <tr class="default-row">
                     <td class="release-time">
-                        <span ng-bind="seek.releaseDate | date:'yyyy-MM-dd'"></span>
-                        <span ng-bind="seek.releaseDate | date:'HH:mm:ss'"></span>
+                        <span ng-bind="seek.date | date:'yyyy-MM-dd'"></span>
+                        <span ng-bind="seek.date | date:'HH:mm:ss'"></span>
+                        <!--
                         <div class="seek-status">
                             <div class="status">已在库</div>
                             <div class="BOM-list-btn" ng-if="seek.bomId">BOM清单</div>
                         </div>
+                        -->
                     </td>
-                    <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName"></div></td>
-                    <td><div title="{{seek.code}}" ng-bind="seek.code"></div></td>
-                    <td><div title="{{seek.brand}}" ng-bind="seek.brand"></div></td>
-                    <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '--'"></div></td>
-                    <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '--'"></div></td>
-                    <td><div title="{{seek.amount}}" ng-bind="seek.amount || '--'"></div></td>
+                    <td class="user-name"><div title="{{seek.userName}}" ng-bind="seek.userName || '-'"></div></td>
+                    <td><div title="{{seek.cmpCode}}" ng-bind="seek.code || '-'"></div></td>
+                    <td><div title="{{seek.inbrand}}" ng-bind="seek.brand || '-'"></div></td>
+                    <td><div title="{{seek.encapsulation}}" ng-bind="seek.encapsulation || '-'"></div></td>
+                    <td><div title="{{seek.produceDate}}" ng-bind="seek.produceDate || '-'"></div></td>
+                    <td><div title="{{seek.needquantity}}" ng-bind="seek.amount || '-'"></div></td>
                     <td class="unit-price">
                         <span>{{seek.currency + seek.unitPrice | currencyStr}}</span>
                     </td>
                     <td class="left-time" ng-if="seek.remainingTime > 0">剩余&nbsp;<span ng-bind="getDay(seek.remainingTime)" ng-if="getDay(seek.remainingTime) > 0" class="red-text"></span><i ng-if="getDay(seek.remainingTime) > 0">&nbsp;天&nbsp;</i><span ng-if="getDay(seek.remainingTime) <= 0" ng-bind="getHours(seek.remainingTime)" class="red-text">5</span><i ng-if="getDay(seek.remainingTime) <= 0">&nbsp;小时</i></td>
                     <td class="left-time" ng-if="seek.remainingTime <= 0"><span>已截止</span></td>
+                    <td class="left-time" ng-if="seek.remainingTime == null"><span style="color: red;">-</span></td>
                     <td class="operate">
                         <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                        <div ng-if="seek.remainingTime > 0" ng-click="setSeekActive(seek, true)">我要报价</div>
+                        <div ng-click="setSeekActive(seek, true)">我要报价</div>
                     </td>
                 </tr>
                 <tr class="say-price">