bug修改

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

@@ -15,7 +15,7 @@ define([ 'ngResource' ], function() {
         method: 'GET',
       },
       saveOneSeekPurchase: {
-        url: 'http://10.1.51.82:24002/inquiry/buyer/save',
+        url: 'http://218.17.158.219:24000/inquiry/buyer/save',
         method: 'POST'
       },
       saveOneSeekPurchaseProd: {
@@ -23,7 +23,7 @@ define([ 'ngResource' ], function() {
         method: 'POST'
       },
      saveOffer: {
-        url: 'http://10.1.51.82:24002/inquiry/sale/item/save',
+        url: 'http://218.17.158.219:24000/inquiry/sale/item/save',
         method: 'POST'
       },
       saveOfferProd: {

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

@@ -687,7 +687,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                     file: file,
                     method: 'POST'
                   }).success(function (data) {
-                    window.open("http://10.1.51.90:3000/applyPurchase/"
+                    window.open("applyPurchase/"
                         + data.data);
                   }).error(function (response) {
                   });

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

@@ -98,22 +98,24 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             }
           $scope.toogleTab('waitOffer');
           $scope.applyObj = {
-            code: '',
-            brand: '',
-            unitPrice: '',
-            currency: 'RMB',
-            encapsulation: '',
-            produceDate: '',
-            amount: '',
-            deadline: ''
+              code: '',
+              brand: '',
+              unitPrice: '',
+              currency: 'RMB',
+              encapsulation: '',
+              produceDate: '',
+              amount: '',
+              deadline: '',
+              prodTitle: ''
           };
           $scope.validObj = {
-            code: true,
-            brand: true,
-            unitPrice: true,
-            amount: true,
-            deadline: true,
-            spec: true
+              code: true,
+              brand: true,
+              unitPrice: true,
+              amount: true,
+              deadline: true,
+              spec: true,
+              prodTitle: true
           };
 
           // 买家求购列表
@@ -229,6 +231,13 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             }
             return $scope.validObj.brand;
           }
+          $scope.checkProdTitle = function () {
+              $scope.validObj.prodTitle = $scope.applyObj.prodTitle && $scope.applyObj.prodTitle !== '';
+              if (!$scope.validObj.prodTitle) {
+                  toaster.pop('error', '类目不能为空');
+              }
+              return $scope.validObj.prodTitle;
+          }
           $scope.checkUnitPrice = function () {
             $scope.validObj.unitPrice = ($scope.applyObj.unitPrice === '' || !$scope.applyObj.unitPrice ) ? true
                 : $scope.applyObj.unitPrice > 0 && $scope.applyObj.unitPrice
@@ -338,8 +347,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             return $scope.validObj.amount;
           }
           $scope.checkAll = function () {
-            return $scope.checkCode() && $scope.checkBrand() && $scope.checkDeadline()
-                && $scope.checkUnitPrice() && $scope.checkAmount() && $scope.checkSpec();
+            return $scope.checkBrand() && $scope.checkProdTitle() && $scope.checkCode() && $scope.checkDeadline()
+                && $scope.checkSpec() && $scope.checkAmount();
           }
           $scope.checkDeadline = function () {
             $scope.validObj.deadline = $scope.applyObj.deadline
@@ -378,6 +387,7 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
               inquiryItem.currency = $scope.applyObj.unitPrice ? $scope.applyObj.currency : null;
               inquiryItem.cmpCode = $scope.applyObj.code.toUpperCase();
               inquiryItem.unitPrice = $scope.applyObj.unitPrice;
+              inquiryItem.spec = $scope.applyObj.spec;
               inquiryItem.produceDate = $scope.applyObj.produceDate;
               inquiryItem.date = new Date();
               inquiryItem.endDate = $scope.applyObj.deadline;
@@ -413,24 +423,21 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
           $scope.release = function () {
             // 校验
             if ($scope.checkAll()) {
-                if (!$scope.applyObj.prodTitle || $scope.applyObj.prodTitle.length === 0) {
-                    var materialUrl = seekUrl;
-                    if (seekUrl == 'https://api-inquiry.usoftmall.com') {
-                        materialUrl = 'https://api-product.usoftmall.com/';
-                    }
-                    $http({
-                        method: 'get',
-                        dataType: 'json',
-                        url: materialUrl + '/productuser/match/getKind',
-                        params: {cmpCode: $scope.applyObj.code, brand: $scope.applyObj.brand}
-                    }).success(function (data) {
-                        startRelease(data && data.length ? data : '其他');
-                    }).error(function (response) {
-                        toaster.pop('error', response || '获取关联类目失败');
-                    });
-                } else {
-                    startRelease();
+                var materialUrl = seekUrl;
+                if (seekUrl == 'https://api-inquiry.usoftmall.com') {
+                    materialUrl = 'https://api-product.usoftmall.com/';
                 }
+                $http({
+                    method: 'get',
+                    dataType: 'json',
+                    url: materialUrl + '/productuser/match/getKind',
+                    params: {cmpCode: $scope.applyObj.code, brand: $scope.applyObj.brand}
+                }).success(function (data) {
+                    startRelease(data && data.length ? data : $scope.applyObj.prodTitle);
+                }).error(function (response) {
+                    startRelease($scope.applyObj.prodTitle);
+                    toaster.pop('error', response || '获取关联类目失败');
+                });
             } else {
               if (!$scope.validObj.deadline) {
                 toaster.pop('error', '截止日期不能为空');
@@ -488,15 +495,16 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
             }
           }
           // 采纳报价
-          $scope.adopt = function (id) {
+          $scope.adopt = function (of) {
             $http({
               method: 'POST',
               dataType: 'json',
               url: seekUrl + '/inquiry/buyer/adopt',
-              params: {id: id, status: 1}
+              params: {id: of.id, status: 1}
             }).success(function (data) {
               toaster.pop('success', '采纳报价成功');
-              $scope.seekPurchaseTableParams.reload();
+                of.agreed = 1;
+              // $scope.seekPurchaseTableParams.reload();
             }).error(function (response) {
               toaster.pop('error', response);
             });
@@ -528,7 +536,8 @@ define(['app/app', 'clipboard', 'QRCode'], function (app, clipboard, QRCode) {
                   }).success(function (data) {
                       toaster.pop('refuse', '已拒绝报价');
                       $scope.setShowCurrentRefuseOffer(false);
-                      $scope.seekPurchaseTableParams.reload();
+                      $scope.currentRefuseOffer.agreed = 0;
+                      // $scope.seekPurchaseTableParams.reload();
                   }).error(function (response) {
                       toaster.pop('error', response);
                   });

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

@@ -9,7 +9,7 @@ define(['app/app'], function (app) {
           $scope.seekPurchaseRate = {};
           seekPurchase.getSeekUrl({}, function(data) {
             var seekUrl = data.url;
-            seekUrl = 'http://10.1.51.77:7070';
+            seekUrl = 'http://218.17.158.219:24000';
           $scope.initInquiryItem = function () {
             $scope.validSayPrice = {
               leadtime: false,

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

@@ -29,7 +29,7 @@
         position: relative;
     }
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block >span {
-        width: 103px;
+        width: 105px;
         height: 24px;
         line-height: 24px;
         display: inline-block;
@@ -71,7 +71,7 @@
     .seek-purchase .seek-purchase-content .publish-purchase .fl .form-block ul.similar-list {
         position: absolute;
         top: 23px;
-        left: 103px;
+        left: 105px;
         background: #fff;
         border: 1px solid #b5b5b5;
         z-index: 1;
@@ -896,8 +896,8 @@
                     </ul>
                 </div>
                 <div class="form-block">
-                    <span>类目(产品名称)</span>
-                    <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-change="onProdTitleInput()">
+                    <span><i>*</i>类目(产品名称)</span>
+                    <input type="text" class="form-group" ng-model="applyObj.prodTitle" ng-class="{'error': !validObj.prodTitle}" ng-change="onProdTitleInput()" ng-blur="checkProdTitle()">
                 </div>
                 <div class="form-block">
                     <span><i>*</i>型号</span>
@@ -1209,7 +1209,7 @@
 
                                             <img ng-if="of.agreed == 1" src="static/img/seekPurchase/recieved.png" alt="" class="ng-scope">
                                             <img ng-if="of.agreed == 0" src="static/img/seekPurchase/refused.png" alt="" class="ng-scope">
-                                            <span class="seek-btn" ng-if="of.agreed != 0 && of.agreed != 1" ng-click="adopt(of.id)">采纳</span>
+                                            <span class="seek-btn" ng-if="of.agreed != 0 && of.agreed != 1" ng-click="adopt(of)">采纳</span>
                                             <a class="seek-btn" ng-if="of.agreed != 0 && of.agreed != 1" ng-click="setActiveRefuse(of)">拒绝</a>
                                         </td>
                                     </tr>

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

@@ -842,7 +842,7 @@
                                 <p class="price-title">历史报价</p>
                                 <div>
                                     <div>
-                                        <span>交期：</span><span class="red-text" ng-bind="seek.leadtime + '天'">6 天</span>
+                                        <span>交期：</span><span class="red-text" ng-bind="seek.quotation.leadtime + '天'">6 天</span>
                                     </div>
                                     <!--<div>-->
                                     <!--<span>附件：</span><a href="">下载</a>-->
@@ -852,9 +852,9 @@
                                     <!--</div>-->
                                     <p class="price-level">价格梯度</p>
                                     <ul>
-                                        <li ng-repeat="re in seek.replies">
+                                        <li ng-repeat="re in seek.quotation.replies">
                                             <span ng-bind="re.lapQty + '+'">1333+</span>
-                                            <span title="{{seek.currency + re.price | currencyStr}}">{{seek.currency + re.price | currencyStr}}</span>
+                                            <span title="{{seek.quotation.currency + re.price | currencyStr}}">{{seek.quotation.currency + re.price | currencyStr}}</span>
                                         </li>
                                     </ul>
                                 </div>

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

@@ -1833,7 +1833,7 @@
 		<div ng-if="standard_tab == 'unstandard' || standard_tab =='standard'">
 			<div class="search-check">
 				<div class="search fl">
-					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="品牌/类目/型号"/>
+					<input type="text" class="form-control" ng-model="param.keyword" ng-search="onSearch()" placeholder="品牌/型号"/>
 					<button ng-click="onSearch()">搜索</button>
 					<!--<a ng-click="download()">批量导出</a>-->
 				</div>

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

@@ -715,7 +715,7 @@
 			</div>
 			<div class="row com_row">
 				<div class="col-md-2 custom_col">
-					<span>店铺简介</span>
+					<span>企业介绍</span>
 				</div>
 				<div class="col-md-10 custom_col">
 					<textarea class="form-control" style="border-radius: inherit;resize: none;height: 200px;margin-top: 10px;" title="description" ng-model="sampleStore.enterprise.description" maxlength="500"></textarea>