zhangweicheng 5 năm trước cách đây
mục cha
commit
897dabe665

+ 0 - 1
web/building_saas/main/js/models/bills.js

@@ -976,7 +976,6 @@ var Bills = {
             if(!billID){
                 billID = uuid.v1();
             }
-            if(!code) code = "BAZF";//2019-07-12  需求的修改,改成计算的时候不判断是否计取,直接按定额下的安装增加费的设置改了需求后,有可能造成选取位置为空的情况,这时code为undefinded
             let data = {
                 ID:billID,
                 projectID: parseInt(projectObj.project.ID()),

+ 4 - 2
web/building_saas/main/js/models/installation_fee.js

@@ -594,9 +594,11 @@ var installation_fee = {
                     billID = rule.billID;
                 }
                 if(!billData){
-                    billData = getBillsByCode(rule.position);
+                    let t_code = rule.position;
+                    if(!t_code) t_code = "BAZF";//2019-07-12  需求的修改,改成计算的时候不判断是否计取,直接按定额下的安装增加费的设置改了需求后,有可能造成选取位置为空的情况,这时code为undefinded
+                    billData = getBillsByCode(t_code);
                     if(!billData){//如果按ID和按code都找不到清单的话,自动生成一个
-                        let newBillData = project.Bills.getNewInstallBillData(rule.position,billID,item.feeType);
+                        let newBillData = project.Bills.getNewInstallBillData(t_code,billID,item.feeType);
                         if(item.feeType == '措施费用'){
                             newBillData.type = billType.BILL;
                         }else if(item.feeType == '分项费用'){