Browse Source

我的待报价方法更新,在我的待报价列表可以进行报价操作;

hejq 8 years ago
parent
commit
78d3411ff6

+ 2 - 1
src/main/resources/test/sys.properties

@@ -15,4 +15,5 @@ reportUploadUrl=http://print.ubtob.com/report/fileUpload?userName=B2B%s
 productServiceUrl=http://218.17.158.219:24000
 
 #inquiry service url
-inquiryServiceUrl=http://218.17.158.219:24000
+#inquiryServiceUrl=http://218.17.158.219:24000
+inquiryServiceUrl=http://192.168.253.192:8080

+ 11 - 2
src/main/webapp/resources/js/index/app.js

@@ -24393,8 +24393,8 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     $http({
                         method: 'get',
                         dataType: 'json',
-                        url: $scope.url + '/inquiry/sale/quote',
-                        params: {id: remind.itemId, en_uu: $scope.currentEn.uu}
+                        url: $scope.url + '/inquiry/public/findItemByItemId',
+                        params: {itemId: remind.itemId, enuu: $scope.currentEn.uu}
                     }).success(function (response) {
                         var inquiryItem = response;
                         var modalInstance = $modal.open({
@@ -24422,6 +24422,15 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             });
         }
 
+        // 跳转详情
+        $scope.toDetail = function(remind) {
+            if (remind.newId == null) {
+                window.location.hash = '#/baseInfo/inquiryList/' + remind.itemId;
+            } else {
+                window.open("#/sale/pubinquiry/" + remind.newId);
+            }
+        }
+
     }]);
     
     return app;

+ 6 - 5
src/main/webapp/resources/tpl/index/sale/inquiryRemind.html

@@ -283,19 +283,20 @@
                 <div class="text-num text-bold">
                     <a class="dropdown-toggle"
                        ng-mouseover="getHistory(remind)">
-                        <span ng-bind="::remind.cmpCode"></span>
+                        <span ng-bind="::remind.cmpCode" ng-if="remind.newId == null" ng-click="toDetail(remind)"></span>
+                        <span ng-bind="::remind.cmpCode" ng-if="remind.newId != null" ng-click="toDetail(remind)"></span>
                         <i class="fa fa-fw fa-sort-desc"></i>
                         <div class="dropdown-menu pane" style="width: 270px;">
                             <div class="pane-body">
                                 <div>
-                                    <div>
-                                        <span>产品规格:</span>
-                                        <em ng-bind="::remind.spec"></em>
-                                    </div>
                                     <div>
                                         <span>产品名称:</span>
                                         <em ng-bind="::remind.title"></em>
                                     </div>
+                                    <div>
+                                        <span>产品规格:</span>
+                                        <em ng-bind="::remind.spec"></em>
+                                    </div>
                                 </div>
                                 <div ng-show="!remind.spec && !remind.title"
                                      class="text-center text-muted">暂无产品信息</div>