lightningupdate.git

parent: 52e2a7c1 | 补丁 | 提交 | show whitespace

调拨发货收货耗材页面分单备品出借应答沟通：To：备品中心/To:申请者耗材应答沟通-To:备品中心/To:申请者备品出借的应答沟通耗...

zhangqian

2023-07-18 6e454c8c1add1d654334df3089770245f043bb2e

调拨发货 收货 耗材页面 分单 备品出借 应答沟通：To：备品中心/To:申请者 耗材 应答沟通-To:备品中心/To:申请者 备品出借的应答沟通 耗材申请的应答沟通

1

7个文件已修改

	force-app/main/default/pages/ConsumApplySplit.page	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/ConsumEquipmentRentalResponse.page	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/EquipmentRentalResponse.page	5 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/EquipmentRentalResponsePopUp.page	9 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/Lost_Return_DeliverySlip.page	3 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史
	force-app/main/default/pages/TransferAgencyShipment.page	6 ●●●●● 补丁 \| 查看 \| 原始文档 \| blame \| 历史

 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>

 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();

 force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.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();
@@ -43,7 +49,8 @@
                <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"/>
                    <!-- 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 -->

 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();

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

 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>

 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>

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

			@@ -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();

			@@ -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();
			@@ -43,7 +49,8 @@
			<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"/>
			<!-- 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 -->

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

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