李金换
2022-03-28 9b197b7fac92278fb591ea8f4942c7d5687cb5ce
force-app/main/default/pages/SelectAssetEstimateVM.page
@@ -411,8 +411,6 @@
                    strMoney = month * strMoney + month2 * strMoney;
                }
                var b = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contract_No')).value();
                var IsRenewal = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsRenewal')).value();
                // 20220325 ljh add  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start
                var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();
                if(b != ''){
                    conCCount ++;
@@ -431,10 +429,7 @@
                    }
                    //最后结束日+1年
                    lastendDate.setMonth(lastendDate.getMonth() + 12);
                    // 20220325 ljh update  IsRenewal 【委托】配合PBI设备覆盖率的数据准备 start
                    // if (Date.parse(contractStartDate) > Date.parse(lastendDate) ) {
                    if (Date.parse(contractStartDate) > Date.parse(lastendDate) && IsRenewal = true) {
                    // 20220325 ljh update  IsRenewal 【委托】配合PBI设备覆盖率的数据准备 end
                    if (Date.parse(contractStartDate) > Date.parse(lastendDate) ) {
                        oyearCount ++;
                    }
                    // 取联动价格
@@ -521,8 +516,6 @@
                strMoney = month * strMoney + month2 * strMoney;
            }
            var b = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':Contract_No')).value();
            var IsRenewal = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':IsRenewal')).value();
            // 20220325 ljh add  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备
            var LastMContractRecord = j$(escapeVfId('allPage:allForm:allBlock:assetSection:assetTable:' + i + ':LastMContractRecord')).value();
            if(b != ''){
                conCCount ++;
@@ -540,10 +533,7 @@
                }
                //最后结束日+1年
                lastendDate.setMonth(lastendDate.getMonth() + 12);
                // 20220325 ljh update  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start
                // if (Date.parse(contractStartDate) > Date.parse(lastendDate))
                if (Date.parse(contractStartDate) > Date.parse(lastendDate) && IsRenewal = true) {
                // 20220325 ljh update  IsRenewal LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 end
                if (Date.parse(contractStartDate) > Date.parse(lastendDate)) {
                    oyearCount ++;
                }
                // 取联动价格
@@ -632,11 +622,15 @@
        result = '首签合同';
    }else if(firstCCount > 0 && firstCCount == allcount){
        result = '首签合同';
    }else if(oyearCount > 0 && oyearCount == conCCount){
    // 20220328 ljh update  LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start
    // }else if(oyearCount > 0 && oyearCount == conCCount){
    }else if(oyearCount > 0 && oyearCount == conCCount && allcount == oyearCount ){
    // 20220328 ljh update  LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start
        result = '非续签合同(空白期一年以上)';
    }else{
        result = '续签合同';
    }
    console.log(result);
    document.getElementById("allPage:allForm:allBlock:contractInfo:Contract_TypeTXT").innerHTML = result;
    document.getElementById("allPage:allForm:allBlock:contractInfo:Contract_TypeTXTHidden").value = result;
    // 取消酸化水
@@ -1546,9 +1540,6 @@
                               
                                <td class="dataCell" width="70px">
                                    <apex:outputField value="{!ar.rec.CurrentContract_F__r.Maintenance_Contract_No_F__c}" rendered="{!Not(ar.IsManual)}" id="Contract_No"/>
                                    <!-- 20220325 ljh add  LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 start -->
                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__r.Is_Renewal__c}" id="IsRenewal"/>
                                    <!-- 20220325 ljh add start LJPH-C8FB4P【委托】配合PBI设备覆盖率的数据准备 end -->
                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__r.RecordType_DeveloperName__c}" id="LastMContractRecord"/>
                                    <apex:inputField value="{!ar.rec.CurrentContract_F_asset__r.endDateGurantee_Text__c}" id="endDateGurantee_Text" style="display: none" showDatePicker="false"/>
                                    <apex:inputHidden value="{!ar.rec.CurrentContract_F__c}" id="LastMContractID"/>