From e6068da47c1bef5517c9e5fdc8c726766867ad4e Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 14 七月 2023 15:10:02 +0800
Subject: [PATCH] Merge branch 'master' into LEXUpgrade2023-Deloitte
---
force-app/main/default/pages/ReceivingNoteWaitingReceipt.page | 35 +++++++++++++++++++++++++++++++----
1 files changed, 31 insertions(+), 4 deletions(-)
diff --git a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
index 313c7a4..e869658 100644
--- a/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
+++ b/force-app/main/default/pages/ReceivingNoteWaitingReceipt.page
@@ -1,4 +1,4 @@
-<apex:page controller="ReceivingNoteWaitingReceiptController" showHeader="false" action="{!init}" id="allPage">
+<apex:page controller="ReceivingNoteWaitingReceiptController" showHeader="false" action="{!init}" id="allPage" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
@@ -8,8 +8,8 @@
<apex:form >
<!-- 姝ゅ闅愬紡鐢熸垚浜岀淮鐮佸浘鐗囷紝闃叉PDF椤典笂鐨勪簩缁寸爜宕╁潖 -->
<apex:includeScript value="{!URLFOR($Resource.qrcode)}"/>
- <apex:includeScript value="/soap/ajax/40.0/connection.js"/>
- <apex:includeScript value="/soap/ajax/40.0/apex.js"/>
+ <apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
+ <apex:includeScript value="{!URLFOR($Resource.apex20)}"/>
<div id="qrcode" hidden="true"></div>
<script type="text/javascript">
function createAttachment() {
@@ -319,6 +319,13 @@
</apex:selectList>
</td>
<td>
+ <!-- 澶囧搧鍏ュ簱浜у搧 -->
+ {!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.label}:
+ <img src="/img/s.gif" alt="" class="helpOrb" title="{!$ObjectType.ReceivingNoteDetail__c.fields.Fixture_Arrival_Product__c.InlineHelpText}"/>
+ <apex:inputField id="appLoaner_fixture_arrival_product" value="{!rndInfo[0].Fixture_Arrival_Product__c}"/>
+ <!-- value="{!pageB.assetInput.Fixture_Arrival_Product__c}" -->
+ </td>
+ <td>
<span style="margin-left: 10px;">
<apex:commandButton value="缂栬緫" onclick="blockme();" action="{!changeFixModel}" reRender="allForm,checEventFrame" oncomplete="unblockUI();windowResize();"/><!-- 20210804 ljh add checEventFrame -->
</span>
@@ -337,7 +344,8 @@
var appManage_type = j$(escapeVfId('{!$Component.appManage_type}')).val(); // 绠＄悊绉嶇被
var appunknow_serial_NO_product = j$(escapeVfId('{!$Component.appunknow_serial_NO_product}')).val(); // 鏃犳満韬彿鐮佽澶�
var appLoaner_accsessary = j$(escapeVfId('{!$Component.appLoaner_accsessary}')).val() // 澶囧搧鐢ㄩ�旈檮灞炲搧
-
+ var appLoaner_fixture_arrival_product = j$(escapeVfId('{!$Component.appLoaner_fixture_arrival_product}')).val() //澶囧搧鍏ュ簱浜у搧
+ console.log(appLoaner_fixture_arrival_product);
var appSalesdepartments = []; // 鎵�鍦ㄥ湴鍖�(鏈儴)
j$("td.intf.dataCellBorder1.Salesdepartment__c").each(function() {
appSalesdepartments.push(j$(this));
@@ -370,6 +378,11 @@
j$("td.intf.dataCellBorder1.Loaner_accsessary__c").each(function() {
appLoaner_accsessarys.push(j$(this));
});
+
+ var appLoaner_fixture_arrival_products = []; //澶囧搧鍏ュ簱浜у搧
+ j$("td.intf.dataCellBorder1.Fixture_Arrival_Product__c").each(function(){
+ appLoaner_fixture_arrival_products.push(j$(this));
+ })
var currentPageRecordCount = j$(escapeVfId('allPage:allForm:dataBlock:currentPageRecordCnt')).val();
for (var i = 0; i < currentPageRecordCount; i++) {
@@ -421,6 +434,12 @@
// appLoaner_accsessarys[i].find("input").attr("checked", appLoaner_accsessary);
appliedFlag = false;
}
+
+ if(typeof(appLoaner_fixture_arrival_product) != "undefined" && appLoaner_fixture_arrival_product != null && appLoaner_fixture_arrival_product != 'x'){
+ // j$(escapeVfId('allPage:allForm:dataBlock:dataline_R:1:inputField:2:j_id116')).val(appLoaner_fixture_arrival_product);
+ appLoaner_fixture_arrival_products[i].find("input:not(:hidden)").val(appLoaner_fixture_arrival_product);
+ appliedFlag = false;
+ }
}
}
j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(false);
@@ -465,6 +484,10 @@
var alertMsg3 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧鐢ㄩ�旈檮灞炲搧" + " 閫傜敤涓� " + appLoaner_accsessary + " \r\n";
alertMsg += alertMsg3;
}
+ if (appLoaner_fixture_arrival_product != null && appLoaner_fixture_arrival_product!='x') {
+ var alertMsg3 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧鍏ュ簱浜у搧" + " 閫傜敤涓� " + appLoaner_fixture_arrival_product + " \r\n";
+ alertMsg += alertMsg3;
+ }
// alert(alertMsg);
// clearApplyFlag = true;
j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
@@ -501,6 +524,10 @@
var alertMsg3 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧鐢ㄩ�旈檮灞炲搧" + " 閫傜敤涓� " + appLoaner_accsessary + " \r\n";
alertMsg += alertMsg3;
}
+ if (appLoaner_fixture_arrival_product != null) {
+ var alertMsg3 = "宸插皢鎵撳嬀鏁版嵁涓殑 " + "澶囧搧鍏ュ簱浜у搧" + " 閫傜敤涓� " + appLoaner_fixture_arrival_product + " \r\n";
+ alertMsg += alertMsg3;
+ }
//passApplyMsgToController(alertMsg, 'Success');
j$(escapeVfId('allPage:allForm:pageBlockButton1:clearApplyFlagId')).val(true);
} else {
--
Gitblit v1.9.1