Merge remote-tracking branch 'origin/dev-mysql' into dev-mysql

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

@@ -4178,7 +4178,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     item.history = data;
                 }, function (response) {
                     $scope.historyShow = false;
-                    toaster.pop('error', '数据加载失败', response.data);
+                    //toaster.pop('error', '数据加载失败', response.data);
                 });
             }
         };
@@ -6434,8 +6434,6 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     mould.history = data;
                 },function (response) {
                     $scope.historyShow = false;
-                    toaster.pop('error', '提示', response.data);
-                    //$Scope.PurcInquiryMouldpermission = true;
                 });
             }
         };
@@ -6645,7 +6643,7 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
                     mould.history = data;
                 },function (response) {
                     $scope.historyShow = false;
-                    toaster.pop('error', '提示', response.data);
+                    //toaster.pop('error', '提示', response.data);
                 });
             }
         };
@@ -13409,11 +13407,13 @@ define(['toaster', 'charts', 'ngTable', 'common/services', 'common/directives',
             $scope.isUser = data.isUser;
         });
         var loadData = function () {
-            MakeOutOrder.getItem({id: $stateParams.id}, function (data) {
+            MakeOutOrder.getItem({id: $stateParams.id},{}, function (data) {
                 $scope.order = data;
                 var sum = $scope.order.qty * $scope.order.price;
                 $scope.order.total = sum;
                 $scope.loading = false;
+            }, function (response) {
+                toaster.pop('error', '提示', response.data);
             });
         };
         loadData();

src/main/webapp/resources/tpl/index/sale/inquiry.html

@@ -433,8 +433,11 @@
 										</div>
 									</li>
 								</ul>
+								<div ng-if="historyShow">
 								<div ng-show="!inquiryItem.history || inquiryItem.history.length == 0"
-										class="text-center text-muted">暂无历史报价</div>
+									 class="text-center text-muted">暂无历史报价</div></div>
+								<div ng-if="!historyShow">
+									<div  class="text-center text-muted">无法访问，没有客户询价-查看历史报价权限！</div></div>
 							</div>
 						</div>
 					</div>

src/main/webapp/resources/tpl/index/sale/inquiry_mould.html

@@ -490,6 +490,8 @@ tbody td div.text-mould {
 								<div ng-if="historyShow">
 								<div ng-show="!inquiryMould.replyDate"
 									 class="text-center text-muted">暂无历史报价</div></div>
+								<div ng-if="!historyShow">
+									<div class="text-center text-muted">无法访问，没有客户模具询价-查看历史报价权限!</div></div>
 							</div>
 						</div>
 					</div>

src/main/webapp/resources/tpl/index/sale/inquiry_mould_detail.html

@@ -182,6 +182,8 @@ a:hover{
 									</ul>
 									<div ng-if="historyShow">
 										<div ng-show="!inquiryMould.replyDate" class="text-center text-muted">暂无历史报价</div></div>
+									<div ng-if="!historyShow">
+										<div  class="text-center text-muted">无法访问，没有客户模具询价-查看历史报价权限!</div></div>
 
 								</div>
 							</div>