zhangqian
2023-08-10 af7f2ebba1ca53c05ad1c47361c889afd53a9765
耗材备品

1
31个文件已修改
7个文件已添加
1128 ■■■■■ 已修改文件
force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml 9 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexConsumFixtureSetSelect/lexConsumFixtureSetSelect.js 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js 126 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.css 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.html 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.js 63 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js 29 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/AgencyGoTo.page 70 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/AgencyGoTo.page-meta.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/Agencytransfer.page 55 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/Agencytransfer.page-meta.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/BusinessManagements.page 33 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumApplySplit.page 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumAssignCancel.page 206 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumDefaultSelect.page 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page 7 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumEquipmentSetReceived.page 13 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumEquipmentSetReturn.page 29 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumFixtureSetSelect.page 7 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumReassign.page 65 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumSelect.page 2 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumTrialDis.page 3 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumTrialUpdate.page 16 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/ConsumUploadPicture.page 6 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/EquipmentManage.page 2 ●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/EquipmentRentalResponsePopUp.page 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/FixtureSetManage.page 12 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/Lost_Return_DeliverySlip.page 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalAgencyReceived.page 18 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalApplyCancel.page 11 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalApplyJump.page 1 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalApplyList.page 216 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalTransfer.page 64 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/pages/RentalTransfer.page-meta.xml 5 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
force-app/main/default/lwc/lexConsumApply_FromAccount/lexConsumApply_FromAccount.js-meta.xml
@@ -7,14 +7,5 @@
        <target>lightning__RecordPage</target>
        <target>lightning__HomePage</target>
        <target>lightning__RecordAction</target>
        <!-- 屏幕流配置 -->
        <target>lightning__FlowScreen</target>
    </targets>
    <!-- 定义变量 -->
    <targetConfigs>
        <targetConfig targets="lightning__FlowScreen">
            <!-- name js中使用的变量,从屏幕流中获取参数  label 在屏幕流的该LWC的设置中显示 -->
            <property name="recordId" type="String" label="recordId"/>
        </targetConfig>
    </targetConfigs>
</LightningComponentBundle>
force-app/main/default/lwc/lexConsumApply_FromOPDPlan/lexConsumApply_FromOPDPlan.js-meta.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>56.0</apiVersion>
    <isExposed>true</isExposed>
    <targets>
@@ -7,14 +7,5 @@
        <target>lightning__RecordPage</target>
        <target>lightning__HomePage</target>
        <target>lightning__RecordAction</target>
        <!-- 屏幕流配置 -->
        <target>lightning__FlowScreen</target>
    </targets>
    <!-- 定义变量 -->
    <targetConfigs>
        <targetConfig targets="lightning__FlowScreen">
            <!-- name js中使用的变量,从屏幕流中获取参数  label 在屏幕流的该LWC的设置中显示 -->
            <property name="recordId" type="String" label="recordId"/>
        </targetConfig>
    </targetConfigs>
</LightningComponentBundle>
force-app/main/default/lwc/lexConsumApply_FromQIS/lexConsumApply_FromQIS.js-meta.xml
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata" fqn="lexEquipmentRentalApply_FromSA">
<LightningComponentBundle xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>56.0</apiVersion>
    <isExposed>true</isExposed>
    <targets>
@@ -7,14 +7,5 @@
        <target>lightning__RecordPage</target>
        <target>lightning__HomePage</target>
        <target>lightning__RecordAction</target>
        <!-- 屏幕流配置 -->
        <target>lightning__FlowScreen</target>
    </targets>
    <!-- 定义变量 -->
    <targetConfigs>
        <targetConfig targets="lightning__FlowScreen">
            <!-- name js中使用的变量,从屏幕流中获取参数  label 在屏幕流的该LWC的设置中显示 -->
            <property name="recordId" type="String" label="recordId"/>
        </targetConfig>
    </targetConfigs>
</LightningComponentBundle>
force-app/main/default/lwc/lexConsumFixtureSetSelect/lexConsumFixtureSetSelect.js
@@ -4,7 +4,6 @@
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { NavigationMixin } from 'lightning/navigation';
// 耗材备品配套一览 自定义按钮或链接:选择明细
export default class LexConsumFixtureSetSelect extends LightningElement {
    @api recordId;
@@ -13,6 +12,12 @@
    connectedCallback(){
        if (this.recordId) {
            window.open("/apex/ConsumFixtureSetSelect?pt_recid="+this.recordId, "_top");
            this.closeAction();
        }
    }
    closeAction() {
        //返回当前的耗材申请
        window.open("/"+this.recordId,'_self');
    }
}
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.html
@@ -1,6 +1,5 @@
<template>
    <div class="dispatchOCSMQARAHolder" if:true={IsLoading}>
        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
        <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
    </div>
</template>
force-app/main/default/lwc/lexEquipmentRentalApply_FromQIS2/lexEquipmentRentalApply_FromQIS2.js
@@ -8,7 +8,7 @@
import { encodeDefaultFieldValues } from 'lightning/pageReferenceUtils';
// 新建备品借出申请(QIS)
export default class LexEquipmentRentalApply_FromQIS2 extends LightningElement {
export default class LexEquipmentRentalApply_FromQIS2 extends NavigationMixin(LightningElement) {
    @api recordId;
    IsLoading = true;
@@ -33,14 +33,11 @@
        rentalApp({
            recordId: this.recordId
        }).then(result => {
            console.log('rentalApp============',result);
            if(result.lenth > 0){
                const evt = new ShowToastEvent({
                    title : 'Error',
                    message : '同一个QIS记录不能重复申请备品',
                    variant : 'error'
                });
                this.dispatchEvent(evt);
            console.log('rentalApp==111==========',result);
            // console.log('rentalApp===222=========',result.length());
            console.log('rentalApp====333========',result.length);
            if(result.length > 0){
                this.showToast('同一个QIS记录不能重复申请备品','warning');
                return;
            }
            init({
@@ -49,21 +46,23 @@
                this.IsLoading = false;
                console.log('init============',result);
                if (result != null) {
                    // 对应方法 next_action__c
                    if(result.nextAction=='送回'){
                        this.showToast('QIS对应方法为“送回”,不能申请','error');
                        this.showToast('QIS对应方法为“送回”,不能申请','warning');
                        return;
                    }
                    // 状态  QIS_Status__c
                    if(result.qISStatus=='草案中'){
                        // this.msg =  'QIS状态为草案中,不能申请';
                        this.showToast('QIS状态为草案中,不能申请','error');
                        this.showToast('QIS状态为草案中,不能申请','warning');
                        return;
                    }
                    if(result.qISStatus=='FSE填写完毕'){
                        this.showToast('QIS状态为FSE填写完毕,不能申请','error');
                        this.showToast('QIS状态为FSE填写完毕,不能申请','warning');
                        return;
                    }
                    if(result.qISStatus=='取消'){
                        this.showToast('QIS状态为取消,不能申请','error');
                        this.showToast('QIS状态为取消,不能申请','warning');
                        return;
                    }
                    // if('{!$User.isFormal_Stuff__c}'=='true'){
@@ -73,62 +72,83 @@
                    //     window.top.location.href=url;
                    //     }
                    UserInfo_Owner({}).then(res=>{
                        if(res.isFormalStuff == 'true'){
                            this.showToast('试用期内,不能申请','error');
                            return;
                        }else{
                            const defaultValues = encodeDefaultFieldValues({
                                QIS_Report__c: this.recordId,
                                Hospital__c: result.hospital,
                                Strategic_dept__c: result.departmentClass,
                                Account__c:result.hospitalDepartment,
                                Demo_purpose1__c:'维修代用',
                                demo_purpose2__c:'索赔QIS',
                                Name:'*',
                                Person_In_Charge__c:res.lastName + res.firstName,
                                applyUser__c:res.lastName + res.firstName,
                                Loaner_received_staff__c:res.lastName + res.firstName,
                                QIS_number__c:result.name,
                                QISRepair__c:result.repair
                            });
                            console.log("=====UserInfo_Owner========>>>=====", res);
                            // 是否在试用期
                            if(res.isFormalStuff){
                                this.showToast('试用期内,不能申请','warning');
                                return;
                            }else{
                                // var url = "/a0t/e?retURL=%2F{!URLENCODE(QIS_Report__c.Id)}&
                                // CF00N10000003Mp1d={!URLENCODE(QIS_Report__c.Hospital__c)}&
                                // CF00N10000003Mp1d_lkid={!URLENCODE(QIS_Report__c.HospitalId__c)}&
                                // CF00N10000003O3V6={!URLENCODE(QIS_Report__c.Department_Class__c)}&
                                // CF00N10000003O3V6_lkid={!URLENCODE(QIS_Report__c.Department_ClassId__c)}&
                                // CF00N10000003Mp2R={!URLENCODE(QIS_Report__c.Hospital_Department__c)}&
                                // CF00N10000003Mp2R_lkid={!URLENCODE(QIS_Report__c.Hospital_DepartmentId__c)}&
                                // 00N10000003Msk0={!URLENCODE('维修代用')}&
                                // 00N10000003Msk5={!URLENCODE('索赔QIS')}&
                                // Name={!URLENCODE('*')}&
                                // CF00N10000005HzRr={!URLENCODE($User.LastName&' '&$User.FirstName)}&
                                // CF00N10000005HzRr_lkid={!URLENCODE($User.Id)}&
                                // CF00N10000005HzRz={!URLENCODE($User.LastName&' '&$User.FirstName)}&
                                // CF00N10000005HzRz_lkid={!URLENCODE($User.Id)}&
                                // 00N10000003OJzc={!URLENCODE($User.LastName&' '&$User.FirstName)}&
                                // CF00N10000004o2Mg={!URLENCODE(QIS_Report__c.Name)}&
                                // CF00N10000004o2Mg_lkid={!URLENCODE(QIS_Report__c.Id)}&
                                // CF00N10000008r73m={!URLENCODE( QIS_Report__c.Repair__c)}&
                                // CF00N10000008r73m_lkid={!URLENCODE( QIS_Report__c.RepairId__c )}&";
                                const defaultValues = encodeDefaultFieldValues({
                                    // QIS_Report__c: this.recordId,
                                    Hospital__c: result.hospital,
                                    Strategic_dept__c: result.departmentClass,
                                    Account__c:result.hospitalDepartment,
                                    Demo_purpose1__c:'维修代用',
                                    demo_purpose2__c:'索赔QIS',
                                    Name:'*',
                                    Person_In_Charge__c:res.id,
                                    applyUser__c:res.id,
                                    Loaner_received_staff__c:res.lastName + res.firstName,
                                    QIS_number__c:result.Id,
                                    QISRepair__c:result.repair
                                });
                            this[NavigationMixin.Navigate]({
                                type: 'standard__objectPage',
                                attributes: {
                                    objectApiName: 'Rental_Apply__c',
                                    actionName: 'new'
                                },
                                state:{
                                    defaultFieldValues: this.defaultValues
                                }
                            })
                        }
                    })
                                console.log("=====UserInfo_Owner========>>>=====", result.hospital,result.departmentClass,result.hospitalDepartment,res.id,res.lastName + res.firstName,result.Id,result.repair)
                                console.log("=====UserInfo_Owner========>>>=====", result.Id+" >>>>> ",result.repair)
                                console.log("=============>>>=====", defaultValues)
                                this[NavigationMixin.Navigate]({
                                    type: 'standard__objectPage',
                                    attributes: {
                                        objectApiName: 'Rental_Apply__c',
                                        actionName: 'new'
                                    },
                                    state:{
                                        defaultFieldValues: defaultValues
                                    }
                                });
                            }
                    }).catch(error => {
                        console.log("error----", error);
                        console.log(error);
                    });
                    this.dispatchEvent(new CloseActionScreenEvent());
                    // window.location.reload();
                }
            }).catch(error => {
                console.log("error");
                console.log("error----", error);
                console.log(error);
            }).finally(() => {
            });
        }).catch(error => {
            console.log("error");
            console.log(error);
        }).finally(() => {
            console.log("error",error);
        });        
    }
    showToast(message, type) {
        const evt = new ShowToastEvent({
            title: 'Error',
            // title: 'Error',
            message: message,
            variant: type
        });
        this.dispatchEvent(evt);
        this.dispatchEvent(new CloseActionScreenEvent());
    }
    };
}
force-app/main/default/lwc/lexEquipmentRentalApply_FromSA/lexEquipmentRentalApply_FromSA.js
@@ -73,6 +73,7 @@
                                console.log("==========res===>>>=====", res);
                                console.log("==========result1===>>>=====", result);
                                const defaultValues = {
                                    Statu_Achievements__c:result.achievementId,
                                    Hospital__c: result.hospital,
                                    Name:'*',
                                    Strategic_dept__c: result.departmentClass,
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.css
New file
@@ -0,0 +1,11 @@
.Holder{
    position: relative;
    display: inline-block;
    width: 80px;
    height: 80px;
    text-align: center;
}
.container .uiContainerManager{
    display : none !important;
}
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.html
@@ -1,5 +1,6 @@
<template>
    <div class="exampleHolder" if:true={IsLoading}>
        <lightning-spinner alternative-text="Loading" size="medium"></lightning-spinner>
        <lightning-button label="Show Toast" onclick={ShowToastEvent}></lightning-button>
    </div>
</template>
force-app/main/default/lwc/lexLostSubmitApproval/lexLostSubmitApproval.js
@@ -3,6 +3,7 @@
import { CloseActionScreenEvent } from 'lightning/actions';
import updateForSubmitButton  from '@salesforce/apex/ReportController.updateForSubmitButton';
import { updateRecord } from 'lightning/uiRecordApi';
import LightningConfirm from 'lightning/confirm';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import init from '@salesforce/apex/LexLostSubmitApprovalController.LexLostSubmitApprovalController';
import submit from '@salesforce/apex/LexLostSubmitApprovalController.submit';
@@ -35,16 +36,19 @@
            console.log("LexConsumablesLost------>>>",result)
            if (result.statusTf == "填写完毕" ||  result.statusTf == "申请中" || result.statusTf == "已批准") {
              this.showToast('请确认遗失报告状态,已经提交过的申请,不能重复提交','warning')
              return;
              this.showToast('124563','请确认遗失报告状态,已经提交过的申请,不能重复提交','error');
            }
            if (!confirm("一旦提交此记录以待批准,根据您的设置您可能不再能够编辑此记录或将他从批准过程中调回。是否继续?")) {
                return;
            }
            // -----------------------------------------------------------------------------------------------------
            // if (!confirm("一旦提交此记录以待批准,根据您的设置您可能不再能够编辑此记录或将他从批准过程中调回。是否继续?")) {
            //     return;
            // }
                LightningConfirm.open({
                message: "一旦提交此记录以待批准,根据您的设置您可能不再能够编辑此记录或将他从批准过程中调回。是否继续?",
                variant: 'headerless',
                label: '提示信息',
                // setting theme would have no effect
            }).then(submitgo=>{
            if (result.reportDetailList.length > 0) {
              // console.log("-----reportDetailList-----------",result.reportDetailList.length);
              var qianpinDate = new Date(result.reportDetailList[0].Rental_Apply_Equipment_Set_Detail__r.Lost_item_check_day__c);
              for (var i = 1; i < result.reportDetailList.length; i++) {
                var d = new Date(result.reportDetailList[i].Rental_Apply_Equipment_Set_Detail__r.Lost_item_check_day__c);
@@ -54,29 +58,13 @@
              }
              qianpinDate.setDate(qianpinDate.getDate() + 90);
              var d = '' + qianpinDate.getFullYear()+'/' + (qianpinDate.getMonth()+1) + '/' + qianpinDate.getDate();
              this.showToast('请您的上级领导于' + d + '前完成遗失报告审批,否则备品自动断念,遗失报告自动取消。','warning');
              this.showToast('请您的上级领导于' + d + '前完成遗失报告审批,否则备品自动断念,遗失报告自动取消。','error');
            }
            // -----------------------------------------------------------------------------------------------------
            this.submitApproval()
            this.submitApproval();
          })
        })
        .catch(e=>{console.log(e)})
        .finally(()=>{
            this.dispatchEvent(new CloseActionScreenEvent());
        })
     }
     showToast(msg,type) {
      const event = new ShowToastEvent({
          // title: '',
          message: msg,
          variant: type
      });
      this.dispatchEvent(event);
      this.dispatchEvent(new CloseActionScreenEvent());
    }
     updateRecordView(recordId) {
        updateRecord({fields: { Id: recordId }});
@@ -87,15 +75,26 @@
        recordId: this.recordId
      }).then(result=>{
        if(result != '1'){
          this.showToast(result,"warning");
          return
            this.showToast('','此记录不满足任何有效批准过程的项目条件或初始提交。请与您的管理员联系以获取帮助。','error');
              return;
        }
        this.updateRecordView(this.recordId);
        // this.showToast("提交成功","success");
        this.showToast("提交成功","success");
        this.dispatchEvent(new CloseActionScreenEvent());
      })
      .finally(()=>{
        window.location.reload();
      })
      .catch(e=>{
        console.log("submitApproval----eee------->>>>",e);
      })
   }
   showToast(title,msg,type) {
    const event = new ShowToastEvent({
        title: '',
        message: msg,
        variant: type
    });
    this.dispatchEvent(event);
    this.dispatchEvent(new CloseActionScreenEvent());
  }
}
force-app/main/default/lwc/lexNewSparePartsLoanApplication/lexNewSparePartsLoanApplication.js
@@ -18,7 +18,7 @@
            console.log(currentPageReference);
        if (currentPageReference) {
          const urlValue = currentPageReference.state.recordId;
          let urlValue = currentPageReference.state.recordId;
          if (urlValue) {
            let str = `${urlValue}`;
            console.log("str");
@@ -47,11 +47,11 @@
                    return;
                }
                // 决裁状态  Approved_Status__c  
                if (result.opdIFApproved == true && result.opdApprovedNo != '' && result.opdStatusProcessState.indexOf(result.opdApprovedStatus)!= -1 && result.opdApprovedStatus != '草稿' ){
                if (result.opdIFApproved == true && result.opdApprovedNo != '' && result.opdStatusProcessState.indexOf(result.opdApprovedStatus)!== -1 && result.opdApprovedStatus != '草稿' ){
                    this.showToast('已申请决裁但决裁状态不符合条件','warning');
                    return;
                }
                var HaveValue = "{!OPDPlan__c.Rental_Apply2__c}";
                // var HaveValue = "{!OPDPlan__c.Rental_Apply2__c}";
                //     备品借出申请1   Rental_Apply2__c ;  OPD计划来源  OPDType__c
                if (result.opdRentalApply2 != '' && result.opdType != '学会') {
                    this.showToast('一个OPD计划只可关联创建一个备品申请单','warning');
@@ -85,10 +85,10 @@
                        let getCampaignRecodeType = result.opdCampaignTypeId.slice(0,15)
                        console.log("-------opdCampaignRecodeTypeId---2222---------",getCampaignRecodeType,campaignRecodeType);
                        // 职种 Job_Category__c
                        if (campaignRecodeType !== getCampaignRecodeType && res.userJobCategory == '销售服务' ) {
                        if (campaignRecodeType != getCampaignRecodeType && res.userJobCategory == '销售服务' ) {
                            this.showToast('FSE不能申请该学会类型备品','warning');
                            return;
                        } else if ((res.userJobCategory == '销售服务' || res.userJobCategory == '支援') && campaignRecodeType !== getCampaignRecodeType && result.opdInternalinchargeprovince.indexOf(ups) == -1) {
                        } else if ((res.userJobCategory == '销售服务' || res.userJobCategory == '支援') && campaignRecodeType != getCampaignRecodeType && result.opdInternalinchargeprovince.indexOf(ups) == -1) {
                            this.showToast("与FSE所在省一致,才可使用备品",'warning');
                            return;
                        } else if (result.opdCampaignStatus == '已结束') {
@@ -110,16 +110,18 @@
                    // 原OPD计划(再申请)   OriginalOpdPlan__c  原OPD计划(补充申请) OriginalOpdPlanApplication__c
                    if (result.opdOriginalOpdPlan == '') {
                        if (result.opdOriginalOpdPlanApplication == '') {
                            console.log("---------学会-5555--------",result.opdCampaignId);
                            if (result.opdType == '学会' && result.opdCampaignId != '') {
                                console.log("---------学会---------",result.opdCampaignId);
                                // var purposeStr = '&00N10000003Msk0=产品试用' +
                                // '&00N10000003Msk5=学会展会' +
                                // '&CF00N10000003Mp2q_lkid={!URLENCODE(OPDPlan__c.CampaignId__c)}' +
                                // '&CF00N10000003Mp2q={!URLENCODE(OPDPlan__c.CampaignName__c)}';
                                const defaultValues = encodeDefaultFieldValues({
                                let defaultValues = encodeDefaultFieldValues({
                                    // OPDPlan__c:this.recordId,
                                    Demo_purpose1__c:'产品试用',
                                    demo_purpose2__c:'学会展会',
                                    Campaign__c:result.opdCampaign,
                                    Campaign__c:result.opdCampaignId,
                                    Account__c:result.opdAccountLaboratory,
                                    Strategic_dept__c:result.opdOCMcategoryId,
                                    Hospital__c:result.opdHospitalId,
@@ -133,6 +135,7 @@
                                    Approved_State_Create__c:result.ApprovedStatus,
                                    ApprovedNo_Create__c:result.opdApprovedNo
                                });
                                console.log("---------学会---defaultValues------",defaultValues);
                                this.navigateEvents(defaultValues);
                            } else if (result.opdOpportunityId != '') {
                                // 跟进询价ID1
@@ -141,7 +144,7 @@
                                // '&CF00N10000003O3VB_lkid={!OPDPlan__c.Related_Opportunity1_IDId__c}' +
                                // '&CF00N10000003O3VB={!HTMLENCODE(OPDPlan__c.Related_Opportunity1_Name__c)}';
                                console.log("--------defaultValues------")
                                const defaultValues = encodeDefaultFieldValues({
                                let defaultValues = encodeDefaultFieldValues({
                                    // OPDPlan__c:this.recordId,
                                    Demo_purpose1__c:'产品试用',
                                    demo_purpose2__c:'试用(有询价)',
@@ -168,7 +171,7 @@
                                // var purposeStr = '&00N10000003Msk0=产品试用' +
                                // '&00N10000003Msk5=试用(无询价)' +
                                // '&00N100000098amW={!OPDPlan__c.NoOpp_Reason__c}';
                                const defaultValues = encodeDefaultFieldValues({
                                let defaultValues = encodeDefaultFieldValues({
                                    // OPDPlan__c:this.recordId,
                                    Demo_purpose1__c:'产品试用',
                                    demo_purpose2__c:'试用(有询价)',
@@ -206,7 +209,7 @@
                            // window.open('/a0t/e?retURL=%2F{!OPDPlan__c.Id}' + purposeStr + urlStr );
                            
                        } else {
                            const defaultValues = encodeDefaultFieldValues({
                            let defaultValues = encodeDefaultFieldValues({
                                // OPDPlan__c:this.recordId,
                                Cancel_Reason__c:'',
                                Loaner_cancel_reason__c:'',
@@ -230,7 +233,7 @@
                        }
                    }else {
                        console.log("-------UserInfo_Owner---00000--else-------");
                        const defaultValues = encodeDefaultFieldValues({
                        let defaultValues = encodeDefaultFieldValues({
                            // OPDPlan__c:this.recordId,
                            Cancel_Reason__c:'',
                            Loaner_cancel_reason__c:'',
@@ -265,7 +268,7 @@
    }
    showToast(message, type) {
        const evt = new ShowToastEvent({
        let evt = new ShowToastEvent({
            // title: 'Error',
            message: message,
            variant: type
@@ -285,6 +288,6 @@
            state:{
                defaultFieldValues: defaultValues
            }
        })
        });
    }
}
force-app/main/default/pages/AgencyGoTo.page
New file
@@ -0,0 +1,70 @@
<apex:page showHeader="true" sidebar="true" Controller="SidebarController" lightningStylesheets="true">
    <head>
        <title></title>
        <style>
            ul li {
                list-style: none;
                /* line-height: 25px; */
                /* text-align: center; */
            }
            a{
                text-decoration:none;
                /* font-size: 20px; */
            }
        </style>
    </head>
    <script>
        function toURLPreJs(name) {
            // alert(name);
            toURL(name);
        }
        function toURLJs() {
            // alert({!reportid});
            var ss = document.getElementById("hidden").value;
            //新窗口打开,还是本页面打开,还是弹窗打开请自行修改window.open
            window.open('/'+ss,'_blank');
        }
    </script>
    <apex:form id="allForm">
        <apex:actionFunction name="toURL" action="{!toURL}" rerender="allForm,checEventFrame" oncomplete="toURLJs();">
                  <apex:param name="firstParam" assignTo="{!DeveloperName}" value="" />
            </apex:actionFunction>
            <apex:outputPanel id="message">
                    <apex:pageMessages />
                    <input id="hidden" type="hidden" name="hidden" value="{!reportid}"/>
                </apex:outputPanel>
        <ul style="margin : 0 auto;">
            <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=1000, top=100, left=100, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitAssignRetalApply');return false;" target="_blank" >等待分配备品借出申请一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitDownAssetListAgency');return false;" target="_blank" >待下架备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitShipAssetAgencyReport');return false;" target="_blank" >待发货备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('TodayReturnAssetAgencyReport');return false;" target="_blank" >今天返回的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitCDSAssetAgency');return false;" target="_blank" >待CDS的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitUpAssetAgencyReport');return false;" target="_blank" >需要上架的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('TodayInStoreAgencyReport');return false;" target="_blank" >今天入库的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('ShortHistoryAgency');return false;" target="_blank" >欠品历史一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitRepairAgencyReport');return false;" target="_blank" >待修理的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('WaitAbandonAssetAgency');return false;" target="_blank" >待废弃备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('AngecyMonthAssetReport');return false;" target="_blank" >现地备品月报一览</a></li>
            <hr />
            <li><a href="/apex/EquipmentRentalExtend" target="_blank">查询借出中备品</a></li>
            <hr />
            <!-- <li>window.open('/apex/WebToEquipmentSetShippmentReceived','','height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')</li> -->
        </ul>
    </apex:form>
</apex:page>
force-app/main/default/pages/AgencyGoTo.page-meta.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>57.0</apiVersion>
    <label>AgencyGoTo</label>
</ApexPage>
force-app/main/default/pages/Agencytransfer.page
New file
@@ -0,0 +1,55 @@
<apex:page showHeader="true" sidebar="true" Controller="SidebarController" lightningStylesheets="true">
    <head>
        <title></title>
        <style>
            ul li {
                list-style: none;
                /* line-height: 25px; */
                /* text-align: center; */
            }
            a{
                text-decoration:none;
                /* font-size: 20px; */
            }
        </style>
    </head>
    <script>
        function toURLPreJs(name) {
            // alert(name);
            toURL(name);
        }
        function toURLJs() {
            // alert({!reportid});
            var ss = document.getElementById("hidden").value;
            //新窗口打开,还是本页面打开,还是弹窗打开请自行修改window.open
            window.open('/'+ss,'_blank');
        }
    </script>
    <apex:form id="allForm">
        <apex:actionFunction name="toURL" action="{!toURL}" rerender="allForm,checEventFrame" oncomplete="toURLJs();">
                  <apex:param name="firstParam" assignTo="{!DeveloperName}" value="" />
            </apex:actionFunction>
            <apex:outputPanel id="message">
                    <apex:pageMessages />
                    <input id="hidden" type="hidden" name="hidden" value="{!reportid}"/>
                </apex:outputPanel>
        <ul style="margin : 0 auto;">
            <li><a href="" onclick="toURLPreJs('Need_off_Shelf_Spare');return false;" target="_blank" >待下架备品一览(现地)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_Delivery_Spare');return false;" target="_blank" >待发货备品一览(现地)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_Arrival_Confirmation_Spare');return false;" target="_blank" >待到货确认备品一览(现地)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_CDS_Spare');return false;" target="_blank" >待CDS的备品一览(现地)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_On_Shelf_Spare');return false;" target="_blank" >需要上架的备品一览(现地)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_Send_Back_Spare');return false;" target="_blank" >待回寄备品一览(现地)</a></li>
            <hr />
            <!-- <li>window.open('/apex/WebToEquipmentSetShippmentReceived','','height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')</li> -->
        </ul>
</apex:form>
</apex:page>
force-app/main/default/pages/Agencytransfer.page-meta.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>57.0</apiVersion>
    <label>Agencytransfer</label>
</ApexPage>
force-app/main/default/pages/BusinessManagements.page
@@ -47,6 +47,7 @@
                <input id="hidden" type="hidden" name="hidden" value="{!reportid}"/>
            </apex:outputPanel>
<ul style="margin : 0 auto;">
<<<<<<< Updated upstream
    <li><a href="/apex/MaintenanceContractPCL" target="_blank" >周会--维修合同管理表</a></li>
    <hr />
    <li><a href="/apex/OpportunityPCLNew" target="_blank" >周会--询价管理表</a></li>
@@ -73,6 +74,38 @@
    <hr />
    <li><a href="00O10000002kTLp'" target="_blank" >本月H0拜访情况</a></li>
    <hr />
=======
    <li><a href="/apex/FrameNumUpload" target="_blank" >进口单证上传</a></li>
    <hr />
    <li><a href="/apex/IDInformationAnalyseAsset" target="_blank" >ID信息分析</a></li>
    <hr />
    <li><a href="/apex/MaintenanceContractPCL" target="_blank" >周会--维修合同管理表</a></li>
    <hr />
    <li><a href="/apex/OpportunityPCLNew" target="_blank" >周会--询价管理表</a></li>
    <hr />
    <li><a href="/apex/Dealer_enquiry" target="_blank" >询价--经销商询价</a></li>
    <hr />
    <li><a href="/apex/StatuAchievementsPCL" target="_blank" >周会--注残管理表</a></li>
    <hr />
    <li><a href="/apex/LeadIntention" target="_blank" >会议询问单确认一览表</a></li>
    <hr />
    <li><a href="/apex/AccountPCL'" target="_blank" >周会--客户跟进管理表</a></li>
    <hr />
    <li><a href="/apex/PersonalCalendar" target="_blank" >周会--行动管理日历</a></li>
    <hr />
    <li><a href="/apex/AssetTable'" target="_blank" >保有设备管理表</a></li>
    <hr />
    <li><a href="/apex/PersonalEvaluation" target="_blank" >个人仪表板(下属指导)</a></li>
    <hr />
    <li><a href="/apex/ProvinceEvaluation" target="_blank" >按省仪表板</a></li>
    <hr />
    <li><a href="/apex/NewQuoteIrai" target="_blank" >报价委托</a></li>
    <hr />
    <li><a href="" onclick="toURLPreJs('Copy_quotation_request1024');return false;" target="_blank" >报价委托历史</a></li>
    <hr />
    <li><a href="00O10000002kTLp'" target="_blank" >本月H0拜访情况</a></li>
    <hr />
>>>>>>> Stashed changes
    <li><a href="" onclick="toURLPreJs('Contain_stop_pcl');return false;" target="_blank" >包含停止产品询价</a></li>
    <hr />
    <li><a href="/00O10000003ONn3" target="_blank" >标准配套一览</a></li> <!-- 打开页面有问题 -->
force-app/main/default/pages/ConsumApplySplit.page
@@ -1,5 +1,5 @@
<!--20230427 zq <apex:page controller="ConsumApplySplitController" action="{!init}" showHeader="false"> -->
  <apex:page lightningStylesheets="true" controller="ConsumApplySplitController" action="{!init}" showHeader="false">
<apex:page lightningStylesheets="true" controller="ConsumApplySplitController" action="{!init}" showHeader="false">
    <head>
      <title>备品借出申请分单</title>
      <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
force-app/main/default/pages/ConsumAssignCancel.page
@@ -1,107 +1,107 @@
<!--20230427 zq <apex:page controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}"> -->
    <apex:page lightningStylesheets="true" controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
        <head>
            <title>耗材取消明细申请</title>
            <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
            <apex:stylesheet value="{!URLFOR($Resource.AccessorySelectCss)}"/>
            <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
            <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
            <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
            <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->
        </head>
        <!-- zq 修改表格宽度 -->
        <style>
            table.list .col_Model_No__c {width:80px;}
            table.list .col_RetalFSetDetail_Cnt__c {width:30px;}
            table.list .col_VF_Cancel_Detail_Count__c {width:50px;}
            table.list .col_Cancel_Reason__c {width:30px;}
            table.list .col_Loaner_cancel_Remarks__c {width:80px;}
        </style>
        <script type="text/javascript">
            // 編集チェック
            function setChangeFlg(lineno) {
                // with checkbox
                if(document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck') !=null){
                    var nowChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked;
                    var oldChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked;
                    console.log(nowChk,oldChk);
                    if (nowChk || (nowChk != oldChk)) {
                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
                        // reset orderNo
                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = nowChk;
                        resetOrderNo();
                    }
                    if (nowChk == false && nowChk == oldChk) {
                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
                        document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = true;
                    }
                }else{
                    document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
                    document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
<apex:page lightningStylesheets="true" controller="ConsumAssignCancelController" showHeader="false" sidebar="false" id="allPage" action="{!init}">
<head>
    <title>耗材取消明细申请</title>
    <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
    <apex:stylesheet value="{!URLFOR($Resource.AccessorySelectCss)}"/>
    <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
    <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
    <apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
    <apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->
</head>
<!-- zq 修改表格宽度 -->
<style>
    table.list .col_Model_No__c {width:120px;}
    table.list .col_RetalFSetDetail_Cnt__c {width:100px;}
    table.list .col_VF_Cancel_Detail_Count__c {width:150px;}
    table.list .col_Cancel_Reason__c {width:100px;}
    table.list .col_Loaner_cancel_Remarks__c {width:100px;}
</style>
<script type="text/javascript">
    // 編集チェック
    function setChangeFlg(lineno) {
        // with checkbox
        if(document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck') !=null){
            var nowChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked;
            var oldChk = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked;
            console.log(nowChk,oldChk);
            if (nowChk || (nowChk != oldChk)) {
                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
                // reset orderNo
                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = nowChk;
                resetOrderNo();
            }
            if (nowChk == false && nowChk == oldChk) {
                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
                document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowOldCheck').checked = true;
            }
        }else{
            document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + lineno + ':rowCheck').checked = true;
            document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable:' + lineno + ':changeFlg').value = 1;
        }
    }
    function applyJs() {
        var cnt = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:currentPageRecordCnt').value;
        var Cancel_Reason = j$(escapeVfId('allPage:allForm:searchBlock:Cancel_Reason')).value();
        var cancel_count = j$(escapeVfId('allPage:allForm:searchBlock:VF_Cancel_Detail_Count')).value();
        var cancel_comment = j$(escapeVfId('allPage:allForm:searchBlock:Loaner_cancel_Remarks')).value();
        var cancel_Reasons = [];
        j$("td.dataCellBorder1.col_Cancel_Reason__c").each(function () {
            cancel_Reasons.push(j$(this))
        });
        var cancel_counts = [];
        j$("td.dataCellBorder1.col_VF_Cancel_Detail_Count__c").each(function () {
            cancel_counts.push(j$(this))
        });
        var cancel_comments = [];
        j$("td.dataCellBorder1.col_Loaner_cancel_Remarks__c").each(function () {
            cancel_comments.push(j$(this))
        });
        for (var i = 0; i < cnt; i++) {
            var lock = j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + i + ':rowCheck'));
            if(lock.prop('checked') == true){
                if(Cancel_Reason !== ""){
                    cancel_Reasons[i].find("Select").val(Cancel_Reason);
                }
                if(cancel_count !== ""){
                    cancel_counts[i].find("input").val(cancel_count);
                }
                if(cancel_comment!==""){
                    cancel_comments[i].find("input").val(cancel_comment);
                }
            }
            function applyJs() {
                var cnt = document.getElementById('allPage:allForm:cmpid:cmpinnerid:dataBlock:currentPageRecordCnt').value;
                var Cancel_Reason = j$(escapeVfId('allPage:allForm:searchBlock:Cancel_Reason')).value();
                var cancel_count = j$(escapeVfId('allPage:allForm:searchBlock:VF_Cancel_Detail_Count')).value();
                var cancel_comment = j$(escapeVfId('allPage:allForm:searchBlock:Loaner_cancel_Remarks')).value();
                var cancel_Reasons = [];
                j$("td.dataCellBorder1.col_Cancel_Reason__c").each(function () {
                    cancel_Reasons.push(j$(this))
                });
                var cancel_counts = [];
                j$("td.dataCellBorder1.col_VF_Cancel_Detail_Count__c").each(function () {
                    cancel_counts.push(j$(this))
                });
                var cancel_comments = [];
                j$("td.dataCellBorder1.col_Loaner_cancel_Remarks__c").each(function () {
                    cancel_comments.push(j$(this))
                });
                for (var i = 0; i < cnt; i++) {
                    var lock = j$(escapeVfId('allPage:allForm:cmpid:cmpinnerid:dataBlock:oppTable_L:' + i + ':rowCheck'));
                    if(lock.prop('checked') == true){
                        if(Cancel_Reason !== ""){
                            cancel_Reasons[i].find("Select").val(Cancel_Reason);
                        }
                        if(cancel_count !== ""){
                            cancel_counts[i].find("input").val(cancel_count);
                        }
                        if(cancel_comment!==""){
                            cancel_comments[i].find("input").val(cancel_comment);
                        }
                    }
                }
            }
        </script>
            <apex:form id="allForm">
                <apex:outputPanel id="pageallPanel">
                    <apex:pageBlock id="searchBlock" tabStyle="Report">
                        <apex:pageBlockSection title="取消明细申请">
                            <apex:outputField value="{!parentObj.Name}"/>
                            <apex:outputField value="{!parentObj.Person_In_Charge__c}"/>
                            <apex:outputField value="{!parentObj.Salesdept__c}"/>
                            <apex:outputField value="{!parentObj.WorkPlace__c}"/>
                            <apex:outputField value="{!parentObj.Internal_asset_location_F__c}"/>
                            <apex:outputField value="{!parentObj.demo_purpose2__c}"/>
                            <apex:outputField value="{!parentObj.Request_shipping_day__c}"/>
                            <apex:outputField value="{!parentObj.Asset_loaner_start_date__c}"/>
                        </apex:pageBlockSection>
                        <apex:outputPanel >
                            <apex:outputLabel value="{!SUBSTITUTE($ObjectType.Consum_Apply_Equipment_Set__c.fields.VF_Cancel_Detail_Count__c.label,'(Sys)','')}" for="VF_Cancel_Detail_Count"/>
                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.VF_Cancel_Detail_Count__c}" id="VF_Cancel_Detail_Count"/>
                            <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Cancel_Reason__c.label}" for="Cancel_Reason"/>
                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Cancel_Reason__c}" id="Cancel_Reason"/>
                            <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Loaner_cancel_Remarks__c.label}" for="VF_Cancel_Detail_Count"/>
                            <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Loaner_cancel_Remarks__c}" id="Loaner_cancel_Remarks"/>
                            <apex:commandButton style="margin-left: 30px;" rerender="allForm,checEventFrame" value="适用" onclick="applyJs(); return flase;" />
                            <apex:commandButton style="margin-left: 10px;" action="{!save}" value="保存" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="windowResize();unblockUI();" />
                        </apex:outputPanel>
                    </apex:pageBlock>
                    <apex:outputPanel id="message">
                        <apex:pageMessages />
                    </apex:outputPanel>
                    <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true"/>
        }
    }
</script>
    <apex:form id="allForm">
        <apex:outputPanel id="pageallPanel">
            <apex:pageBlock id="searchBlock" tabStyle="Report">
                <apex:pageBlockSection title="取消明细申请">
                    <apex:outputField value="{!parentObj.Name}"/>
                    <apex:outputField value="{!parentObj.Person_In_Charge__c}"/>
                    <apex:outputField value="{!parentObj.Salesdept__c}"/>
                    <apex:outputField value="{!parentObj.WorkPlace__c}"/>
                    <apex:outputField value="{!parentObj.Internal_asset_location_F__c}"/>
                    <apex:outputField value="{!parentObj.demo_purpose2__c}"/>
                    <apex:outputField value="{!parentObj.Request_shipping_day__c}"/>
                    <apex:outputField value="{!parentObj.Asset_loaner_start_date__c}"/>
                </apex:pageBlockSection>
                <apex:outputPanel >
                    <apex:outputLabel value="{!SUBSTITUTE($ObjectType.Consum_Apply_Equipment_Set__c.fields.VF_Cancel_Detail_Count__c.label,'(Sys)','')}" for="VF_Cancel_Detail_Count"/>
                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.VF_Cancel_Detail_Count__c}" id="VF_Cancel_Detail_Count"/>
                    <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Cancel_Reason__c.label}" for="Cancel_Reason"/>
                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Cancel_Reason__c}" id="Cancel_Reason"/>
                    <apex:outputLabel style="margin-left: 30px;" value="{!$ObjectType.Consum_Apply_Equipment_Set__c.fields.Loaner_cancel_Remarks__c.label}" for="VF_Cancel_Detail_Count"/>
                    <apex:inputField style="margin-left: 5px;" value="{!pageCaes.Loaner_cancel_Remarks__c}" id="Loaner_cancel_Remarks"/>
                    <apex:commandButton style="margin-left: 30px;" rerender="allForm,checEventFrame" value="适用" onclick="applyJs(); return flase;" />
                    <apex:commandButton style="margin-left: 10px;" action="{!save}" value="保存" onclick="blockme();" rerender="allForm,checEventFrame" oncomplete="windowResize();unblockUI();" />
                </apex:outputPanel>
            </apex:form>
        </apex:page>
            </apex:pageBlock>
            <apex:outputPanel id="message">
                <apex:pageMessages />
            </apex:outputPanel>
            <c:RelationListPagingCmp id="cmpid" pgController="{!this}" hasCheckbox="true"/>
        </apex:outputPanel>
    </apex:form>
</apex:page>
force-app/main/default/pages/ConsumDefaultSelect.page
@@ -18,6 +18,7 @@
    table.list .col_Consumable_Guaranteen_end_F__c{width:100px;}
    table.list .col_You_Xiao_Ku_Cun_Jia__c{width:100px;}
    table.list .col_Jie_Chu_Fen_Pei_Jia__c{width:100px;}
    table.list .col_Qu_Xiao_Fen_Pei_Shu_Liang_Jia__c{width: 150px;}
    tr.headerRow {
        height: 40px;
    }
force-app/main/default/pages/ConsumEquipmentRentalResponsePopUp.page
@@ -6,7 +6,10 @@
<!-- 20230718 zq add -->
<style type="text/css">
    table.mytable tr{
        height:35px;
        height:35px !important;
    }
    body select{
        margin: 5px;
    }
</style>
<script>
@@ -98,7 +101,7 @@
                        <td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
                        <td>
                            <!--zq <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;"/> -->
                            <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;margin:10px 0px;"/>
                            <apex:inputField value="{!cc.ResponseNew__c}" style="resize:none; width:500px; height:150px;margin:10px 10px;"/>
                        </td>
                    </tr>
                </table>
force-app/main/default/pages/ConsumEquipmentSetReceived.page
@@ -87,13 +87,13 @@
}
/*add end by youc 2021-12-07 耗材追溯 -收货*/
table.list .col_Fixture_Model_No__c {width:100px;}
table.list .col_Fixture_Model_No__c {width:120px;}
table.list .col_Consumable_Guaranteen_end_F__c {width:100px;}
table.list .col_SerialNumber_F__c {width:100px;}
table.list .col_Salesdepartment__c {width:100px;}
table.list .col_Salesdepartment__c {width:150px;}
table.list .col_Asset_return_Day__c {width:100px;}
table.list .col_Return_DeliverySlip__r_Name {width:100px;}
table.list .col_Hui_Ji_Jia__c {width:100px;}
table.list .col_Hui_Ji_Jia__c {width:50px;}
table.list .col_Yi_Zhi_Bao_Fei_Jia__c {width:100px;}
table.list .col_Yi_Zhi_Guo_Qi_Jia__c {width:100px;}
table.list .col_Shang_Jia_Jia__c {width:100px;}
@@ -105,12 +105,7 @@
table.list .col_boxbarcodeforReceipt__c {width:100px;}
table.list .col_EquipmentManagementCode_OldData__c {width:100px;}
table.list .col_Scroll {width:100px;}
tr.headerRow {
    height: 40px;
}
input.btn {
    padding: 2px 15px !important;
}
</style>
<script type="text/javascript">
    sforce.connection.sessionId = "{!$Api.Session_ID}";
force-app/main/default/pages/ConsumEquipmentSetReturn.page
@@ -35,20 +35,20 @@
.col_EquipmentManagementCode_OldData__c {display: none;}
.col_Scroll{display: none;}
table.list .col_Fixture_Model_No__c colViewing{width:100px;}
table.list .col_Consumable_Guaranteen_end_F__c colViewing{width:100px;}
table.list .col_SerialNumber_F__c colViewing{width:100px;}
table.list .col_Salesdepartment__c colViewing{width:100px;}
table.list .col_Yi_Fa_Huo_Jia__c colViewing{width:100px;}
table.list .col_Dao_Huo_OK_Jia__c colViewing{width:100px;}
table.list .col_Dao_Huo_NG_Jia__c colViewing{width:100px;}
table.list .col_Yi_Xiao_Hao_Jia__c colViewing{width:100px;}
table.list .col_Hui_Ji_Jia__c colViewing{width:100px;}
table.list .col_Dai_Xiao_Hao_Jia__c colViewing{width:100px;}
table.list .col_ManagementCode__c colViewing{width:100px;}
table.list .col_EquipmentManagementCode__c colViewing{width:100px;}
table.list .col_EquipmentManagementCode_OldData__c colViewing" style="{width:100px;}
table.list .col_Scroll{width:100px;}
table.list .col_Fixture_Model_No__c {width:100px;}
table.list .col_Consumable_Guaranteen_end_F__c {width:100px;}
table.list .col_SerialNumber_F__c {width:100px;}
table.list .col_Salesdepartment__c {width:100px;}
table.list .col_Yi_Fa_Huo_Jia__c {width:100px;}
table.list .col_Dao_Huo_OK_Jia__c {width:100px;}
table.list .col_Dao_Huo_NG_Jia__c {width:100px;}
table.list .col_Yi_Xiao_Hao_Jia__c {width:100px;}
table.list .col_Hui_Ji_Jia__c {width:100px;}
table.list .col_Dai_Xiao_Hao_Jia__c {width:100px;}
table.list .col_ManagementCode__c {width:100px;}
table.list .col_EquipmentManagementCode__c {width:100px;}
table.list .col_EquipmentManagementCode_OldData__c {width:100px;}
tr.headerRow {
    height: 40px;
}
@@ -60,6 +60,7 @@
}
body select {
    width: 177px;
    margin: 10px 0px;
}
span.lookupInput {
    width: inherit;
force-app/main/default/pages/ConsumFixtureSetSelect.page
@@ -40,6 +40,13 @@
        font-size: 10px;
        font-weight:normal;
      }
    table.list .col_Model_No__c {width:120px;}
    table.list .col_Consum_Start_Date__c {width:100px;}
    table.list .col_Consum_Num__c {width:100px;}
    table.list .col_You_Xiao_Ku_Cun_Jia__c {width:100px;}
    table.list .col_You_Xiao_Qi_Ku_Cun_Jia__c {width:100px;}
    table.list .col_Yi_Guo_Qi_Ku_Cun_Jia__c {width:100px;}
</style>
</head>
    <apex:form id="allForm">
force-app/main/default/pages/ConsumReassign.page
@@ -1,9 +1,11 @@
<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="重新分配">
<apex:page Controller="ConsumReassignController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="重新分配"  lightningStylesheets="true">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{! URLFOR($Resource.AWSService, 'AWSService.js') }" />
<apex:includeScript value="{!URLFOR($Resource.connection20)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->
<style>
    .decrypt {
        position: absolute;
@@ -17,6 +19,10 @@
    a:hover .decrypt {
        display: block;
        width: 100px
    }
    th > input{
        margin-left: revert;
    }
</style>
<script type="text/javascript">
@@ -56,33 +62,36 @@
    var awsdata_map = {};
    function DecryptContactName(callback) {
        //2023 08 02 张赫阳 PIPL改造 Start
        console.log('awsdata_map' + JSON.stringify(awsdata_map));
        let no_in_ids = [];
        j$("[aws-data-id]").each(function (i, e) {
            let id = e.getAttribute("aws-data-id");
            if (!(id && awsdata_map.hasOwnProperty(id))) {
                no_in_ids.push(id);
            }
        });
        if (no_in_ids.length > 0) {
            AWSService.search(staticResource.searchUrl, JSON.stringify({
                "dataIds": no_in_ids
            }), function (data) {
                if (data.object && data.object.length > 0) {
                    for (let d of data.object) {
                        if (d.dataId) {
                            awsdata_map[d.dataId] = d;
                        }
                if (no_in_ids.length > 0) {
                AWSService.query(staticResource.queryUrl, id, function (data) {
                    console.log('data' + JSON.stringify(data));
                    if (data.object) {
                        awsdata_map[data.object.dataId] = data.object;
                        console.log('data.object.dataId' + data.object.dataId);
                        console.log('data.object' + data.object);
                    }
                }
                    BindToTile();
                    if (callback) callback();
                }, staticResource.token);
            }
            else {
                BindToTile();
                if (callback) callback();
            }, staticResource.token);
        }
        else {
            BindToTile();
            if (callback) callback();
        }
            }
            }
            console.log('awsdata_map' + JSON.stringify(id));
            console.log('awsdata_map' + JSON.stringify(no_in_ids));
        });
        //2023 08 02 张赫阳 PIPL改造 Start
    }
    function BindToTile() {
@@ -90,6 +99,10 @@
            let id = e.getAttribute("aws-data-id");
            if (id && awsdata_map.hasOwnProperty(id) && awsdata_map[id].trialUser) {
                j$(e).find(".decrypt").html(awsdata_map[id].trialUser);
                //2023 07 04 张赫阳 PIPL改造 Start
                document.getElementById(id).innerHTML = awsdata_map[id].trialUser;
                console.log('awsdata_map[id].trialUser' + awsdata_map[id].trialUser)
                //2023 07 04 张赫阳 PIPL改造 End
            }
        });
    }
@@ -112,18 +125,20 @@
                <apex:outputText id="hasError" value="{!hasError}" style="display:none"/>
                <apex:outputText id="rentalApplyId" value="{!rentalApplyId}" style="display:none"/>
                <table class="linetable" border="1" style="border-collapse: collapse;width: 750px;">
                <table class="linetable" border="1" style="border-collapse: collapse;width: auto;">
                    <colgroup>
                        <col width="25"/>
                        <col width="60"/>
                        <col width="110"/>
                        <col width="110"/>
                        <col width="110"/>
                        <col width="110"/>
                        <col width="110"/>
                        <col width="175"/>
                        <col width="110"/>
                        <col width="175"/>
                    </colgroup>
                    <tr style="background-color:#DCDCDC;">
                        <th style="text-align:center">全选
                        <th style="text-align:center">全选
                            <apex:inputCheckbox id="checkAll" value="{!checkAll}" onclick="checkAll(this);" />
                        </th>
                        <th style="text-align:center">{!$ObjectType.Consum_Apply_Equipment_Set_Detail__c.fields.Consum_Apply_Equipment_Set__c.label}</th>
@@ -159,7 +174,9 @@
                            <td align="center">
                                <apex:outputField value="{!info.caesd.RAESD_Status__c}"></apex:outputField>
                            </td>
                            <td align="center">
                            <!-- //2023 07 04 张赫阳 PIPL改造 Start -->
                            <td align="center" id="{!info.caesd.AWS_Data_Id__c}">
                                <!-- //2023 07 04 张赫阳 PIPL改造 End -->
                                <a style="position: relative" href="/{!info.caesd.Id}" aws-data-id="{!info.caesd.AWS_Data_Id__c}" title="">
                                    <span>{!info.caesd.Trial_User__c}</span>
                                    <span class="decrypt"></span>
force-app/main/default/pages/ConsumSelect.page
@@ -18,6 +18,8 @@
    table.list .col_Consumable_Guaranteen_end_F__c{width:100px;}
    table.list .col_You_Xiao_Ku_Cun_Jia__c{width:100px;}
    table.list .col_Jie_Chu_Fen_Pei_Jia__c{width:100px;}
    table.list .col_Fen_Pei_Shu_Liang_Jia__c{width:100px;}
    table.list .col_Fen_Pei_Shu_Liang_Jia__c input[type="text"] {width:100px;}
    tr.headerRow {
        height: 40px;
    }
force-app/main/default/pages/ConsumTrialDis.page
@@ -1,4 +1,5 @@
<apex:page standardController="Consum_Apply__c">
<!-- zq20230519 加壳 -->
<apex:page standardController="Consum_Apply__c" lightningStylesheets="true">
    <script type="text/javascript">
        if ('{!Consum_Apply__c.Yi_loaner_arranged__c}' > 0
        ) {
force-app/main/default/pages/ConsumTrialUpdate.page
@@ -293,7 +293,14 @@
                        document.getElementById(ids[i]).children[0].children[0].innerText = TrialUser[ids[i].substring(0,18)].trialUser;
                        console.log('i = '+i);
                    }
                });
                });
                //解密信息add by xq 2023/07/06 Start ConsumTrialUpdate q2
                for(var i in rowBList){
                        console.log('robId= '+rowBList[i].AWSDataId)
                        console.log('useeId= '+TrialUser[rowBList[i].AWSDataId]["trialUser"]);
                        document.getElementById(rowBList[i].AWSDataId+'_'+rowBList[i].Id).innerText = TrialUser[rowBList[i].AWSDataId]["trialUser"];
                }
                //解密信息add by xq 2023/07/06 end
            }
            
            function queryUser(){
@@ -316,6 +323,13 @@
                        let temp = {}
                        temp.trialUser = contacts.trialUser;
                        TrialUser[contacts.dataId] = temp;
                    //解密信息add by xq 2023/07/06 Start queryUser else
                   for(var i in rowBList){
                        console.log('robId= '+rowBList[i].AWSDataId)
                        console.log('useeId= '+TrialUser[rowBList[i].AWSDataId]["trialUser"]);
                        document.getElementById(rowBList[i].AWSDataId+'_'+rowBList[i].Id).innerText = TrialUser[rowBList[i].AWSDataId]["trialUser"];
                    }
                    //解密信息add by xq 2023/07/06 end
                    };
                    for(var i=0;i<rowBList.length;i++){
                        ids.push(rowBList[i].AWSDataId + '_' + rowBList[i].Id);
force-app/main/default/pages/ConsumUploadPicture.page
@@ -1,8 +1,9 @@
<apex:page controller="ConsumUploadPictureController" showHeader="false" action="{!init}" id="allPage">
<apex:page controller="ConsumUploadPictureController"  lightningStylesheets="true" showHeader="false" action="{!init}" id="allPage">
<apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->
    <style>
        table {
          border-collapse: collapse;
@@ -11,6 +12,9 @@
          border: 1px solid black;
          text-align: center;
        }
        input.btn {
            margin: 5px 0px;
        }
    </style>
    <script type="text/javascript">
        function closeWindow(){
force-app/main/default/pages/EquipmentManage.page
@@ -1,4 +1,4 @@
<apex:page standardController="Rental_Apply__c" showHeader="false" sidebar="false">
<apex:page standardController="Rental_Apply__c" showHeader="false" sidebar="false"  lightningStylesheets="true">
    <apex:form >
        <apex:outputPanel >
            <apex:pageBlock title="备品借出申请">
force-app/main/default/pages/EquipmentRentalResponsePopUp.page
@@ -8,6 +8,9 @@
    table.mytable tr{
        height:35px;
    }
    body select{
        margin: 5px;
    }
</style>
<script>
function savejs() {
force-app/main/default/pages/FixtureSetManage.page
@@ -9,6 +9,7 @@
<apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
<apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
<apex:includeScript value="{!URLFOR($Resource.RelationListPagingCmpJS)}"/>
<apex:stylesheet value="{!URLFOR($Resource.StyleUtilCss)}"/><!-- 20230619 ljh lightning  -->  
<!-- 20230426 zq add style -->
<style>
@@ -19,6 +20,17 @@
    body input[type="submit"], body input.btn{
        padding: 0 10px;
    }
    table.list .col_SortInt_F__c {width:100px;}
    table.list .col_Name_CHN__c {width:100px;}
    table.list .col_Fixture_Model_No_F__c {width:150px;}
    table.list .col_Is_Body__c {width:100px;}
    table.list .col_Is_Optional__c {width:100px;}
    table.list .col_Quantity__c {width:100px;}
    table.list .col_Is_OneToOne__c {width:100px;}
    table.list .col_Is_Special_Product__c {width:100px;}
    table.list .col_Fixture_Set_New__c {width:100px;}
    table.list .col_Fixture_Set_New_Quantity__c {width:100px;}
    table.list .col_Scroll {width:100px;}
</style>
<script type="text/javascript">
force-app/main/default/pages/Lost_Return_DeliverySlip.page
@@ -97,7 +97,6 @@
            <apex:pageBlockSectionItem >
                <apex:outputLabel value="发货-{!$ObjectType.FixtureDeliverySlip__c.fields.Name.Label}"/>
                <apex:outputPanel >
                    <!-- 修改款到 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();"/>
force-app/main/default/pages/RentalAgencyReceived.page
@@ -1,10 +1,11 @@
<!-- 20230427 zq <apex:page controller="RentalAgencyReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="办事处欠品确认"> -->
    <apex:page lightningStylesheets = "true" controller="RentalAgencyReceivedController" showHeader="false" sidebar="false" id="allPage" action="{!init}" title="办事处欠品确认">
    <apex:page lightningStylesheets="true" controller="RentalAgencyReceivedController" 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)}"/><!-- 20230525 ljh lightning  -->
    <style type="text/css">
        .hideDropdown select{
            display: none
@@ -32,6 +33,19 @@
           right: 5%;
           position: absolute;
           width: 200px;
        }
        .contTab{
            overflow: hidden;
        }
        table.list td{
            width: 16%!important;
            border: 1px solid #ededed!important;
        }
        table.list td.col_chk{
            width: 5%!important;
        }
        .contTab tr td.col_stockin{
            display: table-cell;
        }
        table.list td{
            width:100px;
@@ -224,7 +238,7 @@
        </div>
        <apex:outputPanel id="detail">
            <div id="in_Div_L">
                <table class="list" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData_L">
                <table class="list contTab" style="border-bottom-width: 0px; font-size:11px; border-spacing:0;" border="" id="tableData_L">
                    <apex:variable value="{!0}" var="Cnt" />
                        <apex:repeat id="dataline_L" value="{!esdList}" var="esdInfo">
                            <tr class="" id="tableData_L_{!Cnt}" style="{!IF(esdInfo.hidden,'display: none','')}">
force-app/main/default/pages/RentalApplyCancel.page
@@ -5,6 +5,16 @@
        <apex:includeScript value="{!URLFOR($Resource.jquery183minjs)}"/>
        <apex:includeScript value="{!URLFOR($Resource.PleaseWaitDialog)}"/>
        <apex:stylesheet value="{!URLFOR($Resource.blockUIcss)}"/>
        <style>
            body .detailList .dataCol select{
                width: 150px;
                min-width: 150px;
            }
            body .detailList .dataCol input{
                width: 150px;
                min-width: 150px !important;
            }
        </style>
        <script type="text/javascript">
            function back() {
                window.opener.parent.location.href = "/{!ra.Id}";
@@ -66,6 +76,7 @@
                </apex:pageBlockSectionItem>
                <!-- 20210207 ljh  SWAG-BXVDPJ update  end-->
            </apex:pageBlockSection>
            <input type="hidden" name="hide"/>
            <apex:commandButton value="取消" action="{!saveCancel}" oncomplete="checkSaveStatus();changeReasonJs();unblockUI();" onclick="blockme();" rerender="allForm" />
            <apex:commandButton value="返回" onclick="back();" rerender="allForm" oncomplete="unblockUI();" />
        </apex:pageBlock>
force-app/main/default/pages/RentalApplyJump.page
@@ -94,6 +94,7 @@
                </apex:column>
            </apex:dataTable>
            <div style="height: 15px"></div>
            <input type="hidden" name="hide"/>
            <apex:commandButton value="确认插队" action="{!saveJump}" oncomplete="alertSuccess();checkSaveStatus();unblockUI();" onclick="blockme();" rerender="allForm" />
            <apex:commandButton value="返回" onclick="back(); return false;" rerender="allForm" oncomplete="unblockUI();" />
          </apex:pageBlock>
force-app/main/default/pages/RentalApplyList.page
@@ -1,4 +1,4 @@
<apex:page showHeader="true" sidebar="true" lightningStylesheets="true">
<apex:page showHeader="true" sidebar="true" action="{!init}" Controller="SidebarController" lightningStylesheets="true">
    <head>
        <title></title>
        <style>
@@ -13,102 +13,120 @@
            }
        </style>
    </head>
<!-- Begin Default Content REMOVE THIS -->
<ul style="margin : 0 auto;">
    <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=1000, top=100, left=100, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
    <hr />
    <li><a href="#" onclick="javascript:window.open('/apex/ReceivingNoteQRScan','','height=500, width=500, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">ReceivingNoteQRScan</a></li>
    <hr />
    <li><a href="/apex/EquipmentRentalExtend" target="_blank">查询借出中备品</a></li>
    <hr />
    <li><a href="/apex/RentalApplySequence" target="_blank" >备品排队查看</a></li>
    <hr />
    <li><a href="/00O10000006Ryck" target="_blank" >待CDS的备品一览</a></li>
    <hr />
    <li><a href="/apex/NotReceivingNoteListFirst" target="_blank" >非集中备品收货清单一览</a></li>
    <hr />
    <li><a href="/00O10000006RycG" target="_blank" >欠品历史一览</a></li>
    <hr />
    <li><a href="/00O10000006Rycp" target="_blank" >需要上架的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006Rycz" target="_blank" >待修理的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006Rycf" target="_blank" >今天返回的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006Rycu" target="_blank" >今天入库的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006Ryd4" target="_blank" >现地备品月报一览</a></li>
    <hr />
    <li><a href="/00O10000006RycV" target="_blank" >待下架备品一览</a></li>
    <hr />
    <li><a href="/00O10000006RycL" target="_blank" >等待分配备品借出申请一览</a></li>
    <hr />
    <li><a href="/00O10000006Ryca" target="_blank" >待发货备品一览</a></li>
    <hr />
    <li><a href="/00O10000006Rydx" target="_blank" >主单已完了从单未结束</a></li>
    <hr />
    <li><a href="/00O10000006S0G6" target="_blank" >待上架一览</a></li>
    <hr />
    <li><a href="/00O100000058Dmv" target="_blank" >待上架备品SET一览</a></li>
    <hr />
    <li><a href="/00O10000006S0LV" target="_blank" >待废弃备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0LU" target="_blank" >从单结束主单还未回寄</a></li>
    <hr />
    <li><a href="/00O10000004fNn9" target="_blank" >出库前检测NG备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0EQ" target="_blank" >待回寄备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O10000004fNnD" target="_blank" >待发货备品一览</a></li>
    <hr />
    <li><a href="/00O10000004fNn8" target="_blank" >待出库前检测备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0DS" target="_blank" >待下架备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O10000006S0G9" target="_blank" >待欠品确认备品一览</a></li>
    <hr />
    <li><a href="/00O1000000663fT" target="_blank" >需要出库指示的耗材一览</a></li>
    <hr />
    <li><a href="/00O10000006S0G3" target="_blank" >待CDS的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0G4" target="_blank" >待入库前检测备品一览</a></li>
    <hr />
    <li><a href="/00O10000005WAsg" target="_blank" >冻结的备品一览</a></li>
    <hr />
    <li><a href="/00O10000005WAsk" target="_blank" >待修理的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0ES" target="_blank" >待CDS的备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O10000005WAsl" target="_blank" >待重新分配备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0G2" target="_blank" >待下架备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0ER" target="_blank" >待到货确认备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O10000006S0G5" target="_blank" >待发货备品一览</a></li>
    <hr />
    <li><a href="/00O1000000542K6" target="_blank" >需要上架的备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0G8" target="_blank" >欠品历史一览</a></li>
    <hr />
    <li><a href="/00O10000006S0EU" target="_blank" >需要上架的备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O1000000663hP" target="_blank" >查询借出中耗材</a></li>
    <hr />
    <li><a href="/00O10000005WAsd" target="_blank" >今天追加的附属品一览</a></li>
    <hr />
    <li><a href="/00O10000005WAsm" target="_blank" >待下架备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0G7" target="_blank" >待修理一览</a></li>
    <hr />
    <li><a href="/00O10000006S0GA" target="_blank" >待出库前检测备品一览</a></li>
    <hr />
    <li><a href="/00O10000006S0ET" target="_blank" >待发货备品一览(现地)</a></li>
    <hr />
    <li><a href="/00O10000005nYfh" target="_blank" >犯规点数一览</a></li>
    <hr />
    <li><a href="/00O1000000663hK" target="_blank" >备品中心耗材月报一览</a></li>
<!-- <li>window.open('/apex/WebToEquipmentSetShippmentReceived','','height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')</li> -->
</ul>
<!-- End Default Content REMOVE THIS -->
    <script>
        function toURLPreJs(name) {
            // alert(name);
            toURL(name);
        }
        function toURLJs() {
            // alert({!reportid});
            var ss = document.getElementById("hidden").value;
            //新窗口打开,还是本页面打开,还是弹窗打开请自行修改window.open
            window.open('/'+ss,'_blank');
        }
    </script>
    <apex:form id="allForm">
        <apex:actionFunction name="toURL" action="{!toURL}" rerender="allForm,checEventFrame" oncomplete="toURLJs();">
            <apex:param name="firstParam" assignTo="{!DeveloperName}" value="" />
        </apex:actionFunction>
        <apex:outputPanel id="message">
            <apex:pageMessages />
            <input id="hidden" type="hidden" name="hidden" value="{!reportid}"/>
        </apex:outputPanel>
        <ul style="margin : 0 auto;">
            <li><a href="" onclick="toURLPreJs('SS_OPDPlan');return false;" target="_blank" >OPD计划排序(拍照)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('OPDPlan_Real_Time');return false;" target="_blank" >OPD计划排序(实时)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_Assign_list');return false;" target="_blank" >等待分配备品借出申请一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Queue_Schedule_List1');return false;" target="_blank" >    排队的备品一览</a></li>
            <hr />
            <li><a href="/apex/RentalApplySequence" target="_blank" >备品排队查看</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_Resign_List');return false;" target="_blank" >待重新分配备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Del_Cancel_RequestList');return false;" target="_blank" >删除/取消修理的备品申请一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Consume_Need_ShipCommand');return false;" target="_blank" >需要出库指示的耗材一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_StockDown_List');return false;" target="_blank" >待下架备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Link_BeforeShipSet');return false;" target="_blank" >待出库前检测备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('keep_ship_set');return false;" target="_blank" >待发货备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('UploadedSignList_new1');return false;" target="_blank" >上传签收单一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Today_Planned_ReturnSETList');return false;" target="_blank" >今天返回的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Wait_Back_CDS');return false;" target="_blank" >待CDS的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Wait_Back_Detection');return false;" target="_blank" >待回收后检测的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('EquipmentSet_CheckNG_List');return false;" target="_blank" >回收后检测NG报废一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Link_NeedShelfSetlist');return false;" target="_blank" >需要上架的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Today_Stored_Set_List');return false;" target="_blank" >今天入库的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Repair_Asset_Lists');return false;" target="_blank" >维修中备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('ThrowAway_Set_List');return false;" target="_blank" >报废备品一览(个体管理)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('LostSetDetailList');return false;" target="_blank" >欠品历史一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Freeze_Asset_List');return false;" target="_blank" >冻结的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_Repair_List');return false;" target="_blank" >待修理的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_Abandon_List');return false;" target="_blank" >待废弃备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Asset_loaner_token_photo');return false;" target="_blank" >已拍照固定资产数量分析</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('ENERGY_LIST_training_internal');return false;" target="_blank" >Energy培训已参加LIST</a></li>
            <hr />
            <li><a href="#" onclick="javascript:window.open('/apex/WebToEquipmentSetShippmentReceived','','height=500, width=1000, top=100, left=100, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">Loaner_ship_return_manage</a></li>
            <hr />
            <li><a href="/apex/EquipmentRentalExtend" target="_blank">查询借出中备品</a></li>
            <hr />
            <li><a href="/lightning/o/Monthly_Report__c/new?defaultFieldValues=
                TongkuoZongjian__c={!URLENCODE(infoList.TongkuoZongjian__c)},
                ZongjianApprovalManager__c={!URLENCODE(infoList.ZongjianApprovalManager__c)},
                BuchangApprovalManagerSales__c={!URLENCODE(infoList.BuchangApprovalManagerSales__c)},
                BuchangApprovalManager__c={!URLENCODE(infoList.BuchangApprovalManager__c)}" target="_blank" >新建周报</a></li>
            <hr />
            <li><a href="/00O1000000588tQ" onclick="" target="_blank" >我的周报一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Monthly_report_set');return false;" target="_blank" >备品中心月报一览</a></li>
            <hr />
            <li><a href="https://adfs.olympus.com.cn/EnrollmentServer/otaprofile/" target="_blank" >移动设备注册</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Add_Accessory_List');return false;" target="_blank" >今天追加的附属品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('All_OutOfRule_New');return false;" target="_blank" >犯规点数一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Inventory_Report_History');return false;" target="_blank" >查看盘点报告书</a></li>
            <hr />
            <li><a href="/apex/ReceivingNoteListFirst" target="_blank" >集中备品收货清单一览</a></li>
            <hr />
            <li><a href="/apex/NotReceivingNoteListFirst" target="_blank" >非集中备品收货清单一览</a></li>
            <hr />
            <li><a href="#" onclick="javascript:window.open('/apex/ReceivingNoteQRScan','','height=500, width=750, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')">ReceivingNoteQRScan</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('FirstIsOverButSecondNotEnd');return false;" target="_blank" >主单已完了从单未结束</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('SecondEndMainNotBack');return false;" target="_blank" >从单结束主单还未回寄</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('InProcessCutDiscountApproval_Report_BJ');return false;" target="_blank" >未处理的备品减价修理报价(北京)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('InProcessCutDiscountApproval_Report_GZ');return false;" target="_blank" >未处理的备品减价修理报价(广州)</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('InProcessCutDiscountApproval_Report_SH');return false;" target="_blank" >未处理的备品减价修理报价(上海)</a></li>
        </ul>
    </apex:form>
</apex:page>
force-app/main/default/pages/RentalTransfer.page
New file
@@ -0,0 +1,64 @@
<apex:page showHeader="true" sidebar="true" Controller="SidebarController" lightningStylesheets="true">
    <head>
        <title></title>
        <style>
            ul li {
                list-style: none;
                /* line-height: 25px; */
                /* text-align: center; */
            }
            a{
                text-decoration:none;
                /* font-size: 20px; */
            }
        </style>
    </head>
    <script>
        function toURLPreJs(name) {
            // alert(name);
            toURL(name);
        }
        function toURLJs() {
            // alert({!reportid});
            var ss = document.getElementById("hidden").value;
            //新窗口打开,还是本页面打开,还是弹窗打开请自行修改window.open
            window.open('/'+ss,'_blank');
        }
    </script>
    <apex:form id="allForm">
        <apex:actionFunction name="toURL" action="{!toURL}" rerender="allForm,checEventFrame" oncomplete="toURLJs();">
                  <apex:param name="firstParam" assignTo="{!DeveloperName}" value="" />
            </apex:actionFunction>
            <apex:outputPanel id="message">
                    <apex:pageMessages />
                    <input id="hidden" type="hidden" name="hidden" value="{!reportid}"/>
                </apex:outputPanel>
        <ul style="margin : 0 auto;">
            <li><a href="" onclick="toURLPreJs('Need_off_Shelf');return false;" target="_blank" >待下架备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Tested_before_Delivery');return false;" target="_blank" >待出库前检测备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_Delivery');return false;" target="_blank" >待发货备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Products_in_Arrears_to_be_Confirmed');return false;" target="_blank" >待欠品确认备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_CDS');return false;" target="_blank" >待CDS的备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_Check');return false;" target="_blank" >待入库前检测备品一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_Repair');return false;" target="_blank" >待修理一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Need_to_On_Shelf');return false;" target="_blank" >待上架一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('Owe');return false;" target="_blank" >欠品历史一览</a></li>
            <hr />
            <li><a href="" onclick="toURLPreJs('new_report_Perfect');return false;" target="_blank" >待受理批量更新备品信息一览</a></li>
            <hr />
            <!-- <li>window.open('/apex/WebToEquipmentSetShippmentReceived','','height=700, width=1000, top=200, left=200, toolbar=no, menubar=no, scrollbars=no, location=no, status=no')</li> -->
        </ul>
    </apex:form>
</apex:page>
force-app/main/default/pages/RentalTransfer.page-meta.xml
New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexPage xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>57.0</apiVersion>
    <label>RentalTransfer</label>
</ApexPage>