1.新建建设项目回车键bug

2.定额库编辑器，首次输入三位编号，不应识别为时间。例如1-1-1
3.导出重庆接口，"材料(工程设备)暂估价"不应出现在“其他项目清单”下的“其他”中。

web/building_saas/complementary_ration_lib/js/ration.js

@@ -724,49 +724,38 @@ let rationOprObj = {
             sheetGLJ = rationGLJOprObj.sheet, settingGLJ = rationGLJOprObj.setting,
             sheetCoe = rationCoeOprObj.sheet, settingCoe = rationCoeOprObj.setting,
             sheetAss = rationAssistOprObj.sheet, settingAss = rationAssistOprObj.setting;
-            //sheetInst = rationInstObj.sheet, settingInst = rationInstObj.setting;
         if (me.workBook) {
-            if (me.currentRations && me.currentRations["_SEC_ID_" + sectionID] && me.currentRations["_SEC_ID_" + sectionID].length > 0) {
+            sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
+            if (me.currentRations && me.currentRations["_SEC_ID_" + sectionID]) {
                 let cacheSection = me.currentRations["_SEC_ID_" + sectionID];
-                sheetCommonObj.cleanData(me.workBook.getSheet(0), me.setting, -1);
                 sheetsOprObj.showData(me.workBook.getSheet(0), me.setting, cacheSection);
-                //combo
-                //sheetCommonObj.setStaticCombo(me.workBook.getActiveSheet(), 0, 2, cacheSection.length, rationUnits, 10, false);
-                //--sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 2, me.workBook.getActiveSheet().getRowCount(), rationUnits, 10, false);
                 if(me.mixDel === 1){
                     let row = me.workBook.getSheet(0).getSelections()[0].row;
                     if (cacheSection && row < cacheSection.length) {
                         sheetCommonObj.cleanData(sheetGLJ, settingGLJ, -1);
                         sheetCommonObj.cleanData(sheetCoe, settingCoe, -1);
                         sheetCommonObj.cleanData(sheetAss, settingAss, -1);
-                        //sheetCommonObj.cleanData(sheetInst, settingInst, -1);
                         rationGLJOprObj.getGljItems(cacheSection[row]);
                         rationCoeOprObj.getCoeItems(cacheSection[row]);
                         rationAssistOprObj.getAssItems(cacheSection[row]);
-                        //rationInstObj.getInstItems(cacheSection[row]);
                     }
                     else {
                         rationGLJOprObj.currentRationItem = null;
                         sheetCommonObj.cleanData(sheetGLJ, settingGLJ, -1);
                         sheetCommonObj.cleanData(sheetCoe, settingCoe, -1);
                         sheetCommonObj.cleanData(sheetAss, settingAss, -1);
-                        //sheetCommonObj.cleanData(sheetInst, settingInst, -1);
                         sheetCommonObj.setDynamicCombo(sheetAss, 0, 5, sheetAss.getRowCount(), rationAssistOprObj.setting.comboItems, false, false);
                     }
                 }
 
             } else {
                 sheetCommonObj.setDynamicCombo(sheetAss, 0, 5, sheetAss.getRowCount(), rationAssistOprObj.setting.comboItems, false, false);
-                //--sheetCommonObj.setDynamicCombo(me.workBook.getActiveSheet(), 0, 2, me.workBook.getActiveSheet().getRowCount(), rationUnits, 10, false);
                 //清除ration数据及工料机数据
                 rationGLJOprObj.currentRationItem = null;
-                sheetCommonObj.cleanSheet(me.workBook.getSheet(0), me.setting, -1);
                 sheetCommonObj.cleanSheet(sheetGLJ, settingGLJ, -1);
                 sheetCommonObj.cleanSheet(sheetCoe, settingCoe, -1);
                 sheetCommonObj.cleanSheet(sheetAss, settingAss, -1);
-                //sheetCommonObj.cleanSheet(sheetInst, settingInst, -1);
             }
-            //--- me.workBook.focus(true);
         }
         sectionTreeObj.workBook.focus(true);
     },

web/building_saas/js/global.js

@@ -28,8 +28,8 @@ function autoFlashHeight(){
     $(".main-data-side-search").height($(window).height()-headerHeight-toolsbarHeight-64);
     $(".side-content").height($(window).height()-headerHeight );
     $(".poj-list").height($(window).height()-headerHeight-toolsbarHeight);
-    $(".gc-list").height($(window).height()-headerHeight-toolsbarHeight-40);
-    $(".share-list").height($(window).height()-headerHeight-toolsbarHeight-40);
+    $(".gc-list").height($(window).height()-headerHeight-toolsbarHeight);
+    $(".share-list").height($(window).height()-headerHeight-toolsbarHeight);
     $(".form-view").height($(window).height()-headerHeight-ftoolsbarHeight);
     $(".form-list").height($(window).height()-headerHeight);
     $('#comments').find('textarea').height($('#comments').height() - 25);

web/building_saas/main/js/models/exportStandardInterface.js

@@ -1544,12 +1544,12 @@ const XMLStandard = (function () {
         * @return {Object || Null}
         * */
         function loadOtherBills(detail) {
+            //其他项目清单元素
+            let otherEle = new OtherBills();
             let otherNode = detail.Bills.tree.roots.find(node => node.getFlag() === fixedFlag.OTHER);
             if (otherNode.children.length === 0) {
-                return null;
+                return otherEle;
             }
-            //其他项目清单元素
-            let otherEle = new OtherBills();
             //添加暂列金额元素
             let provisionalNode = detail.Bills.tree.items.find(node => node.getFlag() === fixedFlag.PROVISIONAL);
             if (provisionalNode && provisionalNode.children.length > 0) {
@@ -1636,8 +1636,9 @@ const XMLStandard = (function () {
             if (subOtherEle) {
                 otherEle.children.push(subOtherEle);
             }
-            //必须有有效子项，才能显示其他项目清单元素
-            return otherEle.children.length > 0 ? otherEle : null;
+            // 不需要有子节点，也可以输出显示
+            return otherEle;
+
             //加载暂列金额
             function loadProvisional(node) {
                 let provisionalEle = new Provisional({fees: node.data.fees});
@@ -1741,6 +1742,7 @@ const XMLStandard = (function () {
                 //排除项
                 let exclusionFlags = [
                     fixedFlag.PROVISIONAL,
+                    fixedFlag.MATERIAL_PROVISIONAL, // 材料（工程设备）暂估价 不导出
                     fixedFlag.ENGINEERING_ESITIMATE,
                     fixedFlag.LABOUR,
                     fixedFlag.MATERIAL,

web/building_saas/main/js/models/exportStdInterfaceBase.js

@@ -422,6 +422,7 @@ const XML_EXPORT_BASE = (() => {
         for (let engData of projectsData.children) {
             engData.children = sortByNext(engData.children);
         }
+
     }
 
     //转换基数表达式

web/building_saas/pm/js/pm_newMain.js

@@ -669,35 +669,6 @@ const projTreeObj = {
         me.tree.selected = node;
         shareSeleted = node;
         me.preSelection = newSel;
-       /* $(".tools-btn > a").not(".disabled").addClass("disabled");
-        $("#add-engineering-btn").addClass("disabled");
-        $('#add-tender-btn').removeClass('disabled');
-        if(node){
-            switch(node.data.projType) {
-                case projectType.project:
-                    $("#del-btn").removeClass("disabled");
-                    $("#add-engineering-btn").removeClass("disabled");
-                    break;
-                case projectType.folder:
-                    if(!node.children || node.children.length === 0){
-                        $("#del-btn").removeClass("disabled");
-                    }
-                    break;
-                case projectType.engineering:
-                    $("#del-btn").removeClass("disabled");
-                    $("#add-engineering-btn").removeClass("disabled");
-                    break;
-                case projectType.tender:
-                    $("#add-engineering-btn").removeClass("disabled");
-                    $("#move-to-btn").removeClass("disabled");
-                    $("#copy-to-btn").removeClass("disabled");
-                    $("#share-btn").removeClass("disabled");
-                    $("#cooperate-btn").removeClass("disabled");
-                    $("#del-btn").removeClass("disabled");
-                    break;
-            }
-            $("#rename-btn").removeClass("disabled");
-        }*/
     },
     onSelectionChanging: function (sender, args) {
         let me = projTreeObj;
@@ -1879,7 +1850,9 @@ $(document).ready(function() {
     function bindInputs(projInput, engInput, foldInput, renameInput){
         projInput.bind('keypress', function (event) {
             if(event.keyCode === 13){
-                $('#add-proj-next').click();
+                $('#add-proj-next').is(':visible')
+                    ? $('#add-proj-next').click()
+                    : $('#addProjOk').click();
                 return false;
             }
         });