From 474e13364a9f811d530590171debc5ee74db1e0a Mon Sep 17 00:00:00 2001
From: 张宇恒 <bxyun0@163.com>
Date: 星期二, 25 四月 2023 16:53:22 +0800
Subject: [PATCH] 2023-04-25-备品出入库，下架-上架
---
force-app/main/default/pages/EquipmentSetSRList2.page | 5 ++
force-app/main/default/pages/EquipmentSetShippmentReceived5.page | 10 ++++-
force-app/main/default/pages/EquipmentSetShippmentReceived1.page | 15 ++++++-
force-app/main/default/pages/EquipmentSetShippmentReceived2.page | 10 ++++-
force-app/main/default/pages/EquipmentSetShippmentReceived6.page | 10 ++++-
force-app/main/default/pages/EquipmentSetShippmentReceived3.page | 16 ++++++--
force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css | 5 ++
force-app/main/default/pages/EquipmentSetShippmentReceived4.page | 10 ++++-
force-app/main/default/pages/EquipmentSetShippmentReceived1.page-meta.xml | 2
9 files changed, 65 insertions(+), 18 deletions(-)
diff --git a/force-app/main/default/pages/EquipmentSetSRList2.page b/force-app/main/default/pages/EquipmentSetSRList2.page
index 4d2297e..a7a53ab 100644
--- a/force-app/main/default/pages/EquipmentSetSRList2.page
+++ b/force-app/main/default/pages/EquipmentSetSRList2.page
@@ -1,4 +1,7 @@
-<apex:page Controller="EquipmentSetSRList2Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍊熷嚭澶囧搧閰嶅涓�瑙�">
+<!-- 2023-04-23 zyh lightning鍗囩骇 start -->
+<!-- <apex:page Controller="EquipmentSetSRList2Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="鍊熷嚭澶囧搧閰嶅涓�瑙�"> -->
+<apex:page Controller="EquipmentSetSRList2Controller" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true" title="鍊熷嚭澶囧搧閰嶅涓�瑙�">
+<!-- 2023-04-23 zyh lightning鍗囩骇 start -->
<head>
<meta name="format-detection" content="telephone=no"/>
<meta name="viewport" content="width=device-width,initial-scale=1"/>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
index 5be411a..fee876b 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page
@@ -96,12 +96,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 20%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ width: 30%;
+ /* width: 20%; */
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
@@ -256,7 +262,10 @@
<span>涓嬫灦锛� </span>
<!-- 202107721 ljh 1719 end -->
<apex:outputPanel layout="none" rendered="{!esdInfo.editable}">
- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" />
+ <!-- 2023-04-23 zyh lightning鍗囩骇 start -->
+ <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;" />
+ <!-- <apex:inputField id="inspectionResult" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /> -->
+ <!-- 2023-04-23 zyh lightning鍗囩骇 end -->
</apex:outputPanel>
<apex:outputPanel layout="none" rendered="{!NOT(esdInfo.editable)}">
<span><apex:outputField id="inspectionResult1" value="{!esdInfo.rec.StockDown__c}" style="margin:3px;width:75px;" /></span>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page-meta.xml b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page-meta.xml
index 68af565..11a84a0 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived1.page-meta.xml
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived1.page-meta.xml
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
<apiVersion>41.0</apiVersion>
- <availableInTouch>true</availableInTouch>
+ <availableInTouch>false</availableInTouch>
<confirmationTokenRequired>false</confirmationTokenRequired>
<label>EquipmentSetShippmentReceived1</label>
</ApexPage>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
index 02e86a4..53012bb 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived2.page
@@ -131,12 +131,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 24%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ width: 30%;
+ /* width: 24%; */
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
index cecfc05..78ac4f3 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived3.page
@@ -114,12 +114,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 20%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ width: 30%;
+ /* width: 20%; */
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
@@ -259,9 +265,11 @@
<tr>
<td style="text-align: right;" class="deliveryslip">鍙戣揣-杩愯緭鍗曞彿 锛� </td>
<td align="left">
- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/>
+ <apex:inputField value="{!slip.Name}" style="width:100px;float:left" id="SlipNo"/>
+ <!-- <apex:inputField value="{!slip.Name}" style="width:120px;float:left" id="SlipNo"/> -->
<apex:commandButton styleClass="commandbutton" onclick="blockme();searchSlip();return false;" style="float:left" value="妫�绱�" rerender="dummy"/>
- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy"/>
+ <!-- <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy"/> -->
+ <apex:commandButton styleClass="commandbutton" onclick="qrsacn(1)" value="鎵繍杈撳崟鍙�" rerender="dummy" style="margin-left:0; "/>
</td>
</tr>
<tr>
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
index 830f2c1..1a0a536 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived4.page
@@ -433,12 +433,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 20%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* width: 20%; */
+ width: 30%;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
index a6f1dae..7df835b 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived5.page
@@ -126,12 +126,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 24%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* width: 24%; */
+ width: 30%;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
diff --git a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
index a54f71c..d19f363 100644
--- a/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
+++ b/force-app/main/default/pages/EquipmentSetShippmentReceived6.page
@@ -135,12 +135,18 @@
#Step_tab {
list-style-type: none;
padding: 0;
- height: 25px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* height: 25px; */
+ height: 30px;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
border-bottom: 5px solid #3b5998;
}
#Step_tab li {
position: relative;
- width: 20%;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ /* width: 20%; */
+ width: 30%;
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
float: left;
margin: 0;
padding: 0;
diff --git a/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css b/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
index 467c728..1e909b0 100644
--- a/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
+++ b/force-app/main/default/staticresources/EquipmentSetShippmentReceivedcss.css
@@ -35,7 +35,10 @@
padding:0;
font-size:14px;
line-height:1.0;
- height:23px;
+ /* 2023-04-23 zyh lightning鍗囩骇 start */
+ height:33px;
+ /* height:23px; */
+ /* 2023-04-23 zyh lightning鍗囩骇 end */
clear:both;
/*border-bottom: 1px dotted #999;*/
}
--
Gitblit v1.9.1