From cbe8a54c8dc4bdf132df6003682d5bef85af5fe6 Mon Sep 17 00:00:00 2001
From: unknown <sunxia@prec-tech.com>
Date: 星期一, 29 五月 2023 15:32:43 +0800
Subject: [PATCH] Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
---
force-app/main/default/pages/Enquiry.page | 3
force-app/main/default/pages/QueuePageByAssetId.page | 11 ++
force-app/main/default/pages/Relevance.page | 55 +++++++------
force-app/main/default/staticresources/QueuePageByAssetIdCss.css | 15 +++
force-app/main/default/pages/RentalFixtureSetAssign.page | 10 ++
force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js | 21 +++-
force-app/main/default/staticresources/RelationListPagingCmpCss.css | 8 ++
force-app/main/default/staticresources/AccessorySelectCss.css | 16 ++++
force-app/main/default/staticresources/RentalFixtureSetAssignCss.css | 17 ++++
force-app/main/default/pages/TenderDeletePagelwc.page | 3
force-app/main/default/pages/TenderLostPage.page | 53 ++++++------
force-app/main/default/pages/AccessorySelect.page | 24 +++--
12 files changed, 160 insertions(+), 76 deletions(-)
diff --git a/force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js b/force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js
index be9daf2..e2869e5 100644
--- a/force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js
+++ b/force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js
@@ -4,6 +4,7 @@
import init from '@salesforce/apex/TenderingButtonController.initTenderingController';
import sqlResult from '@salesforce/apex/TenderingButtonController.sqlResult';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
+import LightningConfirm from 'lightning/confirm';
export default class lexTenderingLostButton extends LightningElement {
@api recordId;//褰撳墠杩欐潯鏁版嵁鐨刬d
status;//鐘舵��
@@ -55,13 +56,19 @@
}
// 鍒ゆ柇鏄惁闇�瑕佹柊寤鸿浠�
if(this.status == '05.璇环涓�'|| this.status == '06.鎴愪氦' || this.status == '07.閮ㄥ垎鎴愪氦' || this.status == '08.澶卞崟' || result.length > 0){
- if(confirm('姝ら」鐩凡鍏宠仈璇环锛岃纭疄鏄惁鏂板缓璇环鎻愪氦澶卞崟銆�')) {
-
- }else{
- return;
- }
+ LightningConfirm.open({
+ message: '姝ら」鐩凡鍏宠仈璇环锛岃纭疄鏄惁鏂板缓璇环鎻愪氦澶卞崟銆�',
+ variant: 'headerless',
+ label: 'this is the aria-label value',
+ }).then(res=>{
+ if(res) {
+ window.open(`/apex/TenderLostPage?id=${this.recordId}`,'','height=500,width=800,top=200,left=250,location=no');
+ }else{
+ this.dispatchEvent(new CloseActionScreenEvent());
+ return;
+ }
+ });
}
- window.open(`/apex/TenderLostPage?id=${this.recordId}`,'','height=500,width=800,top=200,left=250,location=no');
})
}
showToast(msg,type) {
@@ -71,4 +78,4 @@
});
this.dispatchEvent(event);
}
-}
+}
\ No newline at end of file
diff --git a/force-app/main/default/pages/AccessorySelect.page b/force-app/main/default/pages/AccessorySelect.page
index 4c67261..9d0eff7 100644
--- a/force-app/main/default/pages/AccessorySelect.page
+++ b/force-app/main/default/pages/AccessorySelect.page
@@ -1,4 +1,7 @@
-<apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
+<!-- 20230526 ljh lightning -->
+<!-- <apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
+<apex:page controller="AccessorySelectController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
+
<head>
<title>闄勫睘鍝侀�夋嫨</title>
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
@@ -140,14 +143,17 @@
</script>
</apex:outputPanel>
<!-- </apex:pageBlockSectionItem> -->
-
- <apex:pageBlockButtons location="bottom">
- <!-- <apex:commandButton style="float:left;" value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
- <apex:commandButton style="float:left;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
- <apex:commandButton style="float:left;" value="鍙栨秷鍒嗛厤" onclick="unassign(); return false;" rerender="allForm,checEventFrame"/>
- <apex:commandButton style="float:left;" value="鍙栨秷" onclick="clickCancel(); return false;" />
- <apex:commandButton style="float:right;" action="{!turnback}" value="杩斿洖" rerender="allForm,checEventFrame"/>
- </apex:pageBlockButtons>
+ <!-- 20230526 ljh lightning start outputPanel 鏂板姞 pageBlockButtons娉ㄩ噴-->
+ <apex:outputPanel style="float:left;">
+ <!-- <apex:pageBlockButtons location="bottom"> -->
+ <!-- <apex:commandButton style="float:left;" value="妫�绱�" action="{!searchOpp}" onclick="blockme();" rerender="allForm, checEventFrame" oncomplete="unblockUI();" /> -->
+ <apex:commandButton style="float:left;" action="{!save}" value="淇濆瓨" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="unblockUI();" />
+ <apex:commandButton style="float:left;" value="鍙栨秷鍒嗛厤" onclick="unassign(); return false;" rerender="allForm,checEventFrame"/>
+ <apex:commandButton style="float:left;" value="鍙栨秷" onclick="clickCancel(); return false;" />
+ <apex:commandButton style="float:right;" action="{!turnback}" value="杩斿洖" rerender="allForm,checEventFrame"/>
+ <!-- </apex:pageBlockButtons> -->
+ </apex:outputPanel>
+ <!-- 20230526 ljh lightning end-->
<div style="clear:both;"></div>
<apex:outputPanel id="message">
diff --git a/force-app/main/default/pages/Enquiry.page b/force-app/main/default/pages/Enquiry.page
index ce09ae1..a679418 100644
--- a/force-app/main/default/pages/Enquiry.page
+++ b/force-app/main/default/pages/Enquiry.page
@@ -1,4 +1,5 @@
-<apex:page showHeader="false" sidebar="false" id="test02" title="3.鍏宠仈宸叉湁璇环">
+<!-- <apex:page showHeader="false" sidebar="false" id="test02" title="3.鍏宠仈宸叉湁璇环"> -->
+ <apex:page showHeader="false" sidebar="false" id="test02" title="3.鍏宠仈宸叉湁璇环" lightningStylesheets="true">
<apex:includeLightning />
<div style="width:100%;height:100%;" id="test02Container" />
<script>
diff --git a/force-app/main/default/pages/QueuePageByAssetId.page b/force-app/main/default/pages/QueuePageByAssetId.page
index bd3ee8c..c35e4f5 100644
--- a/force-app/main/default/pages/QueuePageByAssetId.page
+++ b/force-app/main/default/pages/QueuePageByAssetId.page
@@ -1,3 +1,5 @@
+<!-- 20230526 ljh lightning -->
+<!-- <apex:page controller="QueuePageByAssetIdController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true"> -->
<apex:page controller="QueuePageByAssetIdController" showHeader="false" sidebar="false" id="allPage" action="{!init}" lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:stylesheet value="{!URLFOR($Resource.QueuePageByAssetIdCss)}"/>
@@ -5,9 +7,12 @@
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<style>
- table.list{
+ /* 20230526 ljh lightning start */
+ /* table.list{
width: 100%!important;
- }
+ } */
+ body .detailList .dataCol input[type="text"]{min-width: 60px;width:60px;}
+ /* 20230526 ljh lightning end */
</style>
<script type="text/javascript">
var heightAjustment = 120;
@@ -50,7 +55,7 @@
<apex:outputText value="澶囧搧鍒嗙被:"/><apex:outputField value="{!raesd.Equipment_Type_text__c}"/>
</apex:outputPanel>
<apex:outputPanel >
- <apex:outputText value="鎸囧畾鎺掗槦NO.:"/><apex:inputText id="strNum" value="{!inptNumStr}" onChange="changeNum();return false;" />
+ <apex:outputText value="鎸囧畾鎺掗槦NO.:"/><apex:inputText id="strNum" value="{!inptNumStr}" onChange="changeNum();return false;"/>
</apex:outputPanel>
<!-- 20211104 鎺掗槦 add end-->
</apex:pageBlockSection>
diff --git a/force-app/main/default/pages/Relevance.page b/force-app/main/default/pages/Relevance.page
index 23c7c9c..9f55808 100644
--- a/force-app/main/default/pages/Relevance.page
+++ b/force-app/main/default/pages/Relevance.page
@@ -1,27 +1,28 @@
-<apex:page showHeader="false" sidebar="false" id="test01" title="1.鐩稿叧鎬х‘璁�">
- <apex:includeLightning />
- <div style="width:100%;height:100%;" id="test01Container" />
- <script>
- $Lightning.use("c:test01App", function () {
- $Lightning.createComponent("c:relevant",
- {},
- "test01Container",
- function (cmp) {
- console.log('Component created, do something cool here');
- });
- });
-
- var interval = setInterval(()=>{
- var hrefStr = window.location.href;
- if (hrefStr.indexOf("Refresh") != -1) {
- var arr = hrefStr.split("==");
- window.opener.parent.location.href = "/"+arr[1];
- top.window.close();
- clearInterval(interval);
- }
- },1000);
-
-
- </script>
-
-</apex:page>
\ No newline at end of file
+<!-- <apex:page showHeader="false" sidebar="false" id="test01" title="1.鐩稿叧鎬х‘璁�"> -->
+ <apex:page showHeader="false" sidebar="false" id="test01" title="1.鐩稿叧鎬х‘璁�" lightningStylesheets="true">]
+ <apex:includeLightning />
+ <div style="width:100%;height:100%;" id="test01Container" />
+ <script>
+ $Lightning.use("c:test01App", function () {
+ $Lightning.createComponent("c:relevant",
+ {},
+ "test01Container",
+ function (cmp) {
+ console.log('Component created, do something cool here');
+ });
+ });
+
+ var interval = setInterval(()=>{
+ var hrefStr = window.location.href;
+ if (hrefStr.indexOf("Refresh") != -1) {
+ var arr = hrefStr.split("==");
+ window.opener.parent.location.href = "/"+arr[1];
+ top.window.close();
+ clearInterval(interval);
+ }
+ },1000);
+
+
+ </script>
+
+ </apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/pages/RentalFixtureSetAssign.page b/force-app/main/default/pages/RentalFixtureSetAssign.page
index 42946a5..9915642 100644
--- a/force-app/main/default/pages/RentalFixtureSetAssign.page
+++ b/force-app/main/default/pages/RentalFixtureSetAssign.page
@@ -511,11 +511,17 @@
<apex:inputField id="campaignType" value="{!parentObj.CampaignType__c}" />
</td>
</apex:outputPanel>
- <td colspan="2" style="text-align:end;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td colspan="2" style="text-align:end;"> -->
+ <td style="text-align:end;">
+ <!-- 20230526 ljh lightning end-->
<apex:commandButton action="{!defaultScheduel}" disabled="{!parentObj.Demo_purpose1__c=='鍏朵粬'||parentObj.Status__c!='宸叉壒鍑�'}" onclick="if(!defualtconfirm()) return false;blockme();" oncomplete="unblockUI();" value="榛樿鎺掗槦" rerender="message,campaignType"/>
<!-- 20220105 ljh rerender add cmpid -->
</td>
- <td style="width:190px;">
+ <!-- 20230526 ljh lightning start-->
+ <!-- <td style="width:190px;"> -->
+ <td>
+ <!-- 20230526 ljh lightning end-->
<apex:outputPanel rendered="{!!(parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�')}">
<apex:commandButton style="margin-left:20px;" onclick="if(!confirmSpecial()) return false;blockme();" action="{!specialScheduel}" disabled="{parentObj.Demo_purpose1__c=='缁翠慨浠ｇ敤'||parentObj.Demo_purpose1__c=='鍗忚鍊熺敤'||parentObj.Status__c!='宸叉壒鍑�'}" value="鐗规畩鎺掗槦" rerender="cmpid,checEventFrame,message,campaignType" oncomplete="unblockUI();" />
</apex:outputPanel>
diff --git a/force-app/main/default/pages/TenderDeletePagelwc.page b/force-app/main/default/pages/TenderDeletePagelwc.page
index 01b152c..ba22e81 100644
--- a/force-app/main/default/pages/TenderDeletePagelwc.page
+++ b/force-app/main/default/pages/TenderDeletePagelwc.page
@@ -1,4 +1,5 @@
-<apex:page showHeader="false" sidebar="false" id="TenderDeletePageApp" title="鍏宠仈鎷涙姇鏍�">
+<!-- <apex:page showHeader="false" sidebar="false" id="TenderDeletePageApp" title="鍏宠仈鎷涙姇鏍�"> -->
+ <apex:page showHeader="false" sidebar="false" id="TenderDeletePageApp" title="鍏宠仈鎷涙姇鏍�" lightningStylesheets="true">
<apex:includeLightning />
<div style="width:100%;height:100%;" id="TenderDeletePageApp" />
<script>
diff --git a/force-app/main/default/pages/TenderLostPage.page b/force-app/main/default/pages/TenderLostPage.page
index 110317d..3f2bb1c 100644
--- a/force-app/main/default/pages/TenderLostPage.page
+++ b/force-app/main/default/pages/TenderLostPage.page
@@ -1,26 +1,27 @@
-<apex:page showHeader="false" sidebar="false" id="TenderLostApp" title="鎷涙爣椤圭洰澶卞崟">
- <apex:includeLightning />
- <div style="width:100%;height:100%;" id="TenderLostApp" />
-
- <script>
- $Lightning.use("c:TenderLostApp", function () {
- $Lightning.createComponent("c:tenderLost",
- {},
- "TenderLostApp",
- function (cmp) {
- console.log('Component created, do something cool here');
- });
- });
-
- // var interval = setInterval(()=>{
- // var hrefStr = window.location.href;
- // if (hrefStr.indexOf("Refresh") != -1) {
- // // var arr = hrefStr.split("==");
- // // window.open('/a1U/e?retURL=%2F' + arr[1] + '&RecordType=01210000000R4hM');
- // top.window.close();
- // clearInterval(interval);
- // }
- // },1000);
- </script>
-
-</apex:page>
\ No newline at end of file
+<!-- <apex:page showHeader="false" sidebar="false" id="TenderLostApp" title="鎷涙爣椤圭洰澶卞崟"> -->
+ <apex:page showHeader="false" sidebar="false" id="TenderLostApp" title="鎷涙爣椤圭洰澶卞崟" lightningStylesheets="true">
+ <apex:includeLightning />
+ <div style="width:100%;height:100%;" id="TenderLostApp" />
+
+ <script>
+ $Lightning.use("c:TenderLostApp", function () {
+ $Lightning.createComponent("c:tenderLost",
+ {},
+ "TenderLostApp",
+ function (cmp) {
+ console.log('Component created, do something cool here');
+ });
+ });
+
+ // var interval = setInterval(()=>{
+ // var hrefStr = window.location.href;
+ // if (hrefStr.indexOf("Refresh") != -1) {
+ // // var arr = hrefStr.split("==");
+ // // window.open('/a1U/e?retURL=%2F' + arr[1] + '&RecordType=01210000000R4hM');
+ // top.window.close();
+ // clearInterval(interval);
+ // }
+ // },1000);
+ </script>
+
+ </apex:page>
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/AccessorySelectCss.css b/force-app/main/default/staticresources/AccessorySelectCss.css
index e69de29..612737b 100644
--- a/force-app/main/default/staticresources/AccessorySelectCss.css
+++ b/force-app/main/default/staticresources/AccessorySelectCss.css
@@ -0,0 +1,16 @@
+/* 20230526 ljh start lightning */
+table.list .col_IndexFromUniqueKey_Text__c{width:90px;}
+table.list .col_Fixture_Model_No__c{width:120px;}
+table.list .col_Fixture_Name__c{width:100px;}
+table.list .col_Canceled_Flag__c{width:90px;}
+table.list .col_FSD_Is_Optional__c{width:50px;}
+table.list .col_Substitute_flag__c{width:70px;}
+table.list .col_Fu_Shu_Pin_Fen_Pei_Jia__c{width:100px;}
+table.list .col_Asset__r_SerialNumber{width:90px;}
+table.list .col_Asset__r_Salesdepartment__c{width:100px;}
+table.list .col_Asset__r_Internal_asset_location__c{width:100px;}
+table.list .col_Asset__r_You_Xiao_Ku_Cun__c{width:90px;}
+table.list .col_FSD_Is_OneToOne__c{width:70px;}
+table.list .col_Cancel_Reason__c{width:100px;}
+table.list .col_Loaner_cancel_reason__c{width:100px;}
+table.list .col_Loaner_cancel_Remarks__c{width:100px;}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/QueuePageByAssetIdCss.css b/force-app/main/default/staticresources/QueuePageByAssetIdCss.css
index e69de29..a61db08 100644
--- a/force-app/main/default/staticresources/QueuePageByAssetIdCss.css
+++ b/force-app/main/default/staticresources/QueuePageByAssetIdCss.css
@@ -0,0 +1,15 @@
+/* 20230526 ljh lightning */
+table.list .col_Queue_Number__c {width:70px;}
+table.list .col_Rental_Apply__r_Name {width:150px;}
+table.list .col_Queue_Time_F__c {width:100px;}
+table.list .col_Rental_Apply__r_WorkPlace__c {width:120px;}
+table.list .col_Rental_Apply__r_Person_In_Charge__c {width:120px;}
+table.list .col_Rental_Apply__r_Request_shipping_day__c {width:100px;}
+table.list .col_Rental_Apply__r_Request_approval_time__c {width:100px;}
+table.list .col_Rental_Apply__r_demo_purpose2__c {width:100px;}
+table.list .col_Allow_Adjust_Queue_Flag__c {width:100px;}
+table.list .col_jumpReason__c {width:100px;}
+table.list .col_Queue_Conment__c {width:100px;}
+table.list .col_Queue_User__c {width:100px;}
+table.list .col_Rental_Apply__r_Hospital__c {width:100px;}
+table.list .col_Rental_Apply__r_Campaign__c {width:100px;}
\ No newline at end of file
diff --git a/force-app/main/default/staticresources/RelationListPagingCmpCss.css b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
index 5414c08..d949557 100644
--- a/force-app/main/default/staticresources/RelationListPagingCmpCss.css
+++ b/force-app/main/default/staticresources/RelationListPagingCmpCss.css
@@ -12,6 +12,7 @@
overflow: hidden;
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
+ width: 1100px;
}
div#out_Div_L {
position:relative;
@@ -24,6 +25,7 @@
float:left;
/* width:32768px; */ /* 20230523 ljh lightning */
height: 100px; /* tbody銈掕〃绀恒仚銈嬮珮銇曘�佸緦銇s銇仸瑾挎暣 */
+ width: 1100px;
}
div#in_Div_L {
position:relative;
@@ -108,4 +110,10 @@
color: #000;
white-space:normal;
}
+table#tableData{
+ width: 1000px;
+}
+table#tableHeader{
+ width: 1000px;
+}
/* 20230508 ljh lightning鍒囨崲 start */
diff --git a/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css b/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
index e69de29..62d1ee4 100644
--- a/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
+++ b/force-app/main/default/staticresources/RentalFixtureSetAssignCss.css
@@ -0,0 +1,17 @@
+/* 20230526 ljh start lightning */
+table.list .col_First_RAESD_Model_No_F__c {width:120px;}
+table.list .col_Loaner_name_F__c {width:120px;}
+table.list .col_Zhu_Ti_Fen_Pei_Jia__c {width:120px;}
+table.list .col_Fu_Shu_Pin_Fen_Pei_Jia__c {width:100px;}
+table.list .col_Irreplaceable_flag__c {width:100px;}
+table.list .col_Substitute_flag__c {width:100px;}
+table.list .col_Body_Queue_Number__c {width:100px;}
+table.list .col_Pai_Dui_Jia__c {width:100px;}
+table.list .col_Ke_Yi_Fen_Pei_Zhu_Ti_Jia__c {width:100px;}
+table.list .col_Bie_Cun_Fang_Di_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Yong_Tu_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Ben_Bu_Ku_Cun_Jia__c {width:100px;}
+table.list .col_Bie_Chan_Pin_Fen_Lei_Jia__c {width:100px;}
+table.list .col_Rental_Start_Date__c {width:100px;}
+table.list .col_Rental_End_Date__c {width:100px;}
+table.list .col_Jie_Chu_Shi_Jian_Jia__c {width:100px;}
\ No newline at end of file
--
Gitblit v1.9.1