From 50ce6a5e5ae7ac6ce3e6281acca9a0db568306e6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期三, 23 八月 2023 14:54:59 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/ReceivingNoteStockInRequest.page | 120 +++++++++++++++++++++++++++++++++++++++--------------------
1 files changed, 79 insertions(+), 41 deletions(-)
diff --git a/force-app/main/default/pages/ReceivingNoteStockInRequest.page b/force-app/main/default/pages/ReceivingNoteStockInRequest.page
index 7732e24..5d109aa 100644
--- a/force-app/main/default/pages/ReceivingNoteStockInRequest.page
+++ b/force-app/main/default/pages/ReceivingNoteStockInRequest.page
@@ -1,10 +1,11 @@
-<apex:page controller="ReceivingNoteStockInRequestController" showHeader="false" action="{!init}" id="allPage">
+<apex:page controller="ReceivingNoteStockInRequestController" 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)}"/>
<apex:stylesheet value="{!URLFOR($Resource.ReceivingNotePageCss)}"/>
<apex:includeScript value="{!URLFOR($Resource.ReceivingNotePageJS)}"/>
<apex:includeScript value="{!URLFOR($Resource.CommonUtilJs)}"/>
+ <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/>
<apex:form id="allForm">
<style>
table.headTable td {
@@ -27,6 +28,9 @@
}
td.newed {
color: #f00 !important;
+ }
+ .input90{
+ width: 90%;
}
</style>
<script type="text/javascript">
@@ -152,7 +156,7 @@
</td>
</tr>
</table>
- <table class="searchTable">
+ <table class="searchTable" style="margin-bottom: 5px; margin-top: 5px;">
<tr>
<td>
鏀惰揣鐘舵��:
@@ -189,57 +193,53 @@
<table class="searchTable" style="width:100%">
<tr>
- <td>
+ <td style="padding-top:5px;">
<!-- 鎵�鍦ㄥ湴鍖�(鏈儴) -->
{!$ObjectType.Asset.fields.Salesdepartment__c.label}
- <apex:inputField id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/>
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/> -->
+ <apex:inputField style="width:180px;" id="appSalesdepartment" value="{!pageB.assetInput.Salesdepartment__c}"/>
+ <!-- lightning鏀归�� zyh end -->
</td>
- <td>
+ <td style="padding-top:5px;">
<!-- 鎵�鍦ㄥ湴鍖�(鐪�) -->
{!$ObjectType.Asset.fields.SalesProvince__c.label}
- <apex:inputField id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/>
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/> -->
+ <apex:inputField style="width:180px;" id="appSalesProvince" value="{!pageB.assetInput.SalesProvince__c}"/>
+ <!-- lightning鏀归�� zyh end -->
</td>
- <td>
+ <td style="padding-top:5px;">
<span>
<!-- 浜у搧鍒嗙被(GI/SP) -->
{!$ObjectType.Asset.fields.Product_category__c.label}:
- <apex:inputField id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/>
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/> -->
+ <apex:inputField style="width:180px;" id="appProduct_category" value="{!pageB.assetInput.Product_category__c}"/>
+ <!-- lightning鏀归�� zyh end -->
</span>
</td>
- <td>
+ <td style="padding-top:5px;">
<span>
<!-- 澶囧搧鍒嗙被 -->
{!$ObjectType.Asset.fields.Equipment_Type__c.label}:
- <apex:inputField id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/>
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/> -->
+ <apex:inputField style="width:180px;" id="appEquipment_Type" value="{!pageB.assetInput.Equipment_Type__c}"/>
+ <!-- lightning鏀归�� zyh end -->
</span>
</td>
- <td>
- <span>
- <!-- 绠＄悊绉嶇被 -->
- {!$ObjectType.Asset.fields.Manage_type__c.label}:
- <apex:inputField id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/>
- </span>
- </td>
- <td>
- <span>
- <!-- 鏃犳満韬彿鐮佽澶� -->
- {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}:
- <apex:inputField id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/>
- </span>
- </td>
- <td>
- <span>
- <!-- 澶囧搧鐢ㄩ�旈檮灞炲搧 -->
- {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}:
- <apex:inputField id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/>
- </span>
- </td>
- <td>
+
+ <td rowspan="2">
<span style="margin-left: 10px;">
- <apex:commandButton value="缂栬緫" onclick="blockme();" action="{!changeFixModel}" reRender="allForm" oncomplete="unblockUI();windowResize();"/>
+ <apex:commandButton style="margin-top: 10px;" value="缂栬緫" onclick="blockme();" action="{!changeFixModel}" reRender="allForm" oncomplete="unblockUI();windowResize();"/>
</span>
<span style="margin-left: 10px;">
- <apex:commandButton value="閫傜敤" onclick="applyJs();return false;"/>
+ <apex:commandButton style="margin-top: 10px;" value="閫傜敤" onclick="applyJs();return false;"/>
<script type="text/javascript">
// 閫傜敤鎸夐挳
function applyJs() {
@@ -488,19 +488,57 @@
<apex:commandButton value="閫夋嫨閰嶅" action="{!selectRNS}"/>
</span> -->
<span style="margin-left: 10px;">
- <apex:commandButton value="淇濆瓨" action="{!saveRecord}"/>
+ <apex:commandButton style="margin-top: 10px;" value="淇濆瓨" action="{!saveRecord}"/>
</span>
<span style="margin-left: 10px;">
- <apex:commandButton value="椹冲洖" action="{!reject}"/>
+ <apex:commandButton style="margin-top: 10px;" value="椹冲洖" action="{!reject}"/>
+ </span>
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- lightning鏀归�� zyh end -->
+ <span style="margin-left: 10px;">
+ <apex:commandButton style="margin-top: 10px;" value="鍏ュ簱鎸囩ず" action="{!inStockRequest}"/>
</span>
<span style="margin-left: 10px;">
- <apex:commandButton value="鍏ュ簱鎸囩ず" action="{!inStockRequest}"/>
+ <apex:commandButton style="margin-top: 10px;" value="鎵撳嵃鏀惰揣娓呭崟" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/>
</span>
<span style="margin-left: 10px;">
- <apex:commandButton value="鎵撳嵃鏀惰揣娓呭崟" onclick="window.open('/apex/ReceivingNotePDF?rnid={!parId}');return false;"/>
+ <apex:commandButton style="margin-top: 10px;" value="杩斿洖" onclick="window.close();"/>
</span>
- <span style="margin-left: 10px;">
- <apex:commandButton value="杩斿洖" onclick="window.close();"/>
+ </td>
+ </tr>
+ <tr>
+ <td style="padding-top:5px;">
+ <span>
+ <!-- 绠＄悊绉嶇被 -->
+ {!$ObjectType.Asset.fields.Manage_type__c.label}:
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/> -->
+ <apex:inputField style="width:180px;" id="appManage_type" value="{!pageB.assetInput.Manage_type__c}"/>
+ <!-- lightning鏀归�� zyh end -->
+ </span>
+ </td>
+ <td style="padding-top:5px;">
+ <span>
+ <!-- 鏃犳満韬彿鐮佽澶� -->
+ {!$ObjectType.Asset.fields.unknow_serial_NO_product__c.label}:
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/> -->
+ <apex:inputField style="width:180px;" id="appunknow_serial_NO_product" value="{!pageB.assetInput.unknow_serial_NO_product__c}"/>
+ <!-- lightning鏀归�� zyh end -->
+ </span>
+ </td>
+ <td style="padding-top:5px;">
+ <span>
+ <!-- 澶囧搧鐢ㄩ�旈檮灞炲搧 -->
+ {!$ObjectType.Asset.fields.Loaner_accsessary__c.label}:
+ <!-- lightning鏀归�� zyh start -->
+ <br />
+ <!-- <apex:inputField id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/> -->
+ <apex:inputField style="width:180px;" id="appLoaner_accsessary" value="{!pageB.assetInput.Loaner_accsessary__c}"/>
+ <!-- lightning鏀归�� zyh end -->
</span>
</td>
</tr>
@@ -594,7 +632,7 @@
<apex:repeat value="{!inputFieldList}" var="info" id="inputField">
<td class="dataCellBorder1 intf {!info.value} col_{!info.value} {!IF(var.rnd['Change_Point__c']=='鍒犻櫎','deleted',IF(var.rnd['Change_Point__c']!=NULL,'newed',''))}" align="center">
<apex:outputPanel rendered="{!(contains(var.canChangeField, info.value) || var.canChangeField == '') && !contains(var.canNotChangeField, info.value) && pageB.fixMode && var.canChange && var.rnd['Change_Point__c']!='鍒犻櫎'}">
- <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')"/>
+ <apex:inputField value="{!var.rnd[info.value]}" onchange="setChangeFlg('{!var.lineNo}')" styleClass="input90"/>
</apex:outputPanel>
<apex:outputPanel rendered="{!NOT((contains(var.canChangeField, info.value) || var.canChangeField == '') && !contains(var.canNotChangeField, info.value) && pageB.fixMode && var.canChange && var.rnd['Change_Point__c']!='鍒犻櫎')}">
<apex:outputField value="{!var.rnd[info.value]}"/>
--
Gitblit v1.9.1