Merge branch 'master' of http://47.92.229.245:8089/r/OlympusSSBG

GWY

2022-04-15 b823c7f3569cf9368e2245846e918f78f32e903a

 force-app/main/default/pages/NewOpportunity.page

@@ -7,14 +7,21 @@
    <script>
        var staticResource = JSON.parse('{!staticResource}');
        var txId = '';
        var DealerSalesStaffNameId = 'Page:mainForm:idSearchSetProduct:j_id53:j_id56:opp_DealerSalesStaffName';
        var DealerServiceId = 'Page:mainForm:idSearchSetProduct:j_id53:j_id62:opp_DealerService';
        // var DealerSalesStaffNameId = 'Page:mainForm:idSearchSetProduct:j_id53:j_id56:opp_DealerSalesStaffName';
        // var DealerServiceId = 'Page:mainForm:idSearchSetProduct:j_id53:j_id62:opp_DealerService';
        var DealerSalesStaffNameId = 'page:form:block:j_id50:6:j_id51:j_id52:1:j_id53';
        var DealerServiceId = 'page:form:block:j_id50:6:j_id51:j_id52:2:j_id53';
        var opportunityAWSDataId = 'Page:mainForm:idSearchSetProduct:j_id53:opportunityAWSDataId';
        function getPIData(){
            let opportunityPayloadList = [];
            let opportunityPIData = new Object();
            opportunityPIData.dealerSalesStaffName = document.getElementById(DealerSalesStaffNameId).value
            opportunityPIData.dealerService = document.getElementById(DealerServiceId).value
            
            if(document.getElementById(DealerSalesStaffNameId)){
                opportunityPIData.dealerSalesStaffName = document.getElementById(DealerSalesStaffNameId).value
            }
            if(document.getElementById(DealerServiceId)){
                opportunityPIData.dealerService = document.getElementById(DealerServiceId).value
            }
            opportunityPayloadList.push(opportunityPIData);
            return JSON.stringify(opportunityPayloadList);
        }
@@ -23,9 +30,15 @@
        new Promise(function(resolve,reject){
            //加密
            let queryPostBack = function(data){
                document.getElementById(DealerSalesStaffNameId).value = data.object[0].dealerSalesStaffName;
                document.getElementById(DealerServiceId).value = data.object[0].dealerService;
                document.getElementById(opportunityAWSDataId).value = data.object[0].dataId;
                if(document.getElementById(DealerSalesStaffNameId)){
                    document.getElementById(DealerSalesStaffNameId).value = data.object[0].dealerSalesStaffName;
                }
                if(document.getElementById(DealerServiceId)){
                    document.getElementById(DealerServiceId).value = data.object[0].dealerService;
                }
                if(document.getElementById(opportunityAWSDataId)){
                    document.getElementById(opportunityAWSDataId).value = data.object[0].dataId;
                }
                txId = data.txId;
                resolve('success');
            };
@@ -40,8 +53,12 @@
        let b = HasError();
        if(b){
            //清空代理商销售担当者名
            document.getElementById(DealerSalesStaffNameId).value=''
            document.getElementById(DealerServiceId).value=''
            if(document.getElementById(DealerSalesStaffNameId)){
                document.getElementById(DealerSalesStaffNameId).value=''
            }
            if(document.getElementById(DealerServiceId)){
                document.getElementById(DealerServiceId).value=''
            }
        }
        AWSService.post(staticResource.transactionUrl, JSON.stringify({
                "txId":txId,