fuyu
2023-01-05 f7dffb669b42852e90ff91b6362a07e3a88945b0
进口单证补充
4个文件已修改
161 ■■■■■ 已修改文件
force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp 56 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/eSignHomePage/eSignHomePageController.js 13 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js 53 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/classes/eSignHomePageController.cls 39 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp
@@ -57,6 +57,9 @@
    <aura:attribute name="buttonGroup" type="Boolean" default="false" />
    <aura:attribute name="eSignForm" type="object" />
    <aura:attribute name="DNName" type="string" default="" />
    <!-- 进口单证 fy start  -->
    <aura:attribute name="DNId" type="string" default="" />
    <!-- 进口单证 fy end  -->
    <aura:attribute name="errorMessage" type="String" description="失败消息" />
    <!-- 判断直销还是分销 -->
    <aura:attribute name="isDirectSales" type="Boolean" default="" description="判断直销还是分销" />
@@ -95,6 +98,7 @@
    <aura:attribute name="QRWidth" type="String" description="用来从父对象接收传递过来的屏幕宽度" default="" />
    <aura:attribute name="QRHeight" type="String" description="用来从父对象接收传递过来的屏幕宽度" default="" />
    <aura:attribute name="ShowDNNameQR" type="String" description="判断返回是否可以打印" default="" />
    <aura:attribute name="AttachmentDisplayflag" type="boolean" default="false" />
    <!-- 返回首页 start -->
    <aura:attribute name="agencyDNSignUpStatus" type="String" default="" description="DN签收状态(经销商)" />
@@ -170,7 +174,7 @@
                <div class="slds-float_center" style="text-align:left">
                    <tr>
                        <!--  style="{!'padding-left:'+v.floatWidth*0.2+'px;'}" 请选择您需要签收的-->
                        <td align="left">共计{!v.lineItemSize}单。DN号(模糊检索)
                        <td align="left">共计{!v.lineItemSize}单。DN号/合同号检索(模糊检索)
                            <input id="searchInput" lightning-input_input="" type="text" class="slds-input" value="{!v.searchCase}" name="" onchange="{!c.searchByDNName}" style="{!'width:'+v.floatWidth*0.3+'px;'}" />
                        </td>
@@ -186,7 +190,8 @@
                </div>
            </div>
            <div id="allDiv" style="{!'width:'+v.floatWidth+'px;overflow-x:scroll;'}">
                <div id="in" style=" width:1012px;margin-right: 4px; ">
                <!-- 增加列的时候记得调试这个宽度 -->
                <div id="in" style=" width:1121px;margin-right: 4px; ">
                    <!-- 显示在明细页的当前明细的表格 -->
                    <div id="inTable">
                        <!-- <lightning:card> -->
@@ -279,6 +284,22 @@
            </th>
            <!-- 第七列  进口单证明细 fy-->
            <!-- 进口单证 fy start  -->
            <th class="slds-is-resizable" tabindex="-1" data-label="进口单证明细" scope="row" style="width: 110px;height: 35px;">
                <span class="slds-grid slds-grid_align-spread" style="text-align: center;display:block;">
                                        <div class="slds-truncate">
                                                <span title="进口单证明细" class="slds-truncate" style="padding-bottom: 3px;">进口单证明细</span>
                </div>
                </span>
            </th>
            <!-- 进口单证 fy end  -->
            <!-- 第七列 二维码 -->
            <th class="slds-is-resizable" tabindex="-1" data-label="医院签收二维码" scope="row" style="width: 140px;height: 35px;text-align: center;">
@@ -412,10 +433,29 @@
                            </th>
                            <!-- 行项目 第四列  进口单证明细   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="https://ocsm stagefull.sandbox.file.force.com/servlet/servlet.FileDownload?file=00P1000001QkhvQ">{!curr.AttachmentName}</a> -->
                                            </div>
                                        </span>
                            </th>
                            <!-- 进口单证 fy end  -->
                            <!-- 行项目 第七列  医院签收二维码-->
                            <th class="slds-is-resizable" tabindex="-1" data-label="" scope="row" style="text-align: center;">
                                <button id="{!curr.skip_Hospital_Sign__c}" tabindex="-1" class="slds-button ReturnButton" name="{!curr.DNNameNo0__c}" style="width: 40px;" value="{!curr.agencySignUpDate__c}" onclick="{!c.showESignQR}">查看</button>
                                <button id="{!curr.skip_Hospital_Sign__c}" tabindex="-1" class="slds-button ReturnButton" name="{!curr.DNNameNo0__c}" style="width: 40px;" value="{!IF(curr.skip_Distribution_Sign__c, 'true', curr.agencySignUpDate__c)}" onclick="{!c.showESignQR}">查看
                                </button>
                            </th>
@@ -637,4 +677,14 @@
    </aura:if>
    <!-- </div> -->
    <!-- 进口单证 fy start  -->
    <aura:if isTrue="{!v.AttachmentDisplayflag}">
        <!--  医院确认 -->
        <label style="float: left;font-size:20px">进口单证明细</label>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;
        <lightning:button variant="neutral" label="返回" title="Cancel" onclick="{! c.rebackDNListPage }" />
        <!-- <lightning:button variant="neutral"  onclick="{!c.rebackDNListPage}">返回</button> -->
        <c:AttachmentDisplay  DNId="{!v.DNId}" />
    </aura:if>
    <!-- 进口单证 fy end  -->
</aura:component>
force-app/main/default/aura/eSignHomePage/eSignHomePageController.js
@@ -2,8 +2,8 @@
 * @Description: 
 * @Author: wql
 * @Date: 2021-05-24 09:45:19
 * @LastEditTime: 2021-08-03 15:44:33
 * @LastEditors:
 * @LastEditTime: 2022-11-07 17:40:15
 * @LastEditors: Thhto 997058689@qq.com
 */
({
    init: function(cmp, event, helper) {
@@ -81,6 +81,13 @@
    },
    testIn: function(cmp, event, helper) {
        helper.testIn(cmp, event);
    },
    // 进口单证 fy start
    showAttachmentDisplay: function(cmp, event, helper) {
        helper.showAttachmentDisplay(cmp, event);
    },
    rebackDNListPage: function(cmp, event, helper) {
        helper.rebackDNListPage(cmp, event);
    }
    // 进口单证 fy end
})
force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
@@ -528,16 +528,31 @@
                    //如果签收单录入表有数据,先取录入表的否则就检索签收单信息
                    var result;
                    //存放录入表list
                    var eSignFormEntryList;
                    var eSignFormEntryList=[];
                    //存放签收单list
                    var eSignFormList;
                    var eSignFormList=[];
                    //fy 20220727 start
                    //存放附件名
                    var AttachmentMap = new Map();
                    //fy 20220727 end
                    if (res) {
                        if (res.eSignFormEntryList != null) {
                        if (res.eSignFormEntryList != undefined) {
                            eSignFormEntryList = res.eSignFormEntryList;
                        }
                        if (res.eSignFormList != null) {
                        if (res.eSignFormList != undefined) {
                            eSignFormList = res.eSignFormList;
                        }
                        //fy 20220727 start
                        if (res.AttachmentStringList!=undefined) {
                            for(var i = 0; i < res.AttachmentStringList.length; i++){
                                var liststr=[];
                                liststr=res.AttachmentStringList[i].split('_');
                                if(liststr.length>0){
                                    AttachmentMap.set(liststr[0],liststr[1]);
                                }
                            }
                        }
                        //fy 20220727 end
                        var today = this.getNowFormatDate();
                        if (eSignFormEntryList) {
                            for (var i = 0; i < eSignFormList.length; i++) {
@@ -583,6 +598,18 @@
                    }
                    var pageSize = cmp.get('v.pageSize');
                    //fy 20220727 start
                    debugger
                    if(res){
                        if(AttachmentMap.size>0){
                            for(var i = 0; i < result.length; i++){
                                if(AttachmentMap.has(result[i].Id)){
                                    result[i].AttachmentName=AttachmentMap.get(result[i].Id);
                                }
                            }
                        }
                    }
                    //fy 20220727 end
                    cmp.set("v.data", result);
                    var data = result;
                    cmp.set("v.lineItemSize", data.length);
@@ -1129,7 +1156,7 @@
    },
    //js 模糊检索
    filterByName: function(aim, name) {
        return aim.filter(item => item.DNNameNo0__c.match(name));
        return aim.filter(item => item.DNNameNo0__c.match(name)||item.ContractNO__c.match(name));
    },
    openESignPage: function(cmp, event) {
        //获取按钮中属性name  ==  获取参数 箱号
@@ -1405,8 +1432,20 @@
        });
        $A.enqueueAction(action);
    },
    // 进口单证 fy start
    showAttachmentDisplay: function(cmp, event) {
        debugger
        var DNId = event.target.name;
        cmp.set('v.DNId', DNId);
        cmp.set('v.AttachmentDisplayflag', true);
        cmp.set('v.DNListPage', false);
    },
    rebackDNListPage: function(cmp, event) {
        debugger
        cmp.set('v.AttachmentDisplayflag', false);
        cmp.set('v.DNListPage', true);
    }
    // 进口单证 fy end
})
force-app/main/default/classes/eSignHomePageController.cls
@@ -137,7 +137,6 @@
        } catch (Exception ex) {
            return null;
        }
        //new 
        eSignWrapperList eWList = new eSignWrapperList();
        //先判断有没有中间表 没有则赋值为空
@@ -153,8 +152,30 @@
        }else{
            eWList.eSignFormEntryList = null;
        }
        system.debug('ceshi4+++'+tempEsignFormList);
        if(tempEsignFormList.size() > 0){
            //fy 20220727 start
            List<Id> eSignFormId = new List<Id>();
            for(eSignForm__c es:tempEsignFormList){
                eSignFormId.add(es.Id);
            }
            List<Attachment> AttachmentList= new  List<Attachment>();
            AttachmentList =[select Id,name,ParentId from Attachment where ParentId in:eSignFormId];
            Map<String,String> AttachmentMap = new Map<String,String>();
            List<String> AttachmentStringList = new List<String>();
            if(AttachmentList.size() > 0){
                for(Attachment  Att:AttachmentList){
                    AttachmentMap.put(Att.ParentId, Att.ParentId+'_'+Att.name);
                }
                for (String value : AttachmentMap.values()) {
                    AttachmentStringList.add(value);
                }
            }
            system.debug('ceshi1+++'+AttachmentList);
            system.debug('ceshi2+++'+AttachmentStringList);
            system.debug('ceshi3+++'+eSignFormId);
            //fy 20220727 end
            for(eSignForm__c esf:tempEsignFormList){
                if(esf.endUser__c =='契約'){
                    esf.Hospital_Name_Text__c = esf.CustomerNameContract__c;
@@ -163,6 +184,11 @@
                }
            }
            eWList.eSignFormList = tempEsignFormList;
            //fy 20220727 start
            if(AttachmentStringList.size()>0){
                eWList.AttachmentStringList = AttachmentStringList;
            }
            //fy 20220727 end
        }else{
            eWList.eSignFormList = null;
        }
@@ -219,6 +245,7 @@
        //判断传入的类型
        @AuraEnabled
        public String entryType;
        public eSignWrapper(Boolean isAgencySubmit,Boolean isHPSubmit,String entryType){
            eSignFormEntry = new eSignFormEntry__c();
            eSignForm = new eSignForm__c();
@@ -236,10 +263,16 @@
        @AuraEnabled
        public List<eSignForm__c> eSignFormList;
        //fy 20220727 start
        @AuraEnabled
        public List<String> AttachmentStringList;
        //fy 20220727 end
        public eSignWrapperList(){
            eSignFormEntryList = new List<eSignFormEntry__c>();
            eSignFormList = new List<eSignForm__c>();
            //fy 20220727 start
            List<String> AttachmentStringList = new List<String>();
            //fy 20220727 end
        }
    }