parent: a47869c7 | 补丁 | 提交 | show whitespace
unknown
2023-05-29 cbe8a54c8dc4bdf132df6003682d5bef85af5fe6 
Merge branch 'LEX_dev' of http://47.92.229.245:8089/r/lightningupdate into LEX_dev
12个文件已修改
114 ■■■■■ 已修改文件
force-app/main/default/lwc/lexTenderingLostButton/lexTenderingLostButton.js 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/AccessorySelect.page 14 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/Enquiry.page 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/QueuePageByAssetId.page 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/Relevance.page 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalFixtureSetAssign.page 10 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/TenderDeletePagelwc.page 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/TenderLostPage.page 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/AccessorySelectCss.css 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/QueuePageByAssetIdCss.css 15 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RelationListPagingCmpCss.css 8 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/staticresources/RentalFixtureSetAssignCss.css 17 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史 
 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;//当前这条数据的id


    status;//状态


@@ -55,13 +56,19 @@


            }


            // 判断是否需要新建询价


            if(this.status == '05.询价中'|| this.status == '06.成交' || this.status == '07.部分成交' || this.status == '08.失单' || result.length > 0){


                if(confirm('此项目已关联询价，请确实是否新建询价提交失单。')) {


                    


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




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


                <!-- 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:pageBlockButtons> -->


                </apex:outputPanel>


                <!-- 20230526 ljh lightning end-->


                <div style="clear:both;"></div>




                <apex:outputPanel id="message">




 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>




 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;




 force-app/main/default/pages/Relevance.page


@@ -1,4 +1,5 @@


<apex:page showHeader="false" sidebar="false" id="test01" title="1.相关性确认">


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




 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>




 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>




 force-app/main/default/pages/TenderLostPage.page


@@ -1,4 +1,5 @@


<apex:page showHeader="false" sidebar="false" id="TenderLostApp" title="招标项目失单">


<!-- <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" />






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




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




 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を表示する高さ、後でjsにて調整 */


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




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