From 196df4d4bf1941546d349cadbf343655578ec280 Mon Sep 17 00:00:00 2001
From: 19626 <1962676589@qq.com>
Date: 星期三, 13 九月 2023 15:05:56 +0800
Subject: [PATCH] sit期间修改
---
force-app/main/default/pages/InventoryResultRecord.page | 104 ++++++++++++++++++++++++++++++----------------------
1 files changed, 60 insertions(+), 44 deletions(-)
diff --git a/force-app/main/default/pages/InventoryResultRecord.page b/force-app/main/default/pages/InventoryResultRecord.page
index bd528dd..2f6aa46 100644
--- a/force-app/main/default/pages/InventoryResultRecord.page
+++ b/force-app/main/default/pages/InventoryResultRecord.page
@@ -140,7 +140,7 @@
width: 9%;
}
.inputTextStyle input {
- width: 90%;
+ width: 96%;
}
.inputTextStyle select {
width: 95%;
@@ -241,7 +241,7 @@
}
.startInventoryButtonStyle {
margin-left: 15%;
- width: 12%;
+ width: 11%;
}
.labelStyle {
width: 9%;
@@ -253,7 +253,7 @@
width: 9%;
}
.inputTextStyle input {
- width: 90%;
+ width: 96%;
}
.inputTextStyle select {
width: 95%;
@@ -385,10 +385,11 @@
j$('.inventoryResultsTable').hide();
} else {
if (hasChange == false) {
- j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
+ /*j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).hide();
j$('.inventoryResultsTable').show();
- j$('#descdiv').show();
+ j$('#descdiv').show();*/
+ doInit();
} else {
j$.confirm({
title: '纭',
@@ -397,10 +398,11 @@
useBootstrap: false,
buttons: {
OK: function () {
- j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
+ /*j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).removeClass('overlay');
j$(escapeVfId('allPage:allForm:recordBlock:overlay_div')).hide();
j$('.inventoryResultsTable').show();
- j$('#descdiv').show();
+ j$('#descdiv').show();*/
+ doInit();
},
cancel: {
text: '鍙栨秷', // With spaces and symbols
@@ -499,6 +501,7 @@
</div>
</div>
+ <apex:actionFunction name="doInit" action="{!init}" rerender="recordBlock" onComplete="unblockUI()" />
<apex:actionFunction name="startInventory" action="{!startInventory}" rerender="allForm" onComplete="unblockUI()" />
<!-- update by rentx 20210827 start 鑰楁潗鐩樼偣鏂规 -->
<!-- <apex:actionFunction name="searchBtnFunc" action="{!searchBtn}" rerender="allForm" onComplete="unblockUI();changeFullScreen(true);" /> -->
@@ -529,20 +532,6 @@
</table>
</apex:pageBlock>
</apex:outputPanel> -->
-
- <!-- <apex:outputPanel layout="block" style="width: 14%; float: left;">
- <apex:pageBlock mode="maindetail">
- <table style='width:140px;height: 120px'>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鐩樼偣" rendered="{!!inventoryBlueFlag}" onclick="location.href='/apex/InventoryResultRecord'; return false"/></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鐩樼偣" rendered="{!inventoryBlueFlag}"/></td></tr>
- <tr><td class="checkButtonStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!!rentBlueFlag}" onclick="location.href='{!$Page.InventoryReport}'; return false" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="澶囧搧鐩樼偣鎶ュ憡" rendered="{!rentBlueFlag}"/></td></tr>
- <tr><td class="checkButtonStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!!consumBlueFlag}" onclick="location.href='{!$Page.InventoryReport}?isConsum=true'; return false" /></td></tr>
- <tr><td class="checkButtonStyle blueStyle"><apex:commandButton value="鑰楁潗鐩樼偣鎶ュ憡" rendered="{!consumBlueFlag}"/></td></tr>
- <tr><td></td></tr>
- </table>
- </apex:pageBlock>
- </apex:outputPanel> -->
<!-- 鍙充晶妫�绱㈠尯 -->
<apex:outputPanel layout="block">
<apex:pageBlock mode="maindetail" id="maindetailId">
@@ -569,7 +558,7 @@
<tr>
<td></td>
<td colspan="10">
- <input class="startInventoryButtonStyle blueStyle" style="margin-left: 0" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
+ <input class="startInventoryButtonStyle blueStyle" style="margin-left: 2px" type="button" value="寮�濮嬬洏鐐�" onclick="startjs(this);return false;" />
</td>
</tr>
<!-- <tr>
@@ -645,6 +634,7 @@
</div> -->
</td>
</tr>
+ <tr><td style="height: 23px;"></td></tr>
<tr>
<td class="labelStyle">鐩樹簭/鐩樼泩</td>
<td class="inputTextStyle">
@@ -664,8 +654,13 @@
<td class="blankStyle">
</td>
<td class="blankStyle"></td>
- <td class="blankStyle"></td>
- <td class="blankStyle">
+ <!-- 20230912 ljh start -->
+ <!-- <td class="searchButtonStyle"> -->
+ <td width="11%">
+ <!-- 20230912 ljh end -->
+ <div style="display: table-cell; width: 143px">
+ <apex:commandButton action="{!showResult}" value="鏄剧ず鐩樼偣缁撴灉" reRender="allForm" onclick="blockme()" oncomplete="unblockUI()" rendered="{!canDoFlg}"/>
+ </div>
</td>
<td class="searchButtonStyle" colspan="2">
<div style="display: table-cell; width: 80px">
@@ -673,6 +668,7 @@
</div>
</td>
</tr>
+ <tr><td height="23px"></td></tr>
<tr style="{!IF(bieCunFangDi=='涓婃捣 澶囧搧涓績' || hasConsumAsset,'','display: none;')}">
<td class="labelStyle">澶囧搧绫诲埆</td>
<td class="inputTextStyle">
@@ -934,25 +930,25 @@
<apex:param value="{!consumInventoryHeader.Inventory_Start_Date__c}"></apex:param>
</apex:outputtext>
</div>
- <apex:outputPanel id="message2" layout="block" style="width: 530px">
+ <apex:outputPanel id="message2" layout="block" style="width: 100%">
<apex:pageMessages />
</apex:outputPanel>
<div class="searchButtonStyle1" id="scanAction_div">
<!-- 鑰楁潗杩芥函鏂规 妫�绱㈣�楁潗鏃� 淇敼"鎵弿"涓�"pad鎵弿" -->
- <div style="display: table-cell; width: 100px">
+ <div style="display: table-cell; width: 18%;">
<apex:commandButton value="iPad鎵弿" rendered="{!assetCategory == '鑰楁潗' && bieCunFangDi == '涓婃捣 澶囧搧涓績'}" onclick="qrsacn();return false"/>
<apex:commandButton value="鎵弿" rendered="{!!(assetCategory == '鑰楁潗' && bieCunFangDi == '涓婃捣 澶囧搧涓績') }" onclick="qrsacn();return false"/>
</div>
- <div style="display: table-cell; width: 80px"><apex:commandButton value="淇濆瓨" onclick="savejs();return false"/></div>
- <div style="display: table-cell; width: 80px"><apex:commandButton value="杩斿洖" onclick="changeFullScreen(false); return false"/></div>
+ <div style="display: table-cell; width: 13%;"><apex:commandButton value="淇濆瓨" onclick="savejs();return false"/></div>
+ <div style="display: table-cell; width: 13%;"><apex:commandButton value="杩斿洖" onclick="changeFullScreen(false); return false"/></div>
<!-- 鑰楁潗杩芥函鏂规 娣诲姞 "鐮佹灙鎵弿"杈撳叆妗� add by rentx 20210911 start -->
<apex:outputText rendered="{!assetCategory == '鑰楁潗' && bieCunFangDi = '涓婃捣 澶囧搧涓績'}">
- <div style="display: table-cell; width: 80px">
+ <div style="display: table-cell; width: 19%;">
<apex:commandButton onclick="document.getElementById('maqCode').focus();return false" value="鐮佹灙鎵弿" />
</div>
<div style="display: table-cell; width: 500px" >
- <input value="" autofocus="autofocus" id="maqCode" width="100%" style="background-color: #ffffff" onkeypress="return onKeyPress(event)" />
+ <input value="" autofocus="autofocus" id="maqCode" width="100%" style="background-color: #ffffff;height: 32px;" onkeypress="return onKeyPress(event)" />
</div>
<!-- <div style="display: table-cell;" >
<div style="float: left;display: table-cell;" class="btn" >鐮佹灙鎵弿 </div>
@@ -963,17 +959,23 @@
<!-- 鑰楁潗杩芥函鏂规 娣诲姞 "鐮佹灙鎵弿"杈撳叆妗� add by rentx 20210911 end -->
</div>
- <table border="1px" style="width: 510px;" >
+ <table border="1px" style="width: 95%;" >
<tr>
- <td class="labelStyle" style="width: 130px;">鍨嬪彿</td>
- <td class="labelStyle" style="width: 60px;">鏈鸿韩鍙�</td>
- <apex:outputText rendered="{!angecylookrole}"> <!-- 1650--><td class="labelStyle" style="width: 60px;">璐ф灦鍙�</td></apex:outputText>
- <td class="labelStyle" style="width: 90px;">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
- <td class="labelStyle" style="width: 60px;">璐у尯</td>
- <td class="labelStyle" style="width: 60px;">鍦ㄥ簱鏁伴噺</td>
- <td class="labelStyle" style="width: 60px;">鐩樼偣缁撴灉</td>
- <td class="labelStyle" style="width: 40px;">鐩樼泩</td>
- <td class="labelStyle" style="width: 40px;">鐩樹簭</td>
+ <td class="labelStyle">鍨嬪彿</td>
+ <td class="labelStyle">鏈鸿韩鍙�</td>
+ <apex:outputText rendered="{!angecylookrole}"> <!-- 1650--><td class="labelStyle">璐ф灦鍙�</td></apex:outputText>
+ <td class="labelStyle">鎵�鍦ㄥ湴鍖�(鏈儴)</td>
+ <td class="labelStyle">璐у尯</td>
+ <td class="labelStyle">鍦ㄥ簱鏁伴噺</td>
+ <td class="labelStyle">鐩樼偣缁撴灉</td>
+ <td class="labelStyle">鐩樼泩</td>
+ <td class="labelStyle">鐩樹簭</td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <apex:outputText rendered="{!assetCategory!='澶囧搧'}"><td class="labelStyle" style="width: 60px;">鏈夋晥鏈熻嚦</td></apex:outputText>
+ <apex:outputText rendered="{!assetCategory!='澶囧搧'}"><td class="labelStyle" style="width: 50px;">鏁堟湡</td></apex:outputText>
+ <td class="labelStyle" style="width: 50px;">澶栬</td>
+ <td class="labelStyle" style="width: 50px;">鍖呰</td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
<apex:repeat value="{!inventoryDetailList}" var="ivDetail" id="inventroyRow">
<tr class="{!IF(assetCategory!='鑰楁潗','displayRow','hiddenRow')}">
@@ -986,7 +988,7 @@
<td class="labelStyle">
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊' && ivDetail.Asset_Status__c != '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-accsessary="{!ivDetail.OneToOne_Accsessary__c}" html-data-main="{!ivDetail.OneToOne_Body__c}" html-data-mid="{!ivDetail.Main_Asset__c}"
- html-disabled="true" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px"/>
+ html-disabled="true" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%"/>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊'}">
<br/>
<button onclick="lostGeTi(this);return false;">鎵嬪姩</button>
@@ -994,11 +996,15 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '鏁伴噺绠＄悊' || ivDetail.Asset_Status__c == '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-accsessary="{!ivDetail.OneToOne_Accsessary__c}" html-data-main="{!ivDetail.OneToOne_Body__c}" html-data-mid="{!ivDetail.Main_Asset__c}"
- html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px" />
+ html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%" />
</apex:outputPanel>
</td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Inventory_Count__c - ivDetail.Amount__c > 0}">{!ivDetail.Inventory_Count__c - ivDetail.Amount__c}</apex:outputPanel></td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Amount__c - ivDetail.Inventory_Count__c > 0}">{!ivDetail.Amount__c - ivDetail.Inventory_Count__c}</apex:outputPanel></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Appearance_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Package_Check_Result__c}" style="width: 50px" /></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
</apex:repeat>
<apex:repeat value="{!consumInventoryDetailList}" var="ivDetail" id="consumInventroyRow">
@@ -1013,7 +1019,7 @@
<td class="labelStyle">
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '涓綋绠＄悊' && ivDetail.Asset_Status__c != '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-accsessary="false" html-data-barcode="{!ivDetail.Barcode__c}" html-data-ProductSerialNo="{!ivDetail.Asset__r.Product_Serial_No__c}" html-data-salesdepartment="{!ivDetail.Salesdepartment__c}"
- html-disabled="true" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px"/>
+ html-disabled="true" html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%"/>
<!-- add by rentx 20210823 start 鑰楁潗鐩樼偣鏃惰褰昪ode -->
<apex:inputHidden value="{!ivDetail.HCCodes__c}" />
<!-- add by rentx 20210823 start 鑰楁潗鐩樼偣鏃惰褰昪ode -->
@@ -1024,7 +1030,7 @@
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!ivDetail.Asset__r.Manage_type__c == '鏁伴噺绠＄悊' || ivDetail.Asset_Status__c == '鍐荤粨'}">
<apex:inputField onchange="hasChangeFunc()" html-data-accsessary="false" html-data-barcode="{!ivDetail.Barcode__c}" html-data-ProductSerialNo="{!ivDetail.Asset__r.Product_Serial_No__c}" html-data-salesdepartment="{!ivDetail.Salesdepartment__c}"
- html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 40px" />
+ html-data-qrcode="{!ivDetail.Fixture_QRCode__c}" html-data-aid="{!ivDetail.Asset__c}" html-data-frozen="{!ivDetail.Asset_Status__c == '鍐荤粨'}" html-data-bpguige="{!ivDetail.Asset__r.Product2.Packing_list_Fixture_F__c}" value="{!ivDetail.Inventory_Count__c}" style="width: 80%" />
<!-- add by rentx 20210819 start -->
<apex:inputHidden value="{!ivDetail.HCCodes__c}" />
<!-- add by rentx 20210819 start -->
@@ -1033,6 +1039,16 @@
</td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Inventory_Count__c - ivDetail.Amount__c > 0}">{!ivDetail.Inventory_Count__c - ivDetail.Amount__c}</apex:outputPanel></td>
<td class="labelStyle"><apex:outputPanel rendered="{!ivDetail.Inventory_Count__c != null && ivDetail.Amount__c - ivDetail.Inventory_Count__c > 0}">{!ivDetail.Amount__c - ivDetail.Inventory_Count__c}</apex:outputPanel></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc Start -->
+ <td class="labelStyle">
+ <apex:outputtext value="{0, date, yyyyMMdd}">
+ <apex:param value="{!ivDetail.Consumable_Guaranteen_end__c}" />
+ </apex:outputtext>
+ </td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Expiration_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Appearance_Check_Result__c}" style="width: 50px" /></td>
+ <td class="labelStyle"><apex:inputField value="{!ivDetail.Package_Check_Result__c}" style="width: 50px" /></td>
+ <!-- 銆怓Y24澶у強宸ㄥぇ璇鹃銆戝寳浜柊娉曡椤圭洰瀵瑰簲 DB202307428742 20230801 by lc End -->
</tr>
</apex:repeat>
</table>
--
Gitblit v1.9.1