From f7dffb669b42852e90ff91b6362a07e3a88945b0 Mon Sep 17 00:00:00 2001 From: fuyu <fuyu@prec-tech.com> Date: 星期四, 05 一月 2023 14:37:17 +0800 Subject: [PATCH] 进口单证补充 --- force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp | 56 +++++++++++++++++++++++++++++++++++++++++++++++++++++--- 1 files changed, 53 insertions(+), 3 deletions(-) diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp b/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp index 7f781c4..0520695 100644 --- a/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp +++ b/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}鍗曘�侱N鍙�(妯$硦妫�绱�) + <td align="left">鍏辫{!v.lineItemSize}鍗曘�侱N鍙�/鍚堝悓鍙锋绱�(妯$硦妫�绱�) <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> + <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> \ No newline at end of file -- Gitblit v1.9.1