From b8e1ab6623181a2e95188123ce4b1451a8ed071f Mon Sep 17 00:00:00 2001
From: liwentao <1376563863@qq.com>
Date: 星期五, 21 七月 2023 17:47:45 +0800
Subject: [PATCH] 营业: vf页面: 保有设备所属变更 OPD计划 保修期变更申请
---
force-app/main/default/pages/AssetModifyBelongs.page | 78 ++++++++++---------
force-app/main/default/classes/AssetModifyBelongsController.cls | 56 ++++++++++---
force-app/main/default/pages/AssetGuaranteePeriodAlteration.page | 48 ++++++-----
force-app/main/default/pages/LookupPage.page | 19 ++--
4 files changed, 121 insertions(+), 80 deletions(-)
diff --git a/force-app/main/default/classes/AssetModifyBelongsController.cls b/force-app/main/default/classes/AssetModifyBelongsController.cls
index c9ca4ce..f832d61 100644
--- a/force-app/main/default/classes/AssetModifyBelongsController.cls
+++ b/force-app/main/default/classes/AssetModifyBelongsController.cls
@@ -50,7 +50,7 @@
public Boolean isShow { get; set; }
public List<Attachment> attachments { get; set; }
//CHAN-BC6BV2 XHL AddEnd 20190522
-
+ public List<ContentDocument> contents { get; set; }
//鍒嗛〉鍔熻兘
public Integer pageLimit {get; set;}
public String soql {get; set;}
@@ -68,6 +68,16 @@
pageLimit = Integer.valueOf(System.Label.orderdetPageLimitsize);
attachments = new List<Attachment>();
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 start
+ List<ContentDocumentLink> cdlList = [SELECT ContentDocumentId
+ FROM ContentDocumentLink
+ WHERE LinkedEntityId = :Id];
+ List<ID> fileIDs = new List<ID>();
+ for (ContentDocumentLink docLink : cdlList) {
+ fileIDs.add(docLink.ContentDocumentId);
+ }
+ contents=[SELECT Title,OwnerId,ContentModifiedDate from ContentDocument WHERE id IN :fileIDs];
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 end
}
public boolean getcheckUser() {
@@ -95,7 +105,7 @@
soql = this.makeSoql1('', '');
assetListed = Database.query(soql);
assetListed = noSubmittedList(assetListed);
-
+
if (assetListed.size() > 0) {
ambc.rawAccount__c = assetListed[0].Account.Id;
}
@@ -214,10 +224,10 @@
Map<String,String> submittedMap = new Map<String,String>();
List<AssetModifyBelongsChangeDetail__c> changeDetailList = new List<AssetModifyBelongsChangeDetail__c>();
// 鏌ユ壘 淇濇湁璁惧鎵�灞炲彉鏇存槑缁�
- changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
+ changeDetailList = [select Id, Name, Asset__c,Asset__r.Id
from AssetModifyBelongsChangeDetail__c
where ChangeAndChangeDetail__c In:ambcIdList];
-
+
if (changeDetailList.size() > 0) {
for(AssetModifyBelongsChangeDetail__c ambcDetail:changeDetailList){
submittedMap.put(ambcDetail.Asset__r.Id, ambcDetail.Asset__r.Id);
@@ -229,9 +239,9 @@
}
}
}
-
+
} else {
- noSubmittedList = asListed;
+ noSubmittedList = asListed;
}
if (noSubmittedList.size() > 200) {
@@ -244,13 +254,13 @@
} else{
break;
}
-
+
}
} else {
asListed = noSubmittedList;
}
}
-
+
return asListed;
// WLIG-BYZ9UF XHL 20210311 End
@@ -260,7 +270,17 @@
if (String.isNotBlank(val1)) {
val1 = val1.trim();
}
- String soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
+ String soql='';
+ System.debug(RawAccountId);
+ RawAccountId='';
+ if(String.isBlank(RawAccountId)){
+ soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'\'';
+ System.debug('id is null');
+ }
+ else {
+ soql = 'select Id,name,SerialNumber,Asset_situation__c,Order_No__c,Account.Name,Status,Installation_Site__c,CurrentContract__c from Asset where AccountId = \'' + RawAccountId + '\'';
+ System.debug('id is not null');
+ }
if (!String.isBlank(text1)) {
if (text1 == 'Order_No__c' && checkexact) {
soql += ' AND (' + text1 + ' = \'' + String.escapeSingleQuotes(val1) + '\' )';
@@ -328,6 +348,16 @@
ref.setRedirect(true);
return ref;
}
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 start
+ //璺宠浆鍒颁笂浼犻檮浠堕〉闈紙lightning锛�
+ public PageReference uploadingAttachmentLightning() {
+ //PageReference ref = new Pagereference('/p/attach/NoteAttach?pid=' + Id + '&retURL=%2Fapex/AssetModifyBelongs?Id=' + Id);
+ PageReference ref = new Pagereference('/lightning/n/lightning?backgroundContext=%2Flightning%2Fr%2FAssetModifyBelongsChange__c%2F'+Id+'%2Fedit%3Fcount%3D1&0.recordId='+Id+'');
+
+ ref.setRedirect(true);
+ return ref;
+ }
+ //update 鏉庢枃娑� 2023/07/13 鏇存柊lightning闄勪欢涓婁紶 end
// CHAN-BC6BV2 XHL AddEnd 20190522
// 閲嶆柊鍒锋柊
public PageReference returnChangePage() {
@@ -356,7 +386,7 @@
//鎻愪氦涔嬪墠楠岃瘉淇濇湁璁惧鏄惁鍦ㄥ師瀹㈡埛涓嬶紝涓嶅湪鎶ラ敊銆�
List<AssetModifyBelongsChangeDetail__c> getAmBdList = new List<AssetModifyBelongsChangeDetail__c>();
getAmBdList = [SELECT Id, Name,Asset__r.SerialNumber,AssetNotAccount__c,Asset__r.Account.Name,ChangeAndChangeDetail__r.rawAccount__r.Name
- FROM AssetModifyBelongsChangeDetail__c
+ FROM AssetModifyBelongsChangeDetail__c
WHERE ChangeAndChangeDetail__c = : Id AND AssetNotAccount__c = true];
if (getAmBdList.size() > 0) {
for (AssetModifyBelongsChangeDetail__c ambcd: getAmBdList ) {
@@ -364,11 +394,11 @@
String rawAccountName = ' 涓嶅湪瀹㈡埛 銆� ' + ambcd.ChangeAndChangeDetail__r.rawAccount__r.Name +' 銆� 涓嬶紝';
String accountName = ' 鍦ㄥ鎴� 銆� ' +ambcd.Asset__r.Account.Name +' 銆� 涓嬶紝';
ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, serialNumber+rawAccountName+accountName+' 鏃犳硶鎻愪氦锛岃纭'));
-
+
}
return null;
}
-
+
try {
Approval.ProcessSubmitRequest psr = new Approval.ProcessSubmitRequest();
psr.setObjectId(Id);
@@ -598,4 +628,4 @@
}
}
-}
\ No newline at end of file
+}
diff --git a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
index 3f38171..144577c 100644
--- a/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
+++ b/force-app/main/default/pages/AssetGuaranteePeriodAlteration.page
@@ -1,5 +1,7 @@
-<apex:page standardController="GuaranteePeriodAlterationApplication__c" extensions="GuaranteePeriodAlterationController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇濅慨鏈熷彉鏇寸敵璇�">
+<apex:page standardController="GuaranteePeriodAlterationApplication__c" extensions="GuaranteePeriodAlterationController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="淇濅慨鏈熷彉鏇寸敵璇�" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
@@ -8,7 +10,7 @@
blockme();
document.getElementById("allPage:allForm:allBlock:searchBlock:text1").value = "";
document.getElementById("allPage:allForm:allBlock:searchBlock:val1").value = "";
-
+
searchConsumableorderdetails();
}
var selectedSize = 0;
@@ -137,7 +139,7 @@
</apex:actionFunction>
<apex:actionFunction name="DelConsumable" action="{!DelConsumable}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction>
- <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachment}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
+ <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachmentLightning}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction>
<!-- <apex:actionFunction name="returnChangePage" action="{!returnChangePage}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction> -->
@@ -150,15 +152,16 @@
<apex:outputPanel id="allPanel">
<apex:pageBlock id="allBlock" >
<apex:pageBlock id="EDCline_1" >
+ <apex:commandButton style="display:none"/>
<apex:commandButton onclick="EditConsumable();" value="缂栬緫" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
-
+
<apex:commandButton onclick="SorderJs();" value="鎻愪氦鐢宠" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble )}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF((editAble) && ambc.Change_status__c !='椹冲洖',true,false)}" />
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && editAble,true,false)}" />
<apex:commandButton onclick="DeleteConsumable();" value="鍒犻櫎" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
<apex:commandButton onclick="backOrderJs();" value="鍐嶇敵璇�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && !editAble,true,false)}" />
</apex:pageBlock>
-
+
<apex:pageBlock title="鍙樻洿鐢宠鍗曚俊鎭�" id="unEditable" rendered="{!!(editAble)}">
<table>
<colgroup>
@@ -178,9 +181,9 @@
<td align="right" >鐘� 鎬侊細</td>
<td align="left" ><apex:outputField id="OrderStatus_out" value="{!ambc.Change_status__c}" style="width:100px"/></td>
<!-- <td/> -->
- </tr>
+ </tr>
<tr>
-
+
<!-- <td/> -->
<td align="right">鍙樻洿鍘熷洜锛�</td>
<td align="left">
@@ -216,7 +219,7 @@
<col width="180px"/>
<col width="60px"/>
<col width="60px"/>
-
+
</colgroup>
<tr>
<td align="right"></td>
@@ -226,13 +229,13 @@
<td>
<apex:selectList value="{!text1}" id="text1" size="1" style="width:90px"><apex:selectOptions value="{!textOpts}"/>
</apex:selectList>
- </td>
+ </td>
<td>
<apex:inputText value="{!val1}"
id="val1" style="width:100px"/>
</td>
<td align="right"></td>
- <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 100px;" onclick="searchProductJs('0');return false;" /></td>
+ <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 120px;" onclick="searchProductJs('0');return false;" /></td>
<td><input type="button" value="娓呯┖" style="width: 100px;" onclick="ClearJs();return false;" class="btn"/></td>
<td/>
</tr>
@@ -242,25 +245,25 @@
<tr >
<td colspan="3"/>
-
- <td colspan="4"> 鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px" onchange="ChangeReasonjs('{!ambc.ChangeReason__c}');"><apex:selectOptions value="{!changeReasonOpts}" /> -->
+
+ <td colspan="4" style="height:50px"> 鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px" onchange="ChangeReasonjs('{!ambc.ChangeReason__c}');"><apex:selectOptions value="{!changeReasonOpts}" /> -->
<!-- </apex:selectList> -->
<apex:inputField value="{!ambc.ChangeReason__c}" style="width:200px"></apex:inputField>
</td>
<td colspan="4">鍙樻洿鍘熷洜鍏朵粬锛�<apex:inputText value="{!ambc.ChangeReason_text__c}" style="width:200px"/></td>
<!-- <td colspan="4">淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
-
+
</tr>
<!-- <tr></tr> -->
<tr>
<td colspan="3"/>
<!-- <td colspan="1"/> -->
<!-- <td colspan="5"> 鍙樻洿鍘熷洜鍏朵粬锛�<apex:inputText value="{!ambc.ChangeReason_text__c}" style="width:200px"/></td> -->
- <td colspan="4"> 瀹夎鏃ユ湡锛�<apex:outputField value="{!ambc.WarrantyStartDate__c}" style="width:200px"/></td>
+ <td colspan="4"> 瀹夎鏃ユ湡锛�<apex:outputField value="{!ambc.WarrantyStartDate__c}" style="width:200px"/></td>
<!-- <td colspan="4"> 淇濅慨澶╂暟锛�<apex:inputText value="{!ambc.WarrantyDays__c}" style="width:200px"/></td> -->
<!-- <td colspan="4"/> -->
</tr>
-
+
</table>
</apex:pageBlock>
<apex:outputPanel id="message">
@@ -268,6 +271,7 @@
</apex:outputPanel>
<apex:pageBlock title="淇濇湁璁惧鎵�灞炲彉鏇存槑缁�" id="ConsumableorderdetailsSection">
<input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsCount" value="{!ConsumableorderdetailsviewCount}" />
+ <input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:Id" value="{!Id}" />
<table class="list" border="0" cellpadding="0" cellspacing="0">
<tr class="headerRow">
<apex:variable var="v" value="" rendered="{!editAble}">
@@ -308,18 +312,18 @@
</apex:pageBlock>
<!-- CHAN-BC6BV2 XHL AddStart 20190522 -->
<apex:pageBlock title="闄勪欢" id="accessory" rendered="{!isShow}">
-
+
<apex:pageBlockButtons location="top">
<apex:commandButton value="闄勪欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
</apex:pageBlockButtons>
- <apex:pageBlockTable value="{!attachments}" var="attachment" >
-
-
+ <apex:pageBlockTable value="{!contents}" var="attachment" >
+
+
<apex:column headerValue="鏍囬" style="width: 33%">
- <apex:outputField value="{!attachment.Name}"/>
+ <apex:outputField value="{!attachment.Title}"/>
</apex:column>
<apex:column headerValue="涓婃淇敼鏃堕棿" style="width: 33%">
- <apex:outputField value="{!attachment.CreatedDate}"/>
+ <apex:outputField value="{!attachment.ContentModifiedDate}"/>
</apex:column>
<apex:column headerValue="鍒涘缓浜�" style="width: 33%">
<apex:outputField value="{!attachment.OwnerId}"/>
@@ -333,4 +337,4 @@
</apex:form>
<script>
</script>
-</apex:page>
\ No newline at end of file
+</apex:page>
diff --git a/force-app/main/default/pages/AssetModifyBelongs.page b/force-app/main/default/pages/AssetModifyBelongs.page
index e6f577c..630ab4c 100644
--- a/force-app/main/default/pages/AssetModifyBelongs.page
+++ b/force-app/main/default/pages/AssetModifyBelongs.page
@@ -1,14 +1,16 @@
<apex:page standardController="AssetModifyBelongsChange__c" extensions="AssetModifyBelongsController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鏈�缁堢敤鎴峰彉鏇寸敵璇�" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
+
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
<script>
+
function ClearJs(){
blockme();
document.getElementById("allPage:allForm:allBlock:searchBlock:text1").value = "";
document.getElementById("allPage:allForm:allBlock:searchBlock:val1").value = "";
-
searchConsumableorderdetails();
}
var selectedSize = 0;
@@ -136,7 +138,7 @@
</apex:actionFunction>
<apex:actionFunction name="DelConsumable" action="{!DelConsumable}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction>
- <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachment}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
+ <apex:actionFunction name="uploadingAttachmentJs" action="{!uploadingAttachmentLightning}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction>
<apex:actionFunction name="returnChangePage" action="{!returnChangePage}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI();CheckStatusAfter()">
</apex:actionFunction>
@@ -145,19 +147,18 @@
</apex:actionFunction>
<!-- <apex:actionFunction name="UnabletoEdit" action="{!UnabletoEdit}" rerender="ConsumableorderdetailsSection, message" onComplete="unblockUI()">
</apex:actionFunction> -->
-
<apex:outputPanel id="allPanel">
<apex:pageBlock id="allBlock" >
<apex:pageBlock id="EDCline_1" >
+ <apex:commandButton style="display:none"/>
<apex:commandButton onclick="EditConsumable();" value="缂栬緫" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
-
<apex:commandButton onclick="SorderJs();" value="鎻愪氦璁㈠崟" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble )}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF((editAble) && ambc.Change_status__c !='椹冲洖',true,false)}" />
<apex:commandButton onclick="saveJs();" value="淇濆瓨鍙樻洿鐢宠鍗�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && editAble,true,false)}" />
<apex:commandButton onclick="DeleteConsumable();" value="鍒犻櫎" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!!(editAble)}" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯'||ambc.Change_status__c='椹冲洖',true,false)}"/>
<apex:commandButton onclick="backOrderJs();" value="鍐嶇敵璇�" style="margin-left:30px;width:180px" rerender="dummy" rendered="{!IF(ambc.Change_status__c='椹冲洖' && !editAble,true,false)}" />
</apex:pageBlock>
-
+
<apex:pageBlock title="鍙樻洿鐢宠鍗曚俊鎭�" id="unEditable" rendered="{!!(editAble)}">
<table>
<colgroup>
@@ -170,7 +171,7 @@
<col width="300px"/>
</colgroup>
- <tr>
+ <tr style='line-height: 25px;'>
<td align="right" >鐢宠鍗曠紪鐮侊細</td>
<td align="left" ><apex:outputField id="OrderCode_out" value="{!ambc.Name}" style="width:300px"/></td>
<td/>
@@ -178,16 +179,16 @@
<td align="left" ><apex:outputField id="OrderStatus_out" value="{!ambc.Change_status__c}" style="width:100px"/></td>
<td/>
</tr>
- <tr>
+ <tr style='line-height: 25px;'>
<td align="right" >鍘熷鎴凤細</td>
<td align="left" ><apex:outputField value="{!ambc.rawAccount__r.Name}"/></td>
<td/>
<td align="right" >鐩爣瀹㈡埛锛�</td>
<td align="left" ><apex:outputField value="{!ambc.AccountField__r.Name}"/></td>
<td/>
- </tr>
-
- <tr>
+ </tr>
+
+ <tr style='line-height: 25px;'>
<apex:outputPanel rendered="{!checkUser}">
<td align="right" >SPO琛ㄥ崟鍙凤細</td>
<td align="left" ><apex:outputField value="{!ambc.SPOLink__c}"/></td>
@@ -200,7 +201,7 @@
</td>
<!-- CHAN-B9B68N Stop -->
</tr>
- <tr>
+ <tr style='line-height: 25px;'>
<td align="right">澶囨敞锛�</td>
<td align="left"><apex:outputField value="{!ambc.remark__c}" style="width:200px"/></td>
<!-- LZHU-BPJ8DF 20200513 Start -->
@@ -212,7 +213,7 @@
<!-- LZHU-BPJ8DF 20200513 End -->
</tr>
<!-- WLIG-BS7B4T ---20200806---update By rentongxiao---Start -->
- <tr>
+ <tr style='line-height: 25px;'>
<td align="right">鍏变韩锛�</td>
<td align="left"><apex:outputField value="{!ambc.share__c}" style="width:50px"/></td>
<td/>
@@ -223,8 +224,8 @@
<apex:pageBlock id="searchBlock" rendered="{!editAble}">
<table>
<colgroup>
- <col width="10px"/>
- <col width="10px"/>
+ <col width="0px"/>
+ <col width="0px"/>
<col width="60px"/>
<col width="85px"/>
<col width="60px"/>
@@ -235,23 +236,23 @@
<col width="180px"/>
<col width="60px"/>
<col width="60px"/>
-
+
</colgroup>
<tr>
<td align="right"></td>
<td></td>
<td/>
- <td align="right">閫夋嫨鏉′欢锛�</td>
+ <td align="right"> 閫夋嫨鏉′欢锛�</td>
<td>
<apex:selectList value="{!text1}" id="text1" size="1" style="width:90px"><apex:selectOptions value="{!textOpts}"/>
</apex:selectList>
- </td>
+ </td>
<td>
<apex:inputText value="{!val1}"
- id="val1" style="width:100px"/>
+ id="val1" style="width:200px"/>
</td>
<td align="left"><div id="seachdiv">鍚堝悓缂栫爜绮剧‘鏌ヨ<apex:inputCheckbox value="{!checkexact}" id="RowCheckbox"/></div></td>
- <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 100px;" onclick="searchProductJs('0');return false;" /></td>
+ <td><apex:commandButton value="淇濇湁璁惧鎼滅储" style="width: 120px;" onclick="searchProductJs('0');return false;" /></td>
<td><input type="button" value="娓呯┖" style="width: 100px;" onclick="ClearJs();return false;" class="btn"/></td>
<td/>
</tr>
@@ -260,36 +261,37 @@
</tr>
<tr>
<td colspan="3"/>
- <td colspan="4"> 鍘熷鎴凤細<apex:outputField value="{!ambc.rawAccount__c}"/></td>
- <td colspan="4">鐩爣瀹㈡埛锛�<apex:inputField id="OEC" value="{!ambc.AccountField__c}" style="width:200px"/></td>
+ <td colspan="4" style="height:50px;"> 鍘熷鎴凤細<apex:outputField value="{!ambc.rawAccount__c}"/></td>
+ <td colspan="4">鐩爣瀹㈡埛锛�<apex:inputField id="OEC" value="{!ambc.AccountField__c}" style="height:25px;width:200px"/></td>
</tr>
-
+
<tr >
<apex:outputPanel rendered="{!checkUser}">
<td colspan="3"/>
- <td colspan="4">SPO琛ㄥ崟鍙凤細<apex:inputText value="{!ambc.SPOLink__c}" style="width:200px"/></td>
+ <td colspan="4"> SPO琛ㄥ崟鍙凤細<apex:inputText value="{!ambc.SPOLink__c}" style="width:200px"/></td>
</apex:outputPanel>
<!-- CHAN-B9B68N Start -->
<td colspan="4">鍙樻洿鍘熷洜锛�<!-- <apex:selectList value="{!ambc.ChangeReason__c}" id="changeReason01" size="1" style="width:204px"><apex:selectOptions value="{!changeReasonOpts}"/> --><apex:inputField value="{!ambc.ChangeReason__c}"></apex:inputField>
<!-- </apex:selectList> -->
</td>
<!-- CHAN-B9B68N Stop -->
-
+
</tr>
<tr>
<td colspan="3"/>
- <td colspan="4">
- 澶囨敞锛�<apex:inputText value="{!ambc.remark__c}" style="width:200px"/></td>
+
+ <td colspan="4" style="height:50px;">
+ 澶囨敞锛�<apex:inputText value="{!ambc.remark__c}" style="width:200px"/></td>
<!-- LZHU-BPJ8DF 20200513 Start -->
- <td colspan="4">鍙樻洿璁惧鎬绘暟锛�<apex:outputField value="{!ambc.DetailCnt__c}"/></td>
+ <td colspan="4" style="height:50px;">鍙樻洿璁惧鎬绘暟锛�<apex:outputField value="{!ambc.DetailCnt__c}"/></td>
<!-- LZHU-BPJ8DF 20200513 End -->
- </tr>
+ </tr>
<!-- WLIG-BS7B4T ---20200806---update By rentongxiao---Start -->
<tr>
<!-- 鍏变韩瀛楁鐨勫洖鏄� -->
<td colspan="3"/>
<td colspan="4">
- 鍏变韩锛�<apex:inputCheckbox value="{!ambc.share__c}" style="width:50px"/>
+ 鍏变韩锛�<apex:inputCheckbox value="{!ambc.share__c}" style="height:20px;width:20px"/>
</td>
<td colspan="4"></td>
</tr>
@@ -301,6 +303,7 @@
</apex:outputPanel>
<apex:pageBlock title="淇濇湁璁惧鎵�灞炲彉鏇存槑缁�" id="ConsumableorderdetailsSection">
<input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:ConsumableorderdetailsCount" value="{!ConsumableorderdetailsviewCount}" />
+ <input type="hidden" id="allPage:allForm:allBlock:ConsumableorderdetailsSection:Id" value="{!Id}" />
<table class="list" border="0" cellpadding="0" cellspacing="0">
<tr class="headerRow">
<apex:variable var="v" value="" rendered="{!editAble}">
@@ -339,20 +342,22 @@
</table>
</apex:pageBlock>
+
<!-- CHAN-BC6BV2 XHL AddStart 20190522 -->
<apex:pageBlock title="闄勪欢" id="accessory" rendered="{!isShow}">
-
+
<apex:pageBlockButtons location="top">
<apex:commandButton value="闄勪欢涓婁紶" onclick="uploadingAttachmentJs();" disabled="{!IF(ambc.Change_status__c='宸叉彁浜�'||ambc.Change_status__c='鎵瑰噯',true,false)}"/>
</apex:pageBlockButtons>
- <apex:pageBlockTable value="{!attachments}" var="attachment" >
-
-
+
+ <apex:pageBlockTable value="{!contents}" var="attachment" >
+
+
<apex:column headerValue="鏍囬" style="width: 33%">
- <apex:outputField value="{!attachment.Name}"/>
+ <apex:outputField value="{!attachment.Title}"/>
</apex:column>
<apex:column headerValue="涓婃淇敼鏃堕棿" style="width: 33%">
- <apex:outputField value="{!attachment.CreatedDate}"/>
+ <apex:outputField value="{!attachment.ContentModifiedDate}"/>
</apex:column>
<apex:column headerValue="鍒涘缓浜�" style="width: 33%">
<apex:outputField value="{!attachment.OwnerId}"/>
@@ -365,5 +370,6 @@
</apex:outputPanel>
</apex:form>
<script>
+
</script>
-</apex:page>
\ No newline at end of file
+</apex:page>
diff --git a/force-app/main/default/pages/LookupPage.page b/force-app/main/default/pages/LookupPage.page
index a576031..1c10597 100644
--- a/force-app/main/default/pages/LookupPage.page
+++ b/force-app/main/default/pages/LookupPage.page
@@ -1,10 +1,11 @@
-<apex:page controller="LookupController" id="pg" showheader="false" sidebar="false" title="{!title}" >
+<apex:page controller="LookupController" id="pg" showheader="false" sidebar="false" title="{!title}" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:includeScript value="{!URLFOR($Resource.clipboardminjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<script type="text/javascript">
//鎼滅储璺宠浆
@@ -76,7 +77,7 @@
border-color: #c4c4c4;
color: #909090;
}
-
+
</style>
<!-- form 琛ㄥ崟 -->
<apex:form id="formId">
@@ -113,7 +114,7 @@
<!-- table 琛ㄦ牸鍒� 绮剧悽鎶�鏈� wql 2021/04/01 start-->
<apex:pageblock id="searchResults">
-
+
<!-- PleaseJudge 涓嬫璋冪敤鏃讹紝闇�鍒ゆ柇 -->
<apex:outputpanel rendered="{!IF(SObjectName == 'ModelLendingProduct__c', true, false)}">
<apex:pageblocktable id="tblResults" value="{!ModelCode}" var="a">
@@ -211,7 +212,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:FirstPage'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:FirstPage'))[0].classList.remove("btn");
- }
+ }
}
//涓婁竴椤�
@@ -226,7 +227,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:previous'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:previous'))[0].classList.remove("btn");
- }
+ }
}
//涓嬩竴椤�
if(j$(escapeVfId('pg:formId:next'))[0]){
@@ -240,7 +241,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:next'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:next'))[0].classList.remove("btn");
- }
+ }
}
//灏鹃〉
if(j$(escapeVfId('pg:formId:LastPage'))[0]){
@@ -254,7 +255,7 @@
//濡傛灉鎸夐挳涓嶆槸disabled 鍒欏幓鎺夐粯璁ゆ牱寮� 娣诲姞鏂扮殑disabled鏍峰紡
if(j$(escapeVfId('pg:formId:LastPage'))[0].className.indexOf('btn')==0){
j$(escapeVfId('pg:formId:LastPage'))[0].classList.remove("btn");
- }
+ }
}
}
@@ -268,7 +269,7 @@
if(window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingProductCodeId"))){
window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingProductCodeId")).val(id);
}
-
+
//璧嬪�煎埌鏃犳姤鍛婇〉闈�
if(window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingCodeId"))){
window.opener.j$(escapeVfId("allPage:allForm:allBlock:tableListQ:SectionItem1:ModelLendingCodeId")).val(modelId);
@@ -279,4 +280,4 @@
//鍒濆鍖栧幓鎺夐粯璁ゆ牱寮�
removeButtonStyle();
</script>
-</apex:page>
\ No newline at end of file
+</apex:page>
--
Gitblit v1.9.1