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

fuyu

2023-03-06 042735c4d44e740121dbbb52257617d348a1c391

 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>