Merge branch '进口单证+obsap+导入'

fuyu

2023-03-06 042735c4d44e740121dbbb52257617d348a1c391

Merge branch '进口单证+obsap+导入'

# Conflicts:
#	force-app/main/default/classes/AttachmentDisplayControllerTest.cls
#	force-app/main/default/classes/DealerPersonnelController.cls
#	force-app/main/default/classes/DealerPersonnelControllerTest.cls

 force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp

@@ -9,13 +9,15 @@
        <lightning:spinner aura:id="mySpinner" alternativeText='请等待' size="large"  class="slds-spinner_container"/>
    </div>
    <div id="allDivs" >
        <div id="ins" style=" width:1150px;margin-right: 4px; ">
        <div id="ins" style=" width:1000px;margin-right: 4px; ">
            <!-- 显示在明细页的当前明细的表格 -->
            <div id="inTables">
                <!-- <lightning:card> -->
                <aura:set attribute="title">
                    进口单证明细
                </aura:set>
                <label style="float: left;font-size:20px">进口单证明细</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
                <lightning:button variant="neutral" label="返回" title="Cancel" onclick="{! c.rebackDNListPage }" />
                <table class="slds-table slds-table_cell-buffer slds-table_bordered slds-hint-parent slds-no-row-hover " style="border-collapse: collapse;border-color:#D7D7D7;" border="1px " >
                    <thead>
                        <tr class="slds-line-height_reset slds-text-title_caps">
@@ -111,59 +113,13 @@
                                    </th>
                                    <!-- 行项目 第四列  预览链接-->
                                    <!-- <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
                                        <th class="slds-is-resizable" tabindex="-1" data-label="预览链接" style="width: 240px;height: 35px;" rowspan="{!curr.count}">
                                            <span class="slds-grid slds-grid_align-spread" style="text-align: center;display:block;">
                                                <div class="slds-truncate"> -->
                                                    <!-- <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/> -->
                                                    <!-- <a href="{!curr.code}">预览</a>
                                                </div>
                                            </span>
                                        <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">  
                                        </th>
                                    </aura:if> -->
                                    <!-- 行项目 第五列  报关单下载链接-->
                                    <aura:if isTrue="{!IF(curr.code =='国内采购',false,true)}">
                                        <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
                                            <!-- <aura:if isTrue="{!IF(curr.code !='无' ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate"> -->
                                                            <!-- <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/> rowspan="{!curr.count}"-->
                                                            <!-- <a href="{!curr.codeyu}">预览</a>
                                                            &nbsp;&nbsp;&nbsp;
                                                            <a href="{!curr.code}">下载</a>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                            <aura:if isTrue="{!IF(curr.code =='无' ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate"> -->
                                                            <!-- <a href="{!curr.code}">{!curr.code}</a> -->
                                                        <!-- </div>
                                                    </span>
                                                </th>
                                            </aura:if> -->
                                            <aura:if isTrue="{!IF(curr.code =='不出证' ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                            <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                            <aura:if isTrue="{!IF(curr.code !='不出证' ,true,false)}">
                                                <aura:if isTrue="{!IF(AND(curr.code =='',curr.codeyu ==''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/>
                                                            </div>
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.code =='',curr.codeyu !=''),true,false)}">
                                        <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu !='',curr.codeyu.length > 25,curr.code.length > 25),false,true)}">
                                            <!-- 只有预览 -->
                                            <aura:if isTrue="{!IF(AND(curr.codeyu !='',curr.codeyu.length > 25,curr.code ==''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
@@ -172,17 +128,29 @@
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu ==''),true,false)}">
                                            <!-- 只有下载 -->
                                            <aura:if isTrue="{!IF(AND(curr.code !='',curr.code.length > 25,curr.codeyu ==''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&amp;key={!curr.awsKey}&amp;name={!curr.fileName}" target="_blank">下载</a> -->
                                                                <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&amp;key=' + curr.awsKey + '&amp;name=' + curr.fileName}" target="_blank">下载</a>
                                                            </div>
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu !=''),true,false)}">
                                            <!-- 其他情况显示自己  -->
                                            <aura:if isTrue="{!IF(AND(AND(curr.codeyu !='',curr.codeyu.length > 25,curr.code =='') == false , AND(curr.code !='',curr.code.length > 25,curr.codeyu =='')== false) ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                            <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                        </aura:if>
                                        <!-- 预览和下载都有 -->
                                        <aura:if isTrue="{!IF(AND(curr.code !='',curr.codeyu !='',curr.codeyu.length > 25,curr.code.length > 25),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
@@ -193,72 +161,12 @@
                                                    </th>
                                                </aura:if>
                                            </aura:if>
                                        </aura:if>
                                    </aura:if>
                                    <aura:if isTrue="{!IF(curr.code =='国内采购',true,false)}">
                                        <th class="slds-is-resizable" tabindex="-1" data-label="报关单" style="width: 249px;" rowspan="{!curr.count}">
                                            <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                <div class="slds-truncate">
                                                    国内采购
                                                </div>
                                            </span>
                                        </th>
                                    </aura:if>
                                    <!-- 行项目 第六列  商检证下载链接-->
                                    <aura:if isTrue="{!IF(curr.sj_code =='国内采购',false,true)}">
                                        <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
                                            <!-- <aura:if isTrue="{!IF(AND(curr.sj_code !='不出证',curr.sj_code !='') ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
                                                        <div class="slds-truncate"> -->
                                                            <!-- <lightning:formattedText value="{!curr.code}" style="padding-bottom: 3px;"/> -->
                                                            <!-- <a href="{!curr.sj_codeyu}">预览</a>
                                                            &nbsp;&nbsp;&nbsp;
                                                            <a href="{!curr.sj_code}">下载</a>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if> -->
                                            <!-- <aura:if isTrue="{!IF(curr.sj_code =='不出证' ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                            <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/> -->
                                                            <!-- <a href="{!curr.code}">下载</a> -->
                                                        <!-- </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                            <aura:if isTrue="{!IF(AND(curr.sj_code !='不出证',curr.sj_code =='') ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>-->
                                        
                                            <aura:if isTrue="{!IF(curr.sj_code =='不出证' ,true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                            <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                            <aura:if isTrue="{!IF(curr.sj_code !='不出证' ,true,false)}">
                                                <aura:if isTrue="{!IF(AND(curr.sj_code =='',curr.sj_codeyu ==''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/>
                                                            </div>
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.sj_code =='',curr.sj_codeyu !=''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                    <aura:if isTrue="{!IF(curr.count_sj ==null,false,true)}">
                                        <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu !='',curr.sj_code.length > 25,curr.sj_codeyu.length > 25),false,true)}">
                                            <!-- 只有预览 -->
                                            <aura:if isTrue="{!IF(AND(curr.sj_codeyu !='',curr.sj_codeyu.length > 25,curr.sj_code ==''),true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count_sj}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&amp;key={!curr.sj_awsKey}&amp;name={!curr.sj_fileName}" target="_blank">预览</a> -->
@@ -268,8 +176,9 @@
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu ==''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                            <!-- 只有下载 -->
                                            <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_code.length > 25,curr.sj_codeyu ==''),true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count_sj}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&amp;key={!curr.sj_awsKey}&amp;name={!curr.sj_fileName}" target="_blank">下载</a> -->
@@ -278,8 +187,20 @@
                                                        </span>
                                                    </th>
                                                </aura:if>
                                                <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu !=''),true,false)}">
                                                    <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                            <!-- 其他情况显示自己 -->
                                            <aura:if isTrue="{!IF(AND(AND(curr.sj_codeyu !='',curr.sj_codeyu.length > 25,curr.sj_code =='')== false,AND(curr.sj_code !='',curr.sj_code.length > 25,curr.sj_codeyu =='') == false),true,false)}">
                                                <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count_sj}">
                                                    <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                        <div class="slds-truncate">
                                                            <lightning:formattedText value="{!curr.sj_code}" style="padding-bottom: 3px;"/>
                                                        </div>
                                                    </span>
                                                </th>
                                            </aura:if>
                                        </aura:if>
                                        <!-- 预览和下载都有 -->
                                        <aura:if isTrue="{!IF(AND(curr.sj_code !='',curr.sj_codeyu !='',curr.sj_code.length > 25,curr.sj_codeyu.length > 25),true,false)}">
                                            <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count_sj}">
                                                        <span class="slds-grid slds-grid_align-spread" style="width:240px;text-align: center;display:block;">
                                                            <div class="slds-truncate">
                                                                <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&amp;key={!curr.sj_awsKey}&amp;name={!curr.sj_fileName}" target="_blank">预览</a>  |  <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&amp;key={!curr.sj_awsKey}&amp;name={!curr.sj_fileName}" target="_blank">下载</a> -->
@@ -289,17 +210,19 @@
                                                    </th>
                                                </aura:if>
                                            </aura:if>
                                        </aura:if> 
                                    </aura:if>
                                    <!-- </aura:if> -->
                                    <!-- 2023 0208 fy add   报关单商检证新需求，重新判断 start -->
                                    <!-- </aura:if>
                                    <aura:if isTrue="{!IF(curr.sj_code =='国内采购',true,false)}">
                                        <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" rowspan="{!curr.count}">
                                        <th class="slds-is-resizable" tabindex="-1" data-label="商检证" style="width: 249px;" >
                                            <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
                                                <div class="slds-truncate">
                                                    国内采购
                                                    国内采购品
                                                </div>
                                            </span>
                                        </th>
                                    </aura:if>
                                    </aura:if> -->
                                    <!-- 2023 0208 fy add   报关单商检证新需求，重新判断 end -->
                                </tr>
                            </aura:iteration>
                        </tbody>

 force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js

@@ -4,6 +4,12 @@
    },
    doInit : function(cmp, event, helper) {
        // 设置明细页表格的构造
        console.log('hello zhj');
        helper.getFrameNumManage(cmp);
    }
    },
    //20230302 进口单证改造 fy start
    rebackDNListPage: function(cmp, event, helper) {
        helper.rebackDNListPage(cmp);
    },
    //20230302 进口单证改造 fy end
})

 force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js

@@ -1,10 +1,19 @@
/*
 * @Author: Thhto 997058689@qq.com
 * @Date: 2022-11-04 14:53:06
 * @LastEditors: Thhto 997058689@qq.com
 * @LastEditTime: 2023-03-02 17:50:25
 * @FilePath: \ceshihuanj\force-app\main\default\aura\AttachmentDisplay\AttachmentDisplayHelper.js
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
 */
({
    // 获取数据
    getFrameNumManage : function(cmp) {
        debugger
        // this.showSpinner(cmp);
        var action = cmp.get("c.getFrameNumManage");
        var DNId = cmp.get('v.DNId').toString();
        // var DNId = cmp.get('v.DNId').toString();
        var DNId = this.getQueryVariable('DNId');
        action.setParams({
            'DNId' : DNId,
        });
@@ -30,4 +39,22 @@
        var spinner = cmp.find("mySpinner");
        $A.util.addClass(spinner, "slds-hide");
    },
    getQueryVariable: function(variable) { //id字符串
        var query = window.location.search.substring(1);
        var vars = query.split("&");
        for (var i = 0; i < vars.length; i++) {
            var pair = vars[i].split("=");
            if (pair[0] == variable) {
                return pair[1];
            }
        }
        return (false);
    },
    //20230302 进口单证改造 fy start
    rebackDNListPage: function(variable) { //id字符串
        debugger
        var AgencyIDM = this.getQueryVariable('AgencyIDM');
        window.open('/eSignSystem/s/EsignDataEntry?AgencyID='+AgencyIDM+'&pinit=true', '_self');
    },
    //20230302 进口单证改造 fy end
})

 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp

@@ -1,3 +1,11 @@
<!--
 * @Author: Thhto 997058689@qq.com
 * @Date: 2022-07-08 10:47:25
 * @LastEditors: Thhto 997058689@qq.com
 * @LastEditTime: 2023-02-03 15:25:46
 * @FilePath: \ceshihuanj\force-app\main\default\aura\DealerPersonnelInformationImport\DealerPersonnelInformationImport.cmp
 * @Description: 这是默认设置,请设置`customMade`, 打开koroFileHeader查看配置 进行设置: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<aura:component controller="DealerPersonnelController"
implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
access="global">
@@ -28,7 +36,7 @@
    </aura:renderIf>
<!-- 批量添加周报 start-->
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
    <ui:inputText aura:id="articleURL" />
    <!-- <ui:inputText aura:id="articleURL" /> -->
    <div class="demo-only" style="height: 8rem;">
        <div class="slds-notify_container slds-is-relative">
            <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
@@ -37,7 +45,10 @@
                        class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
                        <lightning:icon alternativeText="error" iconName="utility:error" size="small"
                            class="buttonColor slds-m-right_small" />
                        <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
                        <!-- DB202301262139 SFDC经销商人员导入功能改进 start -->
                        <!-- <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2> -->
                        <pre class="slds-text-heading_small ">{!v.errorMessage}</pre>
                        <!-- DB202301262139 SFDC经销商人员导入功能改进 end -->
                    </div>
                </div>
            </div>
@@ -45,7 +56,7 @@
    </div>
</div>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
    <ui:inputText aura:id="articleURL" />
    <!-- <ui:inputText aura:id="articleURL" /> -->
    <div class="demo-only" style="height: 8rem;">
        <div class="slds-notify_container slds-is-relative">
            <div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
@@ -76,7 +87,7 @@
            <aura:set attribute="else">
                <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
                <div class="slds-p-around--large slds-align--absolute-center">
                    <lightning:button label="保存" variant="brand" onclick="{!c.processFileContent}" />
                    <lightning:button aura:id="save_con" label="保存" variant="brand" onclick="{!c.processFileContent}" disabled="false" />
                    <lightning:button label="取消" variant="brand" onclick="{!c.cancel}" />
                </div>


 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js

@@ -1,5 +1,6 @@
({
    readFile: function (component, helper, file) {
        debugger
        if (!file) return;
        if (!file.name.match(/\.(csv||CSV)$/)) {
            return alert('only support csv files');
@@ -78,6 +79,7 @@
        reader.readAsDataURL(file);
    },
    saveRecords: function (component, event, helper) {
        debugger
        component.set('v.login', true);
        var action = component.get("c.processData");
        var fieldsList = ['Name', 'Phone', 'AccountNumber']; //Please write your code dynamic fields
@@ -91,6 +93,7 @@
            if (state === "SUCCESS") {
                var res = response.getReturnValue();
                var res1 = '';
                debugger;
                if (res != 'success') {
                    var ress = res.split('=');
                    console.log(ress);
@@ -102,12 +105,14 @@
                    component.set('v.errorMessage', res1 + "请修改后重新上传");
                    this.showErrorToast(component);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', true); 
                } else {
                    // this.success('导入成功');
                    component.set('v.successMessage', '导入成功');
                    this.showSuccessToast01(component);
                    component.set("v.showMain", true);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', false); 
                }
            }
            else if (state === "INCOMPLETE") {
@@ -145,7 +150,7 @@
        window.setTimeout($A.getCallback(function () {
            $A.util.addClass(component.find('errorDiv'), 'slds-hide');
        }),
            4000
            7000
        );
    },
    success : function(message) {

 force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp

@@ -82,6 +82,9 @@
    <!-- 校验code -->
    <aura:attribute name="code" type="string" default="" />
    <aura:attribute name="decodeCode" type="string" default="" />
    <!-- 20230302 进口单证改造 fy start -->
    <aura:attribute name="AgencyIDM" type="string" default="" />
    <!-- 20230302 进口单证改造 fy end -->


    <aura:attribute name="isLastPage" type="Boolean" default="false" description="是否最后一页，如果是最后一页，那么表格分页的下一页不可用" />
@@ -436,13 +439,12 @@
                            <!-- 行项目 第四列  进口单证明细   fy--> 
                            <!-- 进口单证 fy start  -->
                            <th class="slds-is-resizable" tabindex="-1" data-label="进口单证明细" scope="row">

                                <span class="slds-grid slds-grid_align-spread" style="text-align: center;display:block;">
                                            <div class="slds-truncate">
                                                    <!-- <lightning:formattedText value="{!curr.AttachmentName}" /> -->
                                                    <!-- <a href="https://sfpi-mebg-test.olympuschina.com:8081/stg/api/file/preview?key=20220419/8cf583ab71c94eee96da7bbfcc1b376b.html">附件名1</a> -->
                                                    <button tabindex="-1" class="slds-button ReturnButton" style="width: 40px;" name="{!curr.Id}" onclick="{!c.showAttachmentDisplay}">查看</button>
                                                    <!-- <a onclick="{!c.showAttachmentDisplay}">查看</a> -->
                                                    <!-- <a href="{!'/eSignSystem/s/AttachmentDisplay?DNId='+ curr.Id}" target="_blank">查看</a> -->
                                                    <!-- <a href="https://ocsm stagefull.sandbox.file.force.com/servlet/servlet.FileDownload?file=00P1000001QkhvQ">{!curr.AttachmentName}</a> -->
                                            </div>
                                        </span>

 force-app/main/default/aura/eSignHomePage/eSignHomePageController.js

@@ -84,10 +84,11 @@
    },
    // 进口单证 fy start
    showAttachmentDisplay: function(cmp, event, helper) {
        helper.showAttachmentDisplay(cmp, event);
        // helper.showAttachmentDisplay(cmp, event);
        helper.showAttachmentDisplay2(cmp, event);
    },
    rebackDNListPage: function(cmp, event, helper) {
        helper.rebackDNListPage(cmp, event);
    }
    },
    // 进口单证 fy end
})

 force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js

@@ -1,6 +1,6 @@
({
    init: function(cmp, event) {

        debugger
        // 创建Base64对象
        var Base64 = {
            _keyStr: "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789+/=",
@@ -84,9 +84,13 @@
        };

        //判断url是否有参数
        debugger
        var flag = this.getURLISTrueParameter();
        //参数对象map
        var paramValue = this.getURLParameterValue();
        //20230302 进口单证改造 fy start
        // var paramValue = this.getURLParameterValue();
        var paramValue = this.getURLParameterValue(cmp);
        //20230302 进口单证改造 fy end
        //参数对象map的长度
        var length = Object.keys(paramValue).length;

@@ -222,11 +226,25 @@

            //解码后的管理编码
            cmp.set("v.decodeCode", code.replace(reg, "$2"));
            //20230302 进口单证改造 fy start
            //隐藏检索页
            cmp.set("v.DNNameInput", true);
            // cmp.set("v.DNNameInput", true);
            //20230302 进口单证改造 fy start
            //显示首页
            cmp.set('v.buttonGroup', false);

            //20230302 进口单证改造 fy start
            if(paramValue.pinit=='true'){
                cmp.set("v.DNNameInput", false);
                cmp.set("v.code", code.replace(reg, "$2"));
                cmp.set('v.allWidth', document.documentElement.clientWidth - 40);
                cmp.set('v.floatWidth', document.documentElement.clientWidth * 0.85);
                cmp.set('v.floatWidth1', document.documentElement.clientWidth);
                console.log('floatWidth:' + document.documentElement.clientWidth * 0.85);
                this.getAccountHandler(cmp);
            }else{
                cmp.set("v.DNNameInput", true);
            }
            //20230302 进口单证改造 fy end

        }
        //判断DNName是否为空 不为空则隐藏检索页
@@ -1029,14 +1047,21 @@
        // add slds-hide class from mySpinner
        var spinner = cmp.find("mySpinner");
        $A.util.addClass(spinner, "slds-hide");
    },
    getURLParameterValue: function() {
    }, //20230302 进口单证改造 fy start
    getURLParameterValue: function(cmp) {
    // getURLParameterValue: function() {
       //20230302 进口单证改造 fy end

        var querystring = location.search.substr(1);
        var querystring = window.location.search.substr(1);
        var paramValue = {};
        querystring.split("&").forEach(function(part) {
            var param = part.split("=");
            paramValue[param[0]] = decodeURIComponent(param[1]);
            //20230302 进口单证改造 fy start
            if(param[0]=='AgencyID'){
                cmp.set("v.AgencyIDM", param[1]);
            }
            //20230302 进口单证改造 fy end
        });

        //console.log('paramValue-' + paramValue);
@@ -1044,7 +1069,7 @@
    },
    getURLISTrueParameter: function() {

        var url = location.search;
        var url = window.location.search;
        var flag;
        if (url.indexOf("?") != -1) {
            flag = true;
@@ -1445,7 +1470,15 @@
        debugger
        cmp.set('v.AttachmentDisplayflag', false);
        cmp.set('v.DNListPage', true);
    }
    },
    showAttachmentDisplay2: function(cmp, event) {
        debugger
        var DNId = event.target.name;
        //20230302 进口单证改造 fy start
        var AgencyIDM = cmp.get('v.AgencyIDM');
        window.open('/eSignSystem/s/AttachmentDisplay?DNId=' + DNId+'&AgencyIDM='+AgencyIDM, '_blank');
        //20230302 进口单证改造 fy end
    },
    // 进口单证 fy end

})

 force-app/main/default/classes/AttachmentDisplayControllerTest.cls

@@ -194,12 +194,20 @@
        FrameNumManage1.Material__c = 'wuliaoceshi';
        FrameNumManage1.MaterialDepict__c = 'wuliaomiaoshu';
        FrameNumManage1.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage1.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage1;

        FrameNumManage__c FrameNumManage2 = new FrameNumManage__c();
        FrameNumManage2.Name = '测试2';
<<<<<<< HEAD
        FrameNumManage2.ManagementCode__c ='KVZFI';
=======
        FrameNumManage2.ManagementCode__c ='KVZFI2';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage2.ApplyList__c = 'ceshiyi2';
        FrameNumManage2.Num__c = 2;
        FrameNumManage2.SerialNumber__c = '22R';
@@ -212,7 +220,11 @@
        insert FrameNumManage2;
        FrameNumManage__c FrameNumManage3 = new FrameNumManage__c();
        FrameNumManage3.Name = '测试3';
<<<<<<< HEAD
        FrameNumManage3.ManagementCode__c ='KVZFI';
=======
        FrameNumManage3.ManagementCode__c ='KVZFI3';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage3.ApplyList__c = 'ceshiyi2';
        FrameNumManage3.Num__c = 2;
        FrameNumManage3.SerialNumber__c = '22R';
@@ -233,6 +245,10 @@
        FrameNumManage4.MaterialDepict__c = 'wuliaomiaoshu4';
        FrameNumManage4.signInForm__c = eSignForm.Id;
        FrameNumManage4.Asset__c = ast.Id;
<<<<<<< HEAD
=======
        FrameNumManage4.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage4;

@@ -246,6 +262,10 @@
        FrameNumManage5.MaterialDepict__c = 'wuliaomiaoshu5';
        FrameNumManage5.InspectionCard__c = '不出证';
        FrameNumManage5.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage5.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage5;

@@ -259,6 +279,10 @@
        FrameNumManage6.MaterialDepict__c = 'wuliaomiaoshu6';
        FrameNumManage6.InspectionCard__c = 'ceshiyi2';
        FrameNumManage6.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage6.ApplyList_Select__c =FileName1.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage6;

@@ -277,7 +301,11 @@

        FrameNumManage__c FrameNumManage8 = new FrameNumManage__c();
        FrameNumManage8.Name = '测试8';
<<<<<<< HEAD
        FrameNumManage8.ManagementCode__c ='KVZFI5';
=======
        FrameNumManage8.ManagementCode__c ='KVZFI8';
>>>>>>> 进口单证+obsap+导入
        FrameNumManage8.ApplyList__c = 'ceshiyi8';
        FrameNumManage8.Num__c = 2;
        FrameNumManage8.SerialNumber__c = '22R';
@@ -285,6 +313,11 @@
        FrameNumManage8.MaterialDepict__c = 'wuliaomiaoshu5';
        FrameNumManage8.InspectionCard__c = 'ceshiyi1';
        FrameNumManage8.signInForm__c = eSignForm.Id;
<<<<<<< HEAD
=======
        FrameNumManage8.ApplyList_Select__c =FileName1.Id;
        FrameNumManage8.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage8;

@@ -298,6 +331,11 @@
        FrameNumManage9.MaterialDepict__c = 'wuliaomiaoshu9';
        FrameNumManage9.InspectionCard__c = '';
        FrameNumManage9.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage9.ApplyList_Select__c =FileName1.Id;
        FrameNumManage9.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage9;
        FrameNumManage__c FrameNumManage10 = new FrameNumManage__c();
@@ -310,6 +348,11 @@
        FrameNumManage10.MaterialDepict__c = 'wuliaomiaoshu10';
        FrameNumManage10.InspectionCard__c = '';
        FrameNumManage10.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage10.ApplyList_Select__c =FileName1.Id;
        FrameNumManage10.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage10;

@@ -323,6 +366,11 @@
        FrameNumManage11.MaterialDepict__c = 'wuliaomiaoshu11';
        FrameNumManage11.InspectionCard__c = '';
        FrameNumManage11.signInForm__c = eSignForm1.Id;
<<<<<<< HEAD
=======
        FrameNumManage11.ApplyList_Select__c =FileName1.Id;
        FrameNumManage11.InspectionCard_Select__c =FileName2.Id;
>>>>>>> 进口单证+obsap+导入

        insert FrameNumManage11;


 force-app/main/default/classes/DealerPersonnelController.cls

@@ -86,6 +86,7 @@
                            inputList.add(inputValues);
                            
                            //导入的数据
<<<<<<< HEAD
                            System.debug('inputValues[0]===============>'+ inputValues[0]);
                            System.debug('inputValues[1]===============>'+ inputValues[1]);
                            System.debug('inputValues[2]===============>'+ inputValues[2]);
@@ -104,6 +105,26 @@
                            System.debug('inputValues[14]===============>'+ inputValues[14]);
                            System.debug('inputValues[15]===============>'+ inputValues[15]);
                            System.debug('inputValues[16]===============>'+ inputValues[16]);
=======
                            // System.debug('inputValues[0]===============>'+ inputValues[0]);
                            // System.debug('inputValues[1]===============>'+ inputValues[1]);
                            // System.debug('inputValues[2]===============>'+ inputValues[2]);
                            // System.debug('inputValues[3]===============>'+ inputValues[3]);
                            // //SWAG-CEW85A 【委托】消耗品&DAMS系统经销商人员管理——信息完善；fy start
                            // System.debug('inputValues[4]===============>'+ inputValues[4]);
                            // System.debug('inputValues[5]===============>'+ inputValues[5]);
                            // System.debug('inputValues[6]===============>'+ inputValues[6]);
                            // System.debug('inputValues[7]===============>'+ inputValues[7]);
                            // System.debug('inputValues[8]===============>'+ inputValues[8]);
                            // System.debug('inputValues[9]===============>'+ inputValues[9]);
                            // System.debug('inputValues[10]===============>'+ inputValues[10]);
                            // System.debug('inputValues[11]===============>'+ inputValues[11]);
                            // System.debug('inputValues[12]===============>'+ inputValues[12]);
                            // System.debug('inputValues[13]===============>'+ inputValues[13]);
                            // System.debug('inputValues[14]===============>'+ inputValues[14]);
                            // System.debug('inputValues[15]===============>'+ inputValues[15]);
                            // System.debug('inputValues[16]===============>'+ inputValues[16]);
>>>>>>> 进口单证+obsap+导入
                            //SWAG-CEW85A 【委托】消耗品&DAMS系统经销商人员管理——信息完善；fy end
                            
                        }
@@ -115,7 +136,14 @@
                Map<Id,String> ManagementCodeMap = new Map<Id,String>();
                List<Id> AccountIdList =new  List<Id>();
                //SWAG-CEW85A 【委托】消耗品&DAMS系统经销商人员管理——信息完善；fy end
<<<<<<< HEAD
                List<Account> accountList = [select id, Name,Management_Code__c from Account where Management_Code__c in: managementCodeList and Name in:CustomerNameList ];
=======
                System.debug('managementCodeList===============>'+ managementCodeList);
                System.debug('CustomerNameList===============>'+ CustomerNameList);
                List<Account> accountList = [select id, Name,Management_Code__c from Account where Management_Code__c in: managementCodeList and Name in:CustomerNameList];
                System.debug('iaccountList===============>'+ accountList);
>>>>>>> 进口单证+obsap+导入
                for(Account ac : accountList){ 
                    accountIdMap.put(ac.Management_Code__c,ac);
                    //SWAG-CEW85A 【委托】消耗品&DAMS系统经销商人员管理——信息完善；fy start

 force-app/main/default/classes/DealerPersonnelControllerTest.cls

@@ -8,9 +8,18 @@
            insert account1;
        }
        @isTest public static void selectProductCcategoryTest() {
            testInit();
            Test.startTest();
<<<<<<< HEAD
            String reports = DealerPersonnelController.processData('"姓名,手机,电子邮件,经销商编码,客户名,经销商用户,人员管理编码,经销商专员类型,入职年份,GIR认证级别,GIR认证时间,SP认证级别,SP认证时间,ET认证级别,ET认证时间,ENG认证级别,ENG认证时间\r\n小王,18801332211,123@qq.com,737011,启稳起步,TRUE,C000125941,SP专员,2021/1/7,A,2022/1/7,A,2019/1/7,A,2021/2/7,B,2020/1/7\r\n','',null);
=======
            testInit();
            String reports = DealerPersonnelController.processData('"姓名,手机,电子邮件,经销商编码,客户名,经销商用户,人员管理编码,经销商专员类型,入职年份,GIR认证级别,GIR认证时间,SP认证级别,SP认证时间,ET认证级别,ET认证时间,ENG认证级别,ENG认证时间\r\n小王,18801332211,123@qq.com,737011,启稳起步,TRUE,C000125941,SP专员,2021/1/7,A,2022/1/7,A,2019/1/7,A,2021/2/7,B,2020/1/7\r\n','',null);
            String reports2 = DealerPersonnelController.processData('"姓名,手机,电子邮件,经销商编码,客户名,经销商用户,人员管理编码,经销商专员类型,入职年份,GIR认证级别,GIR认证时间,SP认证级别,SP认证时间,ET认证级别,ET认证时间,ENG认证级别,ENG认证时间\r\n小王,18801332211,123@qq.com,737011,test1医院,TRUE,,SP专员,2021/1/7,A级,2022/1/7,A级,2019/1/7,A级,2021/2/7,B级,2020/1/7\r\n','',null);
            List<Contact> data = new List<Contact>();
            DealerPersonnelController.updateContact(data);
            Boolean a= DealerPersonnelController.VerificationDateType('');
            Date b = DealerPersonnelController.ConversionDateType('');
>>>>>>> 进口单证+obsap+导入
            Test.stopTest();
        }
        @isTest public static void selectProductCcategoryTest01() {