From 424c26ef0b5d2ac0f537ccf89a88caa9abd21751 Mon Sep 17 00:00:00 2001
From: DESKTOP-FKJ9HRB\admin <youchang@prec-tech.com>
Date: 星期三, 02 三月 2022 13:36:08 +0800
Subject: [PATCH] 20220302 ConsumEquipmentSetShipment
---
force-app/main/default/pages/ConsumEquipmentSetShipment.page | 18 ++++++++++--------
1 files changed, 10 insertions(+), 8 deletions(-)
diff --git a/force-app/main/default/pages/ConsumEquipmentSetShipment.page b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
index 3d47fe9..faaf1c4 100644
--- a/force-app/main/default/pages/ConsumEquipmentSetShipment.page
+++ b/force-app/main/default/pages/ConsumEquipmentSetShipment.page
@@ -36,12 +36,12 @@
height: 100px;
width: 30px;
}
-/* add by rentx 2021-10-21 start 璁剧疆灞曠ず妗�
+/* add by rentx 2021-10-21 start 璁剧疆灞曠ず妗� */
.col_EquipmentManagementCode__c {display: none;}
.col_Scroll{display: none;}
.dataRow.col_Scroll{display: none;}
.col_ManagementCode__c{display: none;}
- */
+
.modal
{
display:none;
@@ -142,8 +142,9 @@
<apex:commandButton onclick="qrsacn(0);return false;" value="鎵竴鎵�楁潗" rerender="allForm"/>
<apex:commandButton onclick="qrsacn(1);return false;" value="鎵竴鎵墿娴佸崟" rerender="allForm"/>
<apex:commandButton onclick="blockme();" action="{!send}" value="鍙戣揣" rerender="message" oncomplete="unblockUI();checkMessage();checEventFrame()"/>
- <!-- add wangweipeng 2021/01/10 start -->
- <apex:commandButton onclick="window.open('/apex/ConsumTrialPDF?id={!parentId}');" value="璇曠敤琛�" rerender="allForm"/>
+ <!-- add wangweipeng 2021/01/10 /apex/ConsumTrialPDF?id={!parentId} ConsumEquipmentSetShipmentPDF start -->
+ <apex:commandButton onclick="window.open('ConsumTrialPDF?id={!parentId}');" value="璇曠敤琛�" rerender="allForm"/>
+ <!--<a href="openSafri/apex/ConsumTrialPDF?id={!parentId}">璇曠敤琛�</a> -->
<!-- add wangweipeng 2021/01/10 end -->
<!-- add by rentx 2021-10-21 start 鏂板鐮佹灙鎵弿 -->
<apex:commandButton onclick="document.getElementById('maqCode').focus();return false" id="maqCodeBtn" value="鐮佹灙鎵弿锛�" style="padding: 6px;font-size: 110%;margin-right: 1px;"/>
@@ -254,8 +255,8 @@
}
}
//20220215 瀛楁闆嗕腑鐨勮緭鍏ユ鍙樻垚鍙锛屼笉鑳界洿鎺ュ彉鎴恠pan锛屽惁鍒欏悗鍙板彇涓嶅埌鍊�
- j$("#tableData input[type=text]").attr("readonly",true);
- j$("#tableData input[type=text]").attr("disabled","disabled");
+ //j$("#tableData input[type=text]").attr("readonly",true); 鍏堥殣钘忔帀
+ //j$("#tableData input[type=text]").attr("disabled","disabled");
</script>
</apex:outputPanel>
</apex:outputPanel>
@@ -480,7 +481,7 @@
var code = paobj[0].children[9].children[0].value; //.innerText;
var hecode = paobj[0].children[10].children[0].value; //.innerText;
- alert('xiaoma'+code);
+ //alert('xiaoma'+code);
if (code != null && code.length > 0) {
//鍚戝脊鍑烘閲屾坊鍔犳槑缁嗚
var arr = code.split(',');
@@ -669,7 +670,7 @@
checkObj.prop('checked', false);
}
var maqCode = j$( '#maqCode' ).val();
- alert('==='+j$( '#maqCode' ).val());
+ //alert('==='+j$( '#maqCode' ).val());
if (maqCode !='' && maqCode !=undefined){
j$("#maqCode").val("");
j$("#maqCode").focus();
@@ -996,6 +997,7 @@
j$("#qrcode").focus();
//add by qiuyj 2021-11-30 end pc绔壂鐮佹敮鎸�-->
//alert('鎵弿鏉″舰鐮佽浣跨敤App');
+
}
}
--
Gitblit v1.9.1