搜索出定额套用后，不关闭搜索窗口，直接双击造价书中定额编号反向定位，应自动关闭搜索窗口，定位到对应定额

web/building_saas/main/js/views/std_ration_lib.js

@@ -344,9 +344,10 @@ var rationLibObj = {
     },
     locateAtRation: function(libID, code){
         let me = rationLibObj;
+        if ($('#rationSearchResult').is(':visible')) {
+            $('#rationSearchResult a').click();
+        }
         //查找定额，以确定定额所在章节节点
-        let firstLibID = projectObj.project.projectInfo.engineeringInfo.ration_lib.length > 0 ?
-                        projectObj.project.projectInfo.engineeringInfo.ration_lib[0].id : null;
         let locateRow = 0,
             locateSubRow = 0;
         CommonAjax.post('/complementaryRation/api/getRationItem', {rationRepIds: [libID], code: code}, function (ration) {

web/building_saas/pm/js/pm_newMain.js

@@ -2505,6 +2505,7 @@ function AddProject() {
         setDangerInfo($('#project-name-info'), '请填写建设项目名称');
         return false;
     }
+    name = name.replace(/[\r,\n,\s,\t]/g, '');
     let existCallback = function () {
         setDangerInfo($('#project-name-info'), `已存在“${$("#project-name").val()}”`);
     };
@@ -3116,6 +3117,7 @@ function AddEngineering() {
         setDangerInfo($('#engineering-name-info'), '请填写单项工程名称');
         return false;
     }
+    name = name.replace(/[\r,\n,\s,\t]/g, '');
     let existCallback = function () {
         setDangerInfo($('#engineering-name-info'), `已存在“${$("#engineering-name").val()}”`);
     };
@@ -3154,19 +3156,20 @@ function AddTender() {
             setDangerInfo($('#poj-name-info'), '请填写建设项目名称');
             return false;
         }
+        projName = projName.replace(/[\r,\n,\s,\t]/g, '');
         let engName = $("#eng-name").val().trim();
         if(engName === ''){
             replaceClass($('#eng-name-info'), 'text-info', 'text-danger');
             setDangerInfo($('#eng-name-info'), '请填写单项工程名称');
             return false;
         }
-
+        engName = engName.replace(/[\r,\n,\s,\t]/g, '');
         let tenderName = $('#tender-name').val();
         if (tenderName === '') {
             setDangerInfo($('#tender-name-info'), '请填写单位工程名称');
             return false;
         }
-
+        tenderName = tenderName.replace(/[\r,\n,\s,\t]/g, '');
         if(hasTender(projTreeObj.tree.selected, projName, engName, tenderName)){
             return false;
         }