bugs

modules/main/models/ration.js

@@ -18,7 +18,7 @@ class rationModel extends baseModel {
     }
 
     getData (projectID, callback) {
-        ration.find({'$or': [{projectID: projectID, deleteInfo: null}, {projectID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}, '-_id', function(err, datas){
+        ration.find({projectID: projectID}, '-_id', function(err, datas){//{'$or': [{projectID: projectID, deleteInfo: null}, {projectID: projectID, 'deleteInfo.deleted': {$in: [null, false]}}]}
             if (!err) {
                 callback(0, projectConsts.RATION, datas);
             } else {

web/building_saas/main/js/models/ration.js

@@ -393,7 +393,13 @@ var Ration = {
                 return;
             }
             //设置定额库的优先级， 当是清空子目换算时，使用原定额的定额库ID,其它情况再按： 默认先取选中的定额库，如果没有再取default定额库
-            let selectedLib = (cleanzmhs == true && recodes.length > 0)? recodes[0].node.data.libID : sessionStorage.getItem("stdRationLib");
+            let selectedLib = null;
+            if(cleanzmhs == true && recodes.length > 0){
+                //原定额的定额库是补充工料机库，则用补充的库代替，不是的用原始定额库ID
+                selectedLib = recodes[0].node.data.from == "cpt"?rationLibObj.compleRationLibId:recodes[0].node.data.libID;
+            }else {
+                selectedLib =  sessionStorage.getItem("stdRationLib")
+            }
             selectedLib&&selectedLib!='undefined'?libIDs.unshift(selectedLib):libIDs.unshift(defaultLibID);
             for(let r of recodes){
                 let needInstall = false;

web/building_saas/main/js/views/material_calc_view.js

@@ -43,7 +43,7 @@ materialCalcObj = {
             {headerName: "其它\n费用", headerWidth: 60, dataCode: "otherFee", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
             {headerName: "运价增\n加率(%)", headerWidth: 60, dataCode: "freightIncreaseRate", hAlign: "right", dataType: "Number",validator:"number"},//,decimalField:"glj.unitPrice"
             {headerName: "加权\n系数", headerWidth: 60, dataCode: "weightCoe", hAlign: "right", dataType: "Number",validator:"number"},
-            {headerName: "计算式", headerWidth: 170, dataCode: "exp", hAlign: "right", dataType: "Number",getText:'forExp'},//,decimalField:"glj.unitPrice"
+            {headerName: "计算式", headerWidth: 170, dataCode: "exp", hAlign: "left", dataType: "Number",getText:'forExp'},//,decimalField:"glj.unitPrice"
         ],
         view: {
             lockColumns: ["exp"],