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

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

@@ -1022,7 +1022,7 @@
             search = encodeURI(search);
             var reg = new RegExp(search, 'gim');
             var result = content.replace(reg, '<font color="red">$&</font>');
-            result = decodeURI(result);
+            result = decodemessageURI(result);
             return $sce.trustAsHtml(result);
         };
         $rootScope.searchKeyword = null;// 清除缓存的关键字
@@ -19786,7 +19786,7 @@
         if (!angular.isUndefined($stateParams.id)) { // 获取招标单详情
             $scope.loading = true;
             getCurrentEn();
-            PurcTender.getOne({id: $stateParams.id}, function (data) {
+            PurcTender.getPurcTenderDetail({id: $stateParams.id}, function (data) {
                 data.$editing = false;
                 $scope.tender = data;
                 $scope.tenderProd = data.purchaseTenderProds;