涂煌豪
2022-04-07 ffee9cf95ba62dc86680ddfe4bbfc7fcb51ef1bf
先款后修20220407
2个文件已修改
29 ■■■■■ 已修改文件
force-app/main/default/classes/SelectAssetEstimateVMController.cls 17 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/SelectAssetEstimateVM.page 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/SelectAssetEstimateVMController.cls
@@ -1060,7 +1060,6 @@
        }
        checkedAssets=NumberSort;
        //2021-11-30 fy add LJPH-C8W8FV 置顶 end
        System.debug('thh:' + checkedAssets);
    }
    
    //
@@ -2544,14 +2543,16 @@
            t = this.estimate.Contract_Start_Date__c.addMonths(Integer.valueOf(this.estimate.Contract_Range__c));
            t = t.addDays(-1);
            this.estimate.Contract_End_Date__c = t;
            //以提交报价的时点,锁定经销商的先款状态,decide时不再更新经销商的性质 thh 20220407 start
            //add      wangweipeng                   2021/12/26                     start
            if(String.isNotBlank(this.estimate.Dealer__c)){
                checkDealerId = this.estimate.Dealer__c;
                onChDealerUpdate();
            }else{
                this.estimate.Is_RecognitionModel__c = false;
            }
            // if(String.isNotBlank(this.estimate.Dealer__c)){
            //     checkDealerId = this.estimate.Dealer__c;
            //     onChDealerUpdate();
            // }else{
            //     this.estimate.Is_RecognitionModel__c = false;
            // }
            //add      wangweipeng                   2021/12/26                     end
            //以提交报价的时点,锁定经销商的先款状态,decide时不再更新经销商的性质 thh 20220407 end
            System.debug('---------345----'+this.estimate.Dealer__c+'-------'+this.estimate.Dealer__r.FirstParagraphEnd__c);
            // 位置调整 在1951 line
            // Date createdDate = this.estimate.CreatedDate == null ? System.today() : this.estimate.CreatedDate.date();
@@ -3545,4 +3546,4 @@
    // return returnValue;
    // 2021-09-10 tcm 排序逻辑调整 end
    }
    }
}
force-app/main/default/pages/SelectAssetEstimateVM.page
@@ -57,7 +57,17 @@
            return false;  
        }
    }
        return true;
    // 先款后修-提交报价时如果是先款对象进行提示 thh 20220407 start
    var FirstParagraphEnd = j$(escapeVfId('allPage:allForm:allBlock:contract:FirstParagraphEnd')).val();
    if(FirstParagraphEnd == 'on'){
        if (confirm('本次签约经销商是先款对象,请确认是否提交报价?')) {
            return true;
        }else{
            return false;
        }
    }
    // 先款后修-提交报价时如果是先款对象进行提示 thh 20220407 end
    return true;
}
//add by gwy 2021-01-27 end 提交时的提示框