From 042735c4d44e740121dbbb52257617d348a1c391 Mon Sep 17 00:00:00 2001
From: fuyu <fuyu@prec-tech.com>
Date: 星期一, 06 三月 2023 13:39:38 +0800
Subject: [PATCH] Merge branch '进口单证+obsap+导入'
---
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js | 29 ++
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js | 7
force-app/main/default/classes/DealerPersonnelControllerTest.cls | 11
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp | 549 ++++++++++++++++++------------------------
force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js | 51 +++
force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp | 19 +
force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp | 6
force-app/main/default/classes/DealerPersonnelController.cls | 28 ++
force-app/main/default/aura/eSignHomePage/eSignHomePageController.js | 5
force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js | 8
force-app/main/default/classes/AttachmentDisplayControllerTest.cls | 48 +++
11 files changed, 427 insertions(+), 334 deletions(-)
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp
index c21f55e..3f26d9a 100644
--- a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp
+++ b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplay.cmp
@@ -1,316 +1,239 @@
<aura:component implements="flexipage:availableForAllPageTypes,forceCommunity:availableForAllPageTypes,lightning:isUrlAddressable" access="global" controller="AttachmentDisplayController">
- <aura:attribute name="DNId" type="String"
- description="鐢ㄦ潵浠庣埗瀵硅薄鎺ユ敹浼犻�掕繃鏉ョ殑绛炬敹鍗昳d"
- default=""/>
- <aura:handler name="init" action="{!c.doInit}" value="{!this}"
- description="鍒濆鍖栨柟娉�"/>
- <aura:attribute name="currentData" type="Object[]" description="鏄庣粏椤靛綋鍓嶆樉绀虹殑鏄庣粏鐨勪俊鎭�" />
- <div>
- <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="inTables">
- <!-- <lightning:card> -->
- <aura:set attribute="title">
- 杩涘彛鍗曡瘉鏄庣粏
- </aura:set>
- <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">
- <!-- 绗竴鍒� 浜у搧鏄庣粏 -->
- <!-- <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row">
- <span class="slds-grid slds-grid_align-spread" style="width: 120px;text-align: left;display:block;">
- <div class="slds-truncate">
- <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
- </div>
- </span>
- </th> -->
- <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row" style="width: 146px;position:static">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
- </div>
- </span>
- </th>
- <!-- 绗簩鍒� 鏈鸿韩缂栫爜 -->
- <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" scope="row" style="width: 240px;height: 35px;">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <span title="鏈鸿韩缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">鏈鸿韩缂栫爜</span>
- </div>
- </span>
- </th>
- <!-- 绗笁鍒� 绠＄悊缂栫爜 -->
- <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" scope="row" style="width: 240px;height: 35px;">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <span title="绠＄悊缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">绠＄悊缂栫爜</span>
- </div>
- </span>
- </th>
- <!-- 绗洓鍒� 棰勮閾炬帴 -->
- <!-- <th class="slds-is-resizable" tabindex="-1" data-label="棰勮閾炬帴" scope="row" style="width: 249px;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> -->
- <!-- 绗簲鍒� 鎶ュ叧鍗曚笅杞介摼鎺� -->
- <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" scope="row" style="width: 249px;">
- <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
- <div class="slds-truncate">
- <span title="鎶ュ叧鍗曚笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鎶ュ叧鍗曚笅杞介摼鎺�</span>
- </div>
- </span>
- </th>
- <!-- 绗叚鍒� 鍟嗘璇佷笅杞介摼鎺� -->
- <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" scope="row" style="width: 249px;">
- <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
- <div class="slds-truncate">
- <span title="鍟嗘璇佷笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鍟嗘璇佷笅杞介摼鎺�</span>
- </div>
- </span>
- </th>
- </tr>
- </thead>
- <aura:if isTrue="{!v.currentData.length > 0}">
- <tbody>
- <aura:iteration items="{!v.currentData}" var="curr" >
- <tr class="slds-hint-parent">
- <!-- 琛岄」鐩� 绗竴鍒� 浜у搧鏄庣粏-->
- <!-- <th class="slds-is-resizable" tabindex="-1" data-label="DN鍗曞彿" >
- <span class="slds-grid slds-grid_align-spread" style="width: 140px;height:18px;text-align: left;display:block;border: bottom 1px;">
- <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
- </span>
- </th> -->
- <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" style="width: 146px;height:36px;position:static">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <lightning:formattedText value="{!curr.ProductName}" style="padding-bottom: 3px;"/>
- </div>
- </span>
- </th>
- <!-- 琛岄」鐩� 绗簩鍒� 鏈鸿韩缂栫爜-->
- <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" style="width: 240px;height: 35px;">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <lightning:formattedText value="{!curr.FrameNo}" style="padding-bottom: 3px;"/>
- </div>
- </span>
- </th>
- <!-- 琛岄」鐩� 绗笁鍒� 绠＄悊缂栫爜-->
- <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" style="width: 240px;height: 35px;">
- <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
- <div class="slds-truncate">
- <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
- </div>
- </span>
- </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>
- </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>
-
- <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)}">
- <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.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a>
- </div>
- </span>
- </th>
- </aura:if>
- <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">
- <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">涓嬭浇</a> -->
- <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
- </div>
- </span>
- </th>
- </aura:if>
- <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">
- <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">涓嬭浇</a> -->
- <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
- </div>
- </span>
- </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>
-
- <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}">
- <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> -->
- <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a>
+ <aura:attribute name="DNId" type="String"
+ description="鐢ㄦ潵浠庣埗瀵硅薄鎺ユ敹浼犻�掕繃鏉ョ殑绛炬敹鍗昳d"
+ default=""/>
+ <aura:handler name="init" action="{!c.doInit}" value="{!this}"
+ description="鍒濆鍖栨柟娉�"/>
+ <aura:attribute name="currentData" type="Object[]" description="鏄庣粏椤靛綋鍓嶆樉绀虹殑鏄庣粏鐨勪俊鎭�" />
+ <div>
+ <lightning:spinner aura:id="mySpinner" alternativeText='璇风瓑寰�' size="large" class="slds-spinner_container"/>
+ </div>
+ <div id="allDivs" >
+ <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>
+ <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">
+ <!-- 绗竴鍒� 浜у搧鏄庣粏 -->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row">
+ <span class="slds-grid slds-grid_align-spread" style="width: 120px;text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
+ </div>
+ </span>
+ </th> -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" scope="row" style="width: 146px;position:static">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="浜у搧鏄庣粏" class="slds-truncate" style="padding-bottom: 3px;">浜у搧鏄庣粏</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗簩鍒� 鏈鸿韩缂栫爜 -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" scope="row" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="鏈鸿韩缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">鏈鸿韩缂栫爜</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗笁鍒� 绠＄悊缂栫爜 -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" scope="row" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <span title="绠＄悊缂栫爜" class="slds-truncate" style="padding-bottom: 3px;">绠＄悊缂栫爜</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗洓鍒� 棰勮閾炬帴 -->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="棰勮閾炬帴" scope="row" style="width: 249px;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> -->
+ <!-- 绗簲鍒� 鎶ュ叧鍗曚笅杞介摼鎺� -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" scope="row" style="width: 249px;">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <span title="鎶ュ叧鍗曚笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鎶ュ叧鍗曚笅杞介摼鎺�</span>
+ </div>
+ </span>
+ </th>
+ <!-- 绗叚鍒� 鍟嗘璇佷笅杞介摼鎺� -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鍟嗘璇�" scope="row" style="width: 249px;">
+ <span class="slds-grid slds-grid_align-spread" style="width: 240px;text-align: center;display:block;">
+ <div class="slds-truncate">
+ <span title="鍟嗘璇佷笅杞介摼鎺�" class="slds-truncate" style="padding-bottom: 3px;">鍟嗘璇佷笅杞介摼鎺�</span>
+ </div>
+ </span>
+ </th>
+ </tr>
+ </thead>
+ <aura:if isTrue="{!v.currentData.length > 0}">
+ <tbody>
+ <aura:iteration items="{!v.currentData}" var="curr" >
+ <tr class="slds-hint-parent">
+ <!-- 琛岄」鐩� 绗竴鍒� 浜у搧鏄庣粏-->
+ <!-- <th class="slds-is-resizable" tabindex="-1" data-label="DN鍗曞彿" >
+ <span class="slds-grid slds-grid_align-spread" style="width: 140px;height:18px;text-align: left;display:block;border: bottom 1px;">
+ <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
+ </span>
+ </th> -->
+ <th class="slds-is-resizable" tabindex="-1" data-label="浜у搧鏄庣粏" style="width: 146px;height:36px;position:static">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.ProductName}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗簩鍒� 鏈鸿韩缂栫爜-->
+ <th class="slds-is-resizable" tabindex="-1" data-label="鏈鸿韩缂栫爜" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.FrameNo}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗笁鍒� 绠＄悊缂栫爜-->
+ <th class="slds-is-resizable" tabindex="-1" data-label="绠＄悊缂栫爜" style="width: 240px;height: 35px;">
+ <span class="slds-grid slds-grid_align-spread" style="text-align: left;display:block;">
+ <div class="slds-truncate">
+ <lightning:formattedText value="{!curr.Name}" style="padding-bottom: 3px;"/>
+ </div>
+ </span>
+ </th>
+ <!-- 琛岄」鐩� 绗洓鍒� 棰勮閾炬帴-->
+ <!-- <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
+ <th class="slds-is-resizable" tabindex="-1" data-label="鎶ュ叧鍗�" style="width: 249px;" rowspan="{!curr.count}">
+ </th>
+ </aura:if> -->
+ <aura:if isTrue="{!IF(curr.count ==null,false,true)}">
+ <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">
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <!-- 鍙湁涓嬭浇 -->
+ <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="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <!-- 鍏朵粬鎯呭喌鏄剧ず鑷繁 -->
+ <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">
+ <!-- <a href="/eSignSystem/apex/FilePreviewDownVF?type=preview&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.awsKey}&name={!curr.fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.awsKey + '&name=' + curr.fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ </aura:if>
+ <!-- 琛岄」鐩� 绗叚鍒� 鍟嗘璇佷笅杞介摼鎺�-->
+ <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a>
- </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}">
- <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
- <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
- </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}">
- <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
- <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
- </div>
- </span>
- </th>
- </aura:if>
- </aura:if>
- </aura:if>
- </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">
- 鍥藉唴閲囪喘
- </div>
- </span>
- </th>
- </aura:if>
- </tr>
- </aura:iteration>
- </tbody>
- </aura:if>
- </table>
- <aura:if isTrue="{!empty(v.currentData)}">
- <div class="slds-align_absolute-center">
- No records found
- </div>
- </aura:if>
- </div>
- </div>
- </div>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <!-- 鍙湁涓嬭浇 -->
+ <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </aura:if>
+ <!-- 鍏朵粬鎯呭喌鏄剧ず鑷繁 -->
+ <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&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">棰勮</a> | <a href="/eSignSystem/apex/FilePreviewDownVF?type=download&key={!curr.sj_awsKey}&name={!curr.sj_fileName}" target="_blank">涓嬭浇</a> -->
+ <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=preview&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">棰勮</a> | <a href="{!curr.iseSignSystem + '/apex/FilePreviewDownVF?type=download&key=' + curr.sj_awsKey + '&name=' + curr.sj_fileName}" target="_blank">涓嬭浇</a>
+ </div>
+ </span>
+ </th>
+ </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;" >
+ <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> -->
+ <!-- 2023 0208 fy add 鎶ュ叧鍗曞晢妫�璇佹柊闇�姹傦紝閲嶆柊鍒ゆ柇 end -->
+ </tr>
+ </aura:iteration>
+ </tbody>
+ </aura:if>
+ </table>
+ <aura:if isTrue="{!empty(v.currentData)}">
+ <div class="slds-align_absolute-center">
+ No records found
+ </div>
+ </aura:if>
+ </div>
+ </div>
+ </div>
</aura:component>
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js
index b185cde..3a90f06 100644
--- a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayController.js
+++ b/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
})
\ No newline at end of file
diff --git a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js b/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js
index b2819b6..27846d1 100644
--- a/force-app/main/default/aura/AttachmentDisplay/AttachmentDisplayHelper.js
+++ b/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
})
\ No newline at end of file
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
index fa5fcff..fd092dc 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp
+++ b/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>
diff --git a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js b/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
index b538b04..3048485 100644
--- a/force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js
+++ b/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) {
diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp b/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp
index 0520695..2f8fe30 100644
--- a/force-app/main/default/aura/eSignHomePage/eSignHomePage.cmp
+++ b/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>
diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePageController.js b/force-app/main/default/aura/eSignHomePage/eSignHomePageController.js
index 7fc829b..8b5559f 100644
--- a/force-app/main/default/aura/eSignHomePage/eSignHomePageController.js
+++ b/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
})
\ No newline at end of file
diff --git a/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js b/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
index 0ed8a50..70891b5 100644
--- a/force-app/main/default/aura/eSignHomePage/eSignHomePageHelper.js
+++ b/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
})
\ No newline at end of file
diff --git a/force-app/main/default/classes/AttachmentDisplayControllerTest.cls b/force-app/main/default/classes/AttachmentDisplayControllerTest.cls
index bff9914..79a56fc 100644
--- a/force-app/main/default/classes/AttachmentDisplayControllerTest.cls
+++ b/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;
diff --git a/force-app/main/default/classes/DealerPersonnelController.cls b/force-app/main/default/classes/DealerPersonnelController.cls
index 9772b95..7ebf028 100644
--- a/force-app/main/default/classes/DealerPersonnelController.cls
+++ b/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
diff --git a/force-app/main/default/classes/DealerPersonnelControllerTest.cls b/force-app/main/default/classes/DealerPersonnelControllerTest.cls
index eb32169..5426dbf 100644
--- a/force-app/main/default/classes/DealerPersonnelControllerTest.cls
+++ b/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() {
--
Gitblit v1.9.1