OlyMEBG.git - Gitblit

			@@ -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 {