Merge branch 'master' of http://192.168.1.41:3000/SmartCost/ConstructionCost

modules/pm/models/project_property_template.js

@@ -6,7 +6,7 @@
 const defaultDecimal = {
     bills: { unitPrice: 2, totalPrice: 2 },
     ration: { quantity: 4, unitPrice: 2, totalPrice: 2 },
-    glj: { quantity: 4, unitPriceHasMix: 2, unitPrice: 3 },
+    glj: { quantity: 4, unitPriceHasMix: 2, unitPrice: 2 },
     feeRate: 3,
     quantity_detail: 4,
     material: 5,//三材系数

web/building_saas/main/html/main.html

@@ -436,7 +436,7 @@
                               </div>
                             </div>
                           </div>
-                          <div class="p-0" id="ruleDiv" style="width: 10%; float: left;">
+                          <!-- <div class="p-0" id="ruleDiv" style="width: 10%; float: left;">
                             <div class="p-0" id="openTypeSetting">
                               <div class="tn-nav d-flex align-items-start flex-column" data-toggle="tooltip"
                                 data-placement="left" title="" data-original-title="打开排版规则">
@@ -533,7 +533,7 @@
                                 </div>
                               </div>
                             </div>
-                          </div>
+                          </div> -->
                         </div>
                       </div>
                       <div class="main-data-bottom ovf-hidden qdjl" id="qdzy" style="float: left">

web/building_saas/main/js/views/project_property_decimal_view.js

@@ -9,7 +9,7 @@ let defaultDecimal = {
     _def: {//editable: 开放给用户编辑的
         bills: {editable: true, data: {unitPrice: 2, totalPrice: 2}},
         ration: {editable: true, data: {quantity: 4, unitPrice: 2, totalPrice: 2}},
-        glj: {editable: true, data: {quantity: 4, unitPriceHasMix: 2, unitPrice: 3}},
+        glj: {editable: true, data: {quantity: 4, unitPriceHasMix: 2, unitPrice: 2}},
         material: {editable: false, data: 5},
         feeRate: {editable: true, data: 3},
         quantity_detail: {editable: false, data: 4},

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

@@ -2604,6 +2604,8 @@ $('#property_default').click(function () {
     //清单精灵/指引窗口比例
     removeLocalCache('stdBillsGuidanceTabmainWidth');
     removeLocalCache('stdBillsGuidanceTabmainSideWidth');
+    // 清单展开状态
+    window.sessionStorage.removeItem('stdBillsGuidanceExpState');
     //定额库窗口比例
     removeLocalCache('stdRationTabmainWidth');
     removeLocalCache('stdRationTabmainSideWidth');

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

@@ -343,7 +343,8 @@ function initTznrWidth(){
         contentPercent = contentPercent * 100 + '%';
     }
     //设置特征及内容与排版规则的比例
-    $('#contentDiv').css('width', contentPercent);
+    // $('#contentDiv').css('width', contentPercent);
+    $('#contentDiv').css('width', '100%');
     $('#ruleDiv').css('width', addRulePercent);
 }
 

web/building_saas/pm/js/pm_newMain.js

@@ -426,14 +426,23 @@ 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;
             },
             /* visible:function () {
              return false
              },*/
             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.engineering){
+                    projectNode = selectedItem.parent;
+                }
+                if(selectedItem.data.projType === projectType.tender){
+                    projectNode = selectedItem.parent.parent;
+                }
+                projTreeObj.exportProject(projectNode.data.ID,projectNode.data.name);
             }
         },
         importProject:{
@@ -442,14 +451,16 @@ 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;
@@ -1677,10 +1688,14 @@ 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.engineering) projectNode = selectNode.parent;
+            if(selectNode.data.projType == projectType.tender)projectNode = selectNode.parent.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();

web/building_saas/unit_price_file/index.js

@@ -390,7 +390,7 @@ let unitPriceObj = {
   getPrice:function(pricefield,unitprice){
     let quantity = 3;
     let unitPriceHasMix = 2;
-    let unitPrice = 3;
+    let unitPrice = 2;
     let process_decimal = 6;
     let uIndex = gljUtil.getIndex(unitprice);
     if(mixRatioMap[uIndex] && mixRatioMap[uIndex].length > 0){