浏览代码

在项目管理定位在分段文件时,右键导出/导入建设项目也有效可用。

zhangweicheng 5 年之前
父节点
当前提交
1de8f7ab32

+ 1 - 0
public/web/sheet/sheet_common.js

@@ -253,6 +253,7 @@ var sheetCommonObj = {
       let treeCol =  setting.treeCol?setting.treeCol:0;
       sheet.suspendPaint();
       sheet.suspendEvent();
+      sheet.setRowCount(data.length);
       for (let col = 0; col < setting.header.length; col++) {
           let hAlign = "left", vAlign = "center";
           if (setting.header[col].hAlign) {

+ 0 - 2
web/building_saas/main/js/views/divide_view.js

@@ -286,7 +286,6 @@ let divideObj = {
   },
   showSelectedBillsDatas:function(datas){
     if(!datas)this.selectedBillsDatas = getSelectedBillsDatas();
-    this.billsSelectedSheet.setRowCount(this.selectedBillsDatas.length);
     sheetCommonObj.showTreeData(this.billsSelectedSheet, this.billsSelectedSetting,this.selectedBillsDatas);
 
     function getSelectedBillsDatas(){
@@ -336,7 +335,6 @@ let divideObj = {
     this.divideSubSpread.setActiveSheetIndex(0);
     this.rationGLJDatas = getTreeRationGLJDatas();
     let rationGLJSheet = this.divideSubSpread.getSheet(0)
-    rationGLJSheet.setRowCount(this.rationGLJDatas.length);
     sheetCommonObj.showTreeData(rationGLJSheet, gljCol.ration_glj_setting,this.rationGLJDatas);
     function getTreeRationGLJDatas(){
       let datas = [];

+ 20 - 10
web/building_saas/pm/js/pm_newMain.js

@@ -392,11 +392,17 @@ const projTreeObj = {
             icon: 'fa-cloud-download',
             disabled: function () {
                 let selectedItem = projTreeObj.tree.selected;
-                return !(selectedItem && selectedItem.data.projType === projectType.project);
+                if(selectedItem) return selectedItem.data.projType === projectType.folder;
+                return true;
             },
             callback: function (key, opt) {
                 //获取当前节点的建设项目ID
-                projTreeObj.exportProject(projTreeObj.tree.selected.data.ID,projTreeObj.tree.selected.data.name);
+                let selectedItem = projTreeObj.tree.selected;
+                let projectNode = selectedItem; //取建设项目节点
+                if(selectedItem.data.projType === projectType.tender){
+                    projectNode = selectedItem.parent;
+                }
+                projTreeObj.exportProject(projectNode.data.ID,projectNode.data.name);
             }
         },
         importProject:{
@@ -405,21 +411,22 @@ const projTreeObj = {
             disabled: function () {
                 let selectedItem = projTreeObj.tree.selected;
                 if(selectedItem){
-                    if(selectedItem.data.projType === projectType.project) return false;//如果是建设项目,可用
+                    //if(selectedItem.data.projType === projectType.project) return false;//如果是建设项目,可用
                     if(selectedItem.data.projType === projectType.folder){//如果是文件夹
                         if(selectedItem.children){
                             if(selectedItem.children.length == 0) return false;//如果文件夹没有子项,可用
                             if(selectedItem.children[0] .projType === projectType.project ) return false;//如果文件夹有子项,并且是建设项目,可用
                         }
+                    }else{//除了文件夹,都可用
+                        return false;
                     }
-                } else {
+
+                } else {//列表为空时可导入
                     return false;
                 }
                 return true;
             },
             callback: function (key, opt) {
-
-
                 $("#confirm-import").hide();
                 $("#import").modal('show');
                 projTreeObj.getUploadToken();
@@ -1647,10 +1654,13 @@ const projTreeObj = {
         if(selectNode && selectNode.data.projType == projectType.folder){
             parent = selectNode;
             next = selectNode.firstChild();
-        }else if(selectNode &&  selectNode.data.projType == projectType.project){
-            parent = selectNode.parent;
-            next = selectNode.nextSibling;
-            updateData["update"] = {query:{ID:selectNode.id()}}
+        }else if(selectNode){
+            let projectNode = null;
+            if(selectNode.data.projType == projectType.project) projectNode = selectNode;
+            if(selectNode.data.projType == projectType.tender)projectNode = selectNode.parent
+            parent = projectNode.parent;
+            next = projectNode.nextSibling;
+            updateData["update"] = {query:{ID:projectNode.id()}}
         } else if (!selectNode) { // 默认在第一位
             parent = selectNode ? selectNode.parent : projTreeObj.tree._root;
             next = selectNode ? selectNode.nextSibling : projTreeObj.tree.firstNode();