编制说明取消限制

web/building_saas/main/js/views/project_view.js

@@ -2333,30 +2333,14 @@ $('#tab_compilation_illustration_p').on('show.bs.tab', function () {
     let v = projectObj.project.property.compilationIllustrationProject ? projectObj.project.property.compilationIllustrationProject : '';
     $('#compilationIllustrationP textarea').val(v);
 });
-$('#compilationIllustrationP').keyup(function () {
-    let v = $('#compilationIllustrationP textarea').val();
-    if (v && v.length > 255) {
-        v = v.substr(0, 255);
-        $('#compilationIllustrationP textarea').val(v);
-        alert('编制说明字符数不能超过255个。');
-    };
-});
 //单位工程-编制说明
 $('#tab_compilation_illustration').on('show.bs.tab', function () {
     let v = projectObj.project.property.compilationIllustration ? projectObj.project.property.compilationIllustration : '';
     $('#compilationIllustration textarea').val(v);
 });
-$('#compilationIllustration').keyup(function () {
-    let v = $('#compilationIllustration textarea').val();
-    if (v && v.length > 255) {
-        v = v.substr(0, 255);
-        $('#compilationIllustration textarea').val(v);
-        alert('编制说明字符数不能超过255个。');
-    };
-});
 $('#property_ok').click(async function () {
     //test-----
-   /* $.bootstrapLoading.start();
+    /*$.bootstrapLoading.start();
     let xmlObj = new XMLStandard(userID, 1);
     await xmlObj.toXml(projectObj.project.ID());
     console.log(xmlObj);
@@ -2407,10 +2391,6 @@ $('#property_ok').click(async function () {
     }
     //建设项目-编制说明
     let compilationIllustrationP = $('#compilationIllustrationP textarea').val();
-    if (compilationIllustrationP && compilationIllustrationP.length > 255) {
-        alert('编制说明字符数不能超过255！');
-        return;
-    }
     if (compilationIllustrationP !== project.property.compilationIllustrationProject) {
         properties['property.compilationIllustrationProject'] = compilationIllustrationP;
         project.property.compilationIllustrationProject = compilationIllustrationP;
@@ -2448,11 +2428,6 @@ $('#property_ok').click(async function () {
     }
     //单位工程-编制说明
     let compilationIllustration = $('#compilationIllustration textarea').val();
-    //限制255位字符
-    if (compilationIllustration && compilationIllustration.length > 255) {
-        alert('编制说明字符数不能超过255！');
-        return;
-    }
     if (compilationIllustration !== project.property.compilationIllustration) {
         properties['property.compilationIllustration'] = compilationIllustration;
         project.property.compilationIllustration = compilationIllustration;

web/building_saas/main/js/views/sub_view.js

@@ -236,10 +236,12 @@ $("#linkAZZJF").click(function(){
     MaterialController.hideReplaceDiv();
     $("#subSpread").show();
     pageCCOprObj.active = false;
-    refreshSubSpread();
     subSpread.setActiveSheetIndex(3);
     gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
     gljOprObj.activeTab='#linkAZZJF';
+    if (gljOprObj.preActiveTab !== gljOprObj.activeTab) { //提高焦点变换性能 2019年4月12日
+        refreshSubSpread();
+    }
     gljOprObj.setNodeShowTab();
 });
 
@@ -290,11 +292,11 @@ $("#linkMBZM").click(function(){        // 模板子目
     $("#subItems").children().hide();
     $("#tabMBZM").show();
     pageCCOprObj.active = false;
+    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
+    gljOprObj.activeTab='#linkMBZM';
     if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提高焦点变换性能 2019年4月12日
         refreshSubSpread();
     }
-    gljOprObj.preActiveTab = gljOprObj.activeTab;   //提高焦点变换性能 2019年4月12日
-    gljOprObj.activeTab='#linkMBZM';
     gljOprObj.setNodeShowTab();
 });
 
@@ -791,7 +793,9 @@ $('#linkZMHS').on('shown.bs.tab', function (e) {
 
 
 $('#linkMBZM').on('shown.bs.tab', function (e) {
-    mbzm_obj.refresh();
+    if (gljOprObj.activeTab !== gljOprObj.preActiveTab) {   //提高焦点变换性能 2019年4月12日
+        mbzm_obj.refresh();
+    }
     mbzm_obj.showMBZMData();
 });
 

web/building_saas/pm/js/pm_newMain.js

@@ -2208,6 +2208,7 @@ $(document).ready(function() {
             setDangerInfo($('#rename-name-info'), `已存在“${newName}”`);
             return;
         }
+        newName = whiteSpaceCollapse(newName);
         RenameProject(select.id(), newName, select.data.ParentID, function () {
             setDangerInfo($('#rename-name-info'), '', false);
             dialog.modal('hide');
@@ -2494,6 +2495,12 @@ function init() {
     engineering = engineeringList !== null && engineeringList !== undefined ? JSON.parse(engineeringList) : [];
 }
 
+function whiteSpaceCollapse(v) {
+    v = v.replace(/[\r,\n,\t]/g, ' ');
+    v = v.trim();
+    return v.replace(/\s{1,}/g, ' ');
+}
+
 /**
  * 新增建设项目
  *
@@ -2505,7 +2512,7 @@ function AddProject() {
         setDangerInfo($('#project-name-info'), '请填写建设项目名称');
         return false;
     }
-    name = name.replace(/[\r,\n,\s,\t]/g, '');
+    name = whiteSpaceCollapse(name);
     let existCallback = function () {
         setDangerInfo($('#project-name-info'), `已存在“${$("#project-name").val()}”`);
     };
@@ -3117,7 +3124,7 @@ function AddEngineering() {
         setDangerInfo($('#engineering-name-info'), '请填写单项工程名称');
         return false;
     }
-    name = name.replace(/[\r,\n,\s,\t]/g, '');
+    name = whiteSpaceCollapse(name);
     let existCallback = function () {
         setDangerInfo($('#engineering-name-info'), `已存在“${$("#engineering-name").val()}”`);
     };
@@ -3156,20 +3163,20 @@ function AddTender() {
             setDangerInfo($('#poj-name-info'), '请填写建设项目名称');
             return false;
         }
-        projName = projName.replace(/[\r,\n,\s,\t]/g, '');
+        projName = whiteSpaceCollapse(projName);
         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, '');
+        engName = whiteSpaceCollapse(engName);
         let tenderName = $('#tender-name').val();
         if (tenderName === '') {
             setDangerInfo($('#tender-name-info'), '请填写单位工程名称');
             return false;
         }
-        tenderName = tenderName.replace(/[\r,\n,\s,\t]/g, '');
+        tenderName = whiteSpaceCollapse(tenderName);
         if(hasTender(projTreeObj.tree.selected, projName, engName, tenderName)){
             return false;
         }