商城对接公共询价服务接口

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

@@ -7,23 +7,23 @@ define([ 'ngResource' ], function() {
         method: 'GET'
       },
       getSeekPushGoodsPageInfo: {
-        url: 'http://10.1.51.88:8080/inquiry/public',
+        url: 'http://192.168.253.192:8080/inquiry/public',
         method: 'GET',
       },
       saveOneSeekPurchase: {
-        url: 'http://10.1.51.88:8080/inquiry/buyer/save',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/save',
         method: 'POST'
       },
       saveOffer: {
-        url: 'http://10.1.51.88:8080/inquiry/sale/item/save',
+        url: 'http://192.168.253.192:8080/inquiry/sale/item/save',
         method: 'POST'
       },
       getUserSeekPageInfo: {
-        url: 'http://10.1.51.88:8080/inquiry/buyer/list',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/list',
         method: 'GET'
       },
       getUserSeekPageInfoByStatus: {
-        url: 'http://10.1.51.88:8080/inquiry/public/quotation/list',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/quotations',
         method: 'GET'
       },
       getMallGoodsList: {
@@ -32,23 +32,23 @@ define([ 'ngResource' ], function() {
         isArray: true
       },
       getSeekPurchaseOfferPageInfo: {
-        url: 'http://10.1.51.88:8080/inquiry/buyer/product/detail',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/product/detail',
         method: 'GET'
       },
       getMyOfferPageInfo: {
-        url: 'http://10.1.51.88:8080/inquiry/public/quotation/list',
+        url: 'http://192.168.253.192:8080/inquiry/public/quotation/list',
         method: 'GET'
       },
       updateSeekPurchaseStatus: {
-        url: 'http://10.1.51.88:8080/inquiry/buyer/decide',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/decide',
         method: 'POST'
       },
       getSeekPurchaseBomListPage: {
-        url: 'http://10.1.51.88:8080/inquiry/buyer/inquiryList',
+        url: 'http://192.168.253.192:8080/inquiry/buyer/inquiryList',
         method: 'GET'
       },
       findOneBom: {
-          url: 'http://10.1.51.88:8080/inquiry/public/findInquiryById',
+          url: 'http://192.168.253.192:8080/inquiry/public/findInquiryById',
           method: 'GET'
       },
       saveBomName: {
@@ -56,7 +56,7 @@ define([ 'ngResource' ], function() {
           method: 'PUT'
       },
       getBomDetail: {
-          url: 'http://10.1.51.88:8080/inquiry/sale/publicInquiry/detail',
+          url: 'http://192.168.253.192:8080/inquiry/sale/publicInquiry/detail',
           method: 'GET'
       }
 		});

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

@@ -28,17 +28,6 @@ define(['app/app'], function (app) {
                 total: 0,
                 getData: function ($defer, params) {
                   const param = BaseService.parseParams(params.url());
-                  if ($scope.userInfo.enterprise) {
-                    param.enUU = $scope.userInfo.enterprise.uu;
-                  }
-                  param.recorderUU = $scope.userInfo.userUU;
-                  // param.isMallGoods = $scope.isMallGoods;
-                  // param.deadline = $scope.deadline;
-                  param.keyword = $scope.keyWord;
-                  param.fromDate = $scope.startDate
-                      ? $scope.startDate.getTime() : null;
-                  param.endDate = $scope.endDate ? $scope.endDate.getTime()
-                      : null;
                   param.pageNumber = param.page;
                   param.pageSize = param.count;
                   if ($scope.isSearch) {
@@ -48,6 +37,16 @@ define(['app/app'], function (app) {
                   }
                   if ($scope.tab == 'waitOffer') {
                     param.state = "todo";
+                    var filter = {};
+                    if ($scope.userInfo.enterprise) {
+                      param.enUU = $scope.userInfo.enterprise.uu;
+                    }
+                    param.userUU = $scope.userInfo.userUU;
+                    param.keyword = $scope.keyWord;
+                    param.fromDate = $scope.startDate
+                        ? $scope.startDate.getTime() : null;
+                    param.endDate = $scope.endDate ? $scope.endDate.getTime()
+                        : null;
                     seekPurchase.getUserSeekPageInfo(param, function (data) {
                       params.total(data.totalElements);
                       $defer.resolve(data.content);
@@ -57,15 +56,19 @@ define(['app/app'], function (app) {
                     });
                   } else if($scope.tab == 'offered') {
                     param._state = "done";
-                    seekPurchase.getUserSeekPageInfoByStatus(param, function (data) {
-                      params.total(data.totalElements);
-                      $defer.resolve(data.content);
-                      $scope.seekListData = data;
-                    }, function (response) {
-                      toaster.pop('error', response.data);
-                    });
-                  } else if ($scope.tab == 'accepted') {
-                    param._state = "agreed";
+                    var filter = {};
+                    if ($scope.userInfo.enterprise) {
+                      param.enUU = $scope.userInfo.enterprise.uu;
+                    }
+                    param.userUU = $scope.userInfo.userUU;
+                    // param.isMallGoods = $scope.isMallGoods;
+                    // param.deadline = $scope.deadline;
+                    filter.keyword = $scope.keyWord;
+                    filter.fromDate = $scope.startDate
+                        ? $scope.startDate.getTime() : null;
+                    filter.endDate = $scope.endDate ? $scope.endDate.getTime()
+                        : null;
+                    param.filter = filter;
                     seekPurchase.getUserSeekPageInfoByStatus(param, function (data) {
                       params.total(data.totalElements);
                       $defer.resolve(data.content);
@@ -398,6 +401,7 @@ define(['app/app'], function (app) {
           $scope.adopt = function (id) {
             seekPurchase.updateSeekPurchaseStatus({id: id, status: 1},{},function(){
               toaster.pop('success', '采纳报价成功');
+              $scope.seekPurchaseTableParams.reload();
             }, function(response){
               toaster.pop('error', response.data);
             });
@@ -432,12 +436,16 @@ define(['app/app'], function (app) {
             $scope.currentSeek = seek;
             // 查看报价
             if (status == 2 && $scope.offerCount != 0) {
-              seekPurchase.getSeekPurchaseOfferPageInfo(
-                  {id: seek.id}, function (data) {
-                    $scope.offer = data.inquiryItems;
-                    clearSeekStatus();
-                    seek.$status = status;
-                  });
+              // seekPurchase.getSeekPurchaseOfferPageInfo(
+              //
+              //     {id: seek.sourceId, enUU:$scope.userInfo.enterprise.uu}, function (data) {
+              //       $scope.offer = data.inquiryItems;
+              //       clearSeekStatus();
+              //       seek.$status = status;
+              //     });
+              $scope.offer = seek.qutations;
+              clearSeekStatus();
+              seek.$status = status;
             } else if (status == 1 && $scope.goodsCount != 0) {// 查看现货
               seekPurchase.getMallGoodsList({spId: seek.spId}, function (data) {
                 $scope.goods = data;

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

@@ -15,7 +15,7 @@ define(['app/app'], function(app) {
         // 获取我的报价列表
         $scope.seekPurchaseTableParams = new ngTableParams({
           pageNumber: 1,
-          pageSize: 10
+          pageSize: 20
         }, {
             total : 0,
             getData : function ($defer, params) {

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

@@ -9,16 +9,6 @@ define(['app/app'], function (app) {
           $scope.seekPurchaseRate = {};
 
           $scope.initInquiryItem = function () {
-            $scope.inquiryItem = {
-              currency: 'RMB',
-              leadtime: '',
-              replies: [
-                {
-                  lapQty: '',
-                  price: ''
-                }
-              ]
-            };
             $scope.validSayPrice = {
               leadtime: false,
               repliesPrice: false,
@@ -170,9 +160,11 @@ define(['app/app'], function (app) {
             if ($scope.checkValid()) {
               $scope.inquiryItem.vendUU = $scope.userInfo.enterprise.uu;
               $scope.inquiryItem.vendUserUU = $scope.userInfo.userUU;
+              $scope.inquiryItem.qutoApp = "MALL";
               seekPurchase.saveOffer($scope.inquiryItem, function () {
                 toaster.pop('success', '报价成功');
                 $scope.isShowSayPriceBox = false;
+                $scope.seekPurchaseTableParams.reload();
               }, function (response) {
                 toaster.pop('error', response.data.detailedMessage);
               });
@@ -303,8 +295,14 @@ define(['app/app'], function (app) {
                 currency: seek.currency ? seek.currency : "RMB",
                 spId: seek.spId
               }
-            } else {
-              $scope.initInquiryItem();
+              $scope.inquiryItem = seek;
+              $scope.inquiryItem.leadtime = '';
+              $scope.inquiryItem.replies = [
+                {
+                  lapQty: '',
+                  price: ''
+                }
+              ];
             }
             //seek.$active = flag;
             $scope.isShowSayPriceBox = flag;

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

@@ -629,7 +629,6 @@
             <ul>
                 <li ng-class="{'active': tab == 'waitOffer'}"><a href="javascript:void(0)" ng-click="toogleTab('waitOffer')">待报价</a></li>
                 <li ng-class="{'active': tab == 'offered'}"><a href="javascript:void(0)" ng-click="toogleTab('offered')">已报价</a></li>
-              <li ng-class="{'active': tab == 'accepted'}"><a href="javascript:void(0)" ng-click="toogleTab('offered')">已采纳</a></li>
             </ul>
         </div>
     </div>
@@ -782,13 +781,13 @@
                 <td class="left-time" ng-if="seek.remainingTime <= 0"><span style="color: red;">已截止</span></td>
                 <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.offerAmount == 0" style="color:red;">待报价</span>
+                    <span ng-if="seek.agreed == 0 && 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>
-                    <span ng-if="seek.offerAmount == 0 && seek.goodsAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>
+                    <!--<span ng-if="seek.offerAmount == 0 && seek.goodsAmount>0" ng-show="!seek.$status || seek.$status == 0" ng-click="setSeekStatus(seek, 1)">查看现货&nbsp;<i class="fa fa-angle-double-down"></i></span>-->
                     <span ng-show="seek.$status && (seek.$status == 1 || seek.$status == 2)" ng-click="setSeekStatus(seek, 0)">收起&nbsp;<i class="fa fa-angle-double-up"></i></span>
                 </td>
             </tr>
@@ -870,29 +869,22 @@
                                     <tbody>
                                     <tr ng-repeat="of in offer">
                                         <td width="173" ng-bind="of.userName"></td>
-                                        <td width="186" class="red-text" ng-bind="of.minDay+'-'+of.maxDay">4-6</td>
+                                        <td width="186" class="red-text" ng-bind="of.leadtime">4-6</td>
                                         <td width="186">
                                             <!--<span>{{of.currency + of.unitPrice | currencyStr}}</span>-->
                                             <ul>
-                                                <li>
-                                                    <span>1+</span>
-                                                    <span>$444</span>
-                                                </li>
-                                                <li>
-                                                    <span>1+</span>
-                                                    <span>$444</span>
-                                                </li>
-                                                <li>
-                                                    <span>1+</span>
-                                                    <span>$444</span>
-                                                </li>
+                                              <li ng-repeat="re in of.replies">
+                                                  <span ng-bind="re.lapQty">1+</span>
+                                                  <span title="{{of.currency + re.price | currencyStr}}">{{of.currency + re.price | currencyStr}}</span>
+                                              </li>
                                             </ul>
                                         </td>
                                         <td width="195" ng-bind="of.produceDate || '-'"></td>
                                         <td width="221" class="operate">
                                             <a>联系卖家<img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                                            <img ng-if="of.status == 202" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
-                                            <span ng-if="seek.status != 202" ng-click="adopt(of.id)">采纳报价</span>
+
+                                            <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
+                                            <span ng-if="seek.agreed != 1" ng-click="adopt(of.id)">采纳报价</span>
                                         </td>
                                     </tr>
                                     </tbody>

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

@@ -438,7 +438,7 @@
             <ul>
                 <li><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
                 <li class="active"><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
-                <li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>
+                <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
             </ul>
         </div>
     </div>
@@ -546,9 +546,10 @@
                 <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">
+                <td class="operate" ng-switch="seek.agreed">
                     <a>联系买家 <img src="static/img/seekPurchase/link-buyer.png" alt=""></a>
-                    <span>已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
+                    <span ng-if="seek.agreed != 1">已报价 <img src="static/img/seekPurchase/check.png" alt=""></span>
+                    <img ng-if="seek.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="">
                 </td>
             </tr>
             <!--

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

@@ -513,7 +513,7 @@
             <ul>
                 <li class="active"><a href="javascript:void(0)" ui-sref="vendorSeekPurchase">待报价</a></li>
                 <li><a href="javascript:void(0)" ui-sref="vendorPurchaseOffer">已报价</a></li>
-                <li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>
+                <!--<li><a href="javascript:void(0)" ui-sref="vendorPurchaseAccept">已采纳</a></li>-->
             </ul>
         </div>
     </div>