From 6e454c8c1add1d654334df3089770245f043bb2e Mon Sep 17 00:00:00 2001
From: zhangqian <zhangqian@prec-tech.com>
Date: 星期二, 18 七月 2023 20:30:38 +0800
Subject: [PATCH] 调拨发货 收货 耗材页面 分单 备品出借 应答沟通：To：备品中心/To:申请者 耗材 应答沟通-To:备品中心/To:申请者 备品出借的应答沟通 耗材申请的应答沟通
---
force-app/main/default/pages/ConsumEquipmentRentalResponse.page | 5
force-app/main/default/pages/TransferAgencyShipment.page | 6 +
force-app/main/default/pages/ConsumApplySplit.page | 5
force-app/main/default/pages/EquipmentRentalResponse.page | 5
force-app/main/default/pages/Lost_Return_DeliverySlip.page | 3
force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page | 203 ++++++++++++++++++++++++++------------------------
force-app/main/default/pages/EquipmentRentalResponsePopUp.page | 9 ++
7 files changed, 128 insertions(+), 108 deletions(-)
diff --git a/force-app/main/default/pages/ConsumApplySplit.page b/force-app/main/default/pages/ConsumApplySplit.page
index dba2489..c3e7793 100644
--- a/force-app/main/default/pages/ConsumApplySplit.page
+++ b/force-app/main/default/pages/ConsumApplySplit.page
@@ -18,9 +18,6 @@
body .bPageBlock .detailList .dataCol select {
min-width: 180px;
}
- input.btn {
- font: revert;
- }
</style>
<apex:form id="allForm">
<script type="text/javascript">
@@ -67,6 +64,8 @@
</apex:column>
</apex:dataTable>
<div style="height: 15px"></div>
+ <!-- zq 20230718鎸夐挳瀵归綈娣诲姞 input -->
+ <input type="hidden" name='hide'/>
<apex:commandButton value="纭鍒嗗崟" action="{!saveSplit}" oncomplete="checkSaveStatus();unblockUI();" onclick="blockme();" rerender="allForm" />
<apex:commandButton value="杩斿洖" onclick="back(); return false;" rerender="allForm" oncomplete="unblockUI();" />
</apex:pageBlock>
diff --git a/force-app/main/default/pages/ConsumEquipmentRentalResponse.page b/force-app/main/default/pages/ConsumEquipmentRentalResponse.page
index b9f07d8..1b89152 100644
--- a/force-app/main/default/pages/ConsumEquipmentRentalResponse.page
+++ b/force-app/main/default/pages/ConsumEquipmentRentalResponse.page
@@ -6,16 +6,17 @@
<script>
function tocenterjs() {
//blockme();
+ // 20230718 zq add height=400
window.open('/apex/ConsumEquipmentRentalResponsePopUp?raid=' + '{!URLENCODE(Consum_Apply__c.Id)}' + '&type=response2center',
'EquipmentRentalDate',
- 'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ 'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}
function touserjs() {
//blockme();
window.open('/apex/ConsumEquipmentRentalResponsePopUp?raid=' + '{!URLENCODE(Consum_Apply__c.Id)}' + '&type=response2user',
'EquipmentRentalDate',
- 'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ 'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}
function reloadjs() {
//blockme();
diff --git a/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page b/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
index 9c66aca..b433a63 100644
--- a/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
+++ b/force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
@@ -1,102 +1,109 @@
<!-- zq <apex:page Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
- <apex:page lightningStylesheets = "true" Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
- <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
- <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
- <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
- <script>
- function savejs() {
- blockme();
- savebtn();
- }
-
- function canceljs() {
- top.window.close();
- }
-
- function refreshparent() {
- // var hasError = j$(escapeVfId('allPage:allForm:allBlock:hasError')).text();
- // if (hasError == 'false') {
- // top.window.opener.reloadjs();
- // top.window.close();
- // }
- // 20211123 ljh 搴旂瓟娌熼�� update start
- var hasError = j$(escapeVfId('allPage:allForm:hasError')).text();
- console.log(hasError);
- if (hasError == 'false') {
- window.open("/{!raid}");
- top.window.close();
- }
- // 20211123 ljh 搴旂瓟娌熼�� update end
- }
- </script>
- <apex:form id="allForm">
+<apex:page lightningStylesheets="true" Controller="ConsumEquipmentRentalResponseController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
+<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
+<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<!-- 20230718 zq add -->
+<style type="text/css">
+ table.mytable tr{
+ height:35px;
+ }
+</style>
+<script>
+function savejs() {
+ blockme();
+ savebtn();
+}
+
+function canceljs() {
+ top.window.close();
+}
+
+function refreshparent() {
+ // var hasError = j$(escapeVfId('allPage:allForm:allBlock:hasError')).text();
+ // if (hasError == 'false') {
+ // top.window.opener.reloadjs();
+ // top.window.close();
+ // }
+ // 20211123 ljh 搴旂瓟娌熼�� update start
+ var hasError = j$(escapeVfId('allPage:allForm:hasError')).text();
+ console.log(hasError);
+ if (hasError == 'false') {
+ window.open("/{!raid}");
+ top.window.close();
+ }
+ // 20211123 ljh 搴旂瓟娌熼�� update end
+}
+</script>
+ <apex:form id="allForm">
+ <!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
+ <!-- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="allPanel,message" onComplete="unblockUI();refreshparent();">
+ </apex:actionFunction> -->
+ <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="message" onComplete="unblockUI();refreshparent();">
+ </apex:actionFunction>
+ <apex:outputPanel id="message">
+ <apex:pageMessages />
+ <apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
+ </apex:outputPanel>
+ <!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
+ <apex:outputPanel id="allPanel">
+ <apex:pageBlock title="{!$ObjectType.Consum_Apply__c.fields.Response__c.label}" id="allBlock">
+ <apex:pageBlockButtons location="top">
+ <!-- 20230718 zq add style="margin-right:10px" -->
+ <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy" style="margin-right:10px"/>
+ <apex:commandButton onclick="canceljs(); return false;" value="鍙栨秷" rerender="dummy"/>
+ </apex:pageBlockButtons>
<!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
- <!-- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="allPanel,message" onComplete="unblockUI();refreshparent();">
- </apex:actionFunction> -->
- <apex:actionFunction name="savebtn" action="{!saveBtn}" rerender="message" onComplete="unblockUI();refreshparent();">
- </apex:actionFunction>
- <apex:outputPanel id="message">
+ <!-- <apex:outputPanel id="message">
<apex:pageMessages />
- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
- </apex:outputPanel>
+ </apex:outputPanel> -->
+
+ <apex:outputText id="raid" value="{!raid}" style="display:none"/>
+ <!-- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/> -->
<!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
- <apex:outputPanel id="allPanel">
- <apex:pageBlock title="{!$ObjectType.Consum_Apply__c.fields.Response__c.label}" id="allBlock">
- <apex:pageBlockButtons location="top">
- <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy"/>
- <apex:commandButton onclick="canceljs(); return false;" value="鍙栨秷" rerender="dummy"/>
- </apex:pageBlockButtons>
- <!-- 20211105 ljh 搴旂瓟娌熼�� update start -->
- <!-- <apex:outputPanel id="message">
- <apex:pageMessages />
- </apex:outputPanel> -->
-
- <apex:outputText id="raid" value="{!raid}" style="display:none"/>
- <!-- <apex:outputText id="hasError" value="{!hasError}" style="display:none"/> -->
- <!-- 20211105 ljh 搴旂瓟娌熼�� update end -->
- <table>
- <tr>
- <td>To锛�</td>
- <td>
- <apex:outputPanel layout="none" rendered="{!IF(type='response2center', true, false)}">
- <apex:outputText value="{!ra.Loaner_centre_mail_address__c}"/>
- </apex:outputPanel>
- <apex:outputPanel layout="none" rendered="{!IF(type='response2user', true, false)}">
- <apex:outputText value="{!ra.Person_In_Charge__r.Name}"/>锛�
- <apex:outputText value="{!ra.ApplyUser__r.Name}"/>(鎿嶄綔鑰�)
- </apex:outputPanel>
- </td>
- </tr>
- <tr>
- <td>Cc锛�</td>
- <td><apex:inputField value="{!cc.JingliApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.SalesManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.BuchangApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.BuchangApprovalManagerSales__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td><apex:inputField value="{!cc.ZongjianApprovalManager__c}"/></td>
- </tr>
- <tr>
- <td> </td>
- <td>
- <!--zq <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;"/> -->
- <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;margin:10px 0px;"/>
- </td>
- </tr>
- </table>
-
- </apex:pageBlock>
- </apex:outputPanel>
- </apex:form>
- </apex:page>
\ No newline at end of file
+ <table>
+ <tr>
+ <td>To锛�</td>
+ <td>
+ <apex:outputPanel layout="none" rendered="{!IF(type='response2center', true, false)}">
+ <apex:outputText value="{!ra.Loaner_centre_mail_address__c}"/>
+ </apex:outputPanel>
+ <apex:outputPanel layout="none" rendered="{!IF(type='response2user', true, false)}">
+ <apex:outputText value="{!ra.Person_In_Charge__r.Name}"/>锛�
+ <apex:outputText value="{!ra.ApplyUser__r.Name}"/>(鎿嶄綔鑰�)
+ </apex:outputPanel>
+ </td>
+ </tr>
+ <tr>
+ <td>Cc锛�</td>
+ <td><apex:inputField value="{!cc.JingliApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.SalesManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.BuchangApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.BuchangApprovalManagerSales__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td><apex:inputField value="{!cc.ZongjianApprovalManager__c}"/></td>
+ </tr>
+ <tr>
+ <td> </td>
+ <td>
+ <!--zq <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;"/> -->
+ <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;margin:10px 0px;"/>
+ </td>
+ </tr>
+ </table>
+
+ </apex:pageBlock>
+ </apex:outputPanel>
+ </apex:form>
+</apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/EquipmentRentalResponse.page b/force-app/main/default/pages/EquipmentRentalResponse.page
index 14af7a2..aab86e6 100644
--- a/force-app/main/default/pages/EquipmentRentalResponse.page
+++ b/force-app/main/default/pages/EquipmentRentalResponse.page
@@ -6,16 +6,17 @@
<script>
function tocenterjs() {
//blockme();
+ // 20230718 zq add height=400
window.open('/apex/EquipmentRentalResponsePopUp?raid=' + '{!URLENCODE(Rental_Apply__c.Id)}' + '&type=response2center',
'EquipmentRentalDate',
- 'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ 'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}
function touserjs() {
//blockme();
window.open('/apex/EquipmentRentalResponsePopUp?raid=' + '{!URLENCODE(Rental_Apply__c.Id)}' + '&type=response2user',
'EquipmentRentalDate',
- 'height=400,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
+ 'height=600,width=600,top=0,left=0,toolbar=no,menubar=no,scrollbars=no,resizable=no,location=no,status=no');
}
function reloadjs() {
//blockme();
diff --git a/force-app/main/default/pages/EquipmentRentalResponsePopUp.page b/force-app/main/default/pages/EquipmentRentalResponsePopUp.page
index 765e895..5d347a4 100644
--- a/force-app/main/default/pages/EquipmentRentalResponsePopUp.page
+++ b/force-app/main/default/pages/EquipmentRentalResponsePopUp.page
@@ -3,6 +3,12 @@
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
+<!-- 20230718 zq add -->
+<style type="text/css">
+ table.mytable tr{
+ height:35px;
+ }
+</style>
<script>
function savejs() {
blockme();
@@ -41,7 +47,8 @@
<apex:outputPanel id="allPanel">
<apex:pageBlock title="{!$ObjectType.Rental_Apply__c.fields.Response__c.label}" id="allBlock">
<apex:pageBlockButtons location="top">
- <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy"/>
+ <!-- 20230718 zq add style="margin-right:10px" -->
+ <apex:commandButton onclick="j$(this).prop('disabled', true).addClass('btnDisabled'); savejs(); return false;" value="鍙戦��" rerender="dummy" style="margin-right:10px"/>
<apex:commandButton onclick="canceljs(); return false;" value="鍙栨秷" rerender="dummy"/>
</apex:pageBlockButtons>
<!-- 20210927 ljh 搴旂瓟娌熼�� update start -->
diff --git a/force-app/main/default/pages/Lost_Return_DeliverySlip.page b/force-app/main/default/pages/Lost_Return_DeliverySlip.page
index ebfcb4e..0cf397e 100644
--- a/force-app/main/default/pages/Lost_Return_DeliverySlip.page
+++ b/force-app/main/default/pages/Lost_Return_DeliverySlip.page
@@ -97,7 +97,8 @@
<apex:pageBlockSectionItem >
<apex:outputLabel value="鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Name.Label}"/>
<apex:outputPanel >
- <apex:inputField style="min-width: 290px;" value="{!slip.Name}" id="SlipNo"/>
+ <!-- 淇敼娆惧埌 290 鏀逛负181 -->
+ <apex:inputField style="min-width: 181px;" value="{!slip.Name}" id="SlipNo"/>
<apex:commandButton value="鎵繍杈撳崟" onclick="qrscan(1);return false;" disabled="{!readOnly}"/>
<apex:commandButton value="妫�绱�" onclick="blockme();searchSlip(); return false;" disabled="{!readOnly}" oncomplete="checEventFrame();"/>
</apex:outputPanel>
diff --git a/force-app/main/default/pages/TransferAgencyShipment.page b/force-app/main/default/pages/TransferAgencyShipment.page
index 47e9ddb..f65340d 100644
--- a/force-app/main/default/pages/TransferAgencyShipment.page
+++ b/force-app/main/default/pages/TransferAgencyShipment.page
@@ -1,9 +1,11 @@
-<apex:page controller="TransferAgencyShipmentController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍔炰簨澶勪笅鏋�/鍙戣揣">
+<!-- zq 20230718 鍔犲３ -->
+<apex:page lightningStylesheets="true" controller="TransferAgencyShipmentController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍔炰簨澶勪笅鏋�/鍙戣揣">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.instascan)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning 聽-->
<style type="text/css">
.hideDropdown select{
display: none
@@ -180,6 +182,8 @@
<apex:outputLabel value="鍙戣揣-{!$ObjectType.FixtureDeliverySlip__c.fields.Name.Label}"/>
<apex:outputPanel >
<apex:inputField value="{!slip.Name}" id="SlipNo"/>
+ <!-- zq 20230718鎸夐挳瀵归綈娣诲姞 input -->
+ <input type="hidden" name='hide'/>
<apex:commandButton value="鎵繍杈撳崟" onclick="qrscan(1);return false;" disabled="{!readOnly}"/>
<apex:commandButton value="妫�绱�" onclick="blockme();searchSlip(); return false;" disabled="{!readOnly}"/>
</apex:outputPanel>
--
Gitblit v1.9.1