Browse Source

造价书,下部分“工料机”窗口高度,默认占软件界面高度的1/3

vian 6 years ago
parent
commit
2d7b93d3b3

+ 4 - 0
modules/pm/controllers/pm_controller.js

@@ -663,6 +663,8 @@ module.exports = {
                 for(let proj of receiveProjects){
                     orgUserIDs.push(proj.userID);
                     if (proj.projType === projType.tender) {
+                        // 设置项目类别
+                        proj.valuationType = proj.property.valuationType === 'bill' ? '预算' : '工程量清单';
                         //设置工程专业
                         proj.feeStandardName = proj.property.feeStandardName || '';
                         //设置计税方法
@@ -694,6 +696,8 @@ module.exports = {
                             if (projC.projType === projType.project) {
                                 consProjIDs.push(projC.ID);
                             } else if (projC.projType === projType.tender) {
+                                // 设置项目类别
+                                projC.valuationType = projC.property.valuationType === 'bill' ? '预算' : '工程量清单';
                                 //设置工程专业
                                 projC.feeStandardName = projC.property.feeStandardName || '';
                             }

+ 2 - 2
public/web/slideResize.js

@@ -216,8 +216,8 @@ const SlideResize = (function() {
         let topHeight = getLocalCache(`${module}${eleObj.top.attr('id')}Height`),
             bottomHeight = getLocalCache(`${module}${eleObj.bottom.attr('id')}Height`);
         //默认上下比例
-        const topProp = 5;
-        const bottomProp = 2;
+        const topProp = 2;
+        const bottomProp = 1;
         let topProportion = topProp / (topProp + bottomProp);
         if (topHeight !== null && bottomHeight !== null) {
             topHeight = parseFloat(topHeight);

+ 1 - 1
web/building_saas/pm/html/project-management.html

@@ -558,7 +558,7 @@
                                 <select class="form-control" id="otherFileOptions">
                                     <option>10.9建筑例题内测单价文件</option><!--建设项目下单价文件-->
                                 </select>
-                                <span class="form-text text-muted">你选择的文件将复制一份至新项目,不会影响原建设项目的文件。</span>
+                                <span class="form-text text-muted">您选择的文件将复制一份至当前项目,不会影响原建设项目的文件。</span>
                             </div>
                         </div>