backup code

binxie

2023-06-16 da42e2995c00293af89c71fe5ba6e16cbb77e1b3

backup code

 .sf/config.json

@@ -1,3 +1,3 @@
{
  "target-org": "OlympusDev"
  "target-org": "OlympusStageEnv"
}

 .sf/orgs/00D0l0000004CqBEAU/localSourceTracking/HEAD

New file
@@ -0,0 +1 @@
ref: refs/heads/main

 .sf/orgs/00D0l0000004CqBEAU/localSourceTracking/config

New file
@@ -0,0 +1,7 @@
[core]
    repositoryformatversion = 0
    filemode = false
    bare = false
    logallrefupdates = true
    symlinks = false
    ignorecase = true

 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImport.cmp

@@ -1,11 +1,3 @@
<!--
 * @Author: Thhto 997058689@qq.com
 * @Date: 2022-07-08 10:47:25
 * @LastEditors: Thhto 997058689@qq.com
 * @LastEditTime: 2023-02-03 15:25:46
 * @FilePath: \ceshihuanj\force-app\main\default\aura\DealerPersonnelInformationImport\DealerPersonnelInformationImport.cmp
 * @Description: è¿™æ˜¯é»˜è®¤è®¾ç½®,请设置`customMade`, æ‰“å¼€koroFileHeader查看配置 è¿›è¡Œè®¾ç½®: https://github.com/OBKoro1/koro1FileHeader/wiki/%E9%85%8D%E7%BD%AE
-->
<aura:component controller="DealerPersonnelController"
implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
access="global">
@@ -24,6 +16,13 @@
<aura:attribute name="IsEventDefault" type="Boolean" default="true" />
<aura:attribute name="login" type="Boolean" default="false" />
<aura:attribute name="successMessage" type="String" />
    <!-- start DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->
    <aura:attribute name="errorData" type="Object" />
    <aura:attribute name="errorColumns" type="List" />
    <!-- show Error information -->
    <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
    <!-- end DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->

<!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ end-->
<aura:renderIf isTrue="{!v.login}">
        <div class="slds-spinner_container height100vh">
@@ -36,7 +35,7 @@
    </aura:renderIf>
<!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ start-->
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="errorDiv" style="z-index: 10001">
    <!-- <ui:inputText aura:id="articleURL" /> -->
        <ui:inputText aura:id="articleURL" />
    <div class="demo-only" style="height: 8rem;">
        <div class="slds-notify_container slds-is-relative">
            <div class="slds-notify slds-notify_toast slds-theme_error" role="status">
@@ -45,10 +44,7 @@
                        class="slds-notify__content slds-m-left_small slds-align_absolute-center slds-m-left_xx-large">
                        <lightning:icon alternativeText="error" iconName="utility:error" size="small"
                            class="buttonColor slds-m-right_small" />
                        <!-- DB202301262139 SFDC经销商人员导入功能改进 start -->
                        <!-- <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2> -->
                        <pre class="slds-text-heading_small ">{!v.errorMessage}</pre>
                        <!-- DB202301262139 SFDC经销商人员导入功能改进 end -->
                            <h2 class="slds-text-heading_small ">{!v.errorMessage}</h2>
                    </div>
                </div>
            </div>
@@ -56,7 +52,7 @@
    </div>
</div>
<div class="slds-modal slds-fade-in-open slds-hide" aura:id="successDiv01">
    <!-- <ui:inputText aura:id="articleURL" /> -->
        <ui:inputText aura:id="articleURL" />
    <div class="demo-only" style="height: 8rem;">
        <div class="slds-notify_container slds-is-relative">
            <div class="slds-notify slds-notify_toast slds-theme_success" role="alert">
@@ -87,10 +83,20 @@
            <aura:set attribute="else">
                <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}" />
                <div class="slds-p-around--large slds-align--absolute-center">
                    <lightning:button aura:id="save_con" label="保存" variant="brand" onclick="{!c.processFileContent}" disabled="false" />
                        <lightning:button label="保存" variant="brand" onclick="{!c.processFileContent}" />
                    <lightning:button label="取消" variant="brand" onclick="{!c.cancel}" />
                </div>

                    <aura:if isTrue="{!v.showErrorInfo}">
                        <div class="slds-p-around--large slds-align--absolute-center">
                            <lightning:button label="导出错误信息" variant="brand" onclick="{!c.exportErrorInfo}" />
                        </div>
                        <div class="slds-p-around--large slds-align--absolute-center">
                            <div style="height: 300px;overflow-x:scroll">
                                <lightning:datatable keyField="id" data="{! v.errorData }" columns="{! v.errorColumns }"
                                    hideCheckboxColumn="true"  minColumnWidth="120"/>
                            </div>
                        </div>
                    </aura:if>
            </aura:set>
        </aura:if>
    </div>

 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportController.js

@@ -4,9 +4,14 @@
        helper.readFile(component,helper,files[0]);
    },
    processFileContent : function(component,event,helper){
        component.set("v.showErrorInfo",false);
        helper.saveRecords(component,event,helper);
    },
    cancel : function(component,event,helper){
        component.set("v.showMain",true);
    }
    },
    exportErrorInfo: function(component,event,helper){
        console.log('enter exportErrorInfo');
        helper.exportErrorInfoHelper(component);
    },
})

 force-app/main/default/aura/DealerPersonnelInformationImport/DealerPersonnelInformationImportHelper.js

@@ -1,6 +1,5 @@
({
    readFile: function (component, helper, file) {
        debugger
        if (!file) return;
        if (!file.name.match(/\.(csv||CSV)$/)) {
            return alert('only support csv files');
@@ -79,7 +78,6 @@
        reader.readAsDataURL(file);
    },
    saveRecords: function (component, event, helper) {
        debugger
        component.set('v.login', true);
        var action = component.get("c.processData");
        var fieldsList = ['Name', 'Phone', 'AccountNumber']; //Please write your code dynamic fields
@@ -93,26 +91,63 @@
            if (state === "SUCCESS") {
                var res = response.getReturnValue();
                var res1 = '';
                debugger;
                if (res != 'success') {
                    var ress = res.split('=');
                    console.log(ress);
                    let errorDatas = [];
                    let errorDataRow = [];
                    debugger
                    for (var i = 0; i < ress.length; i++) {
                        res1 += ress[i].substr(7) + '\n';
                        if (ress[i] != '') {
                            let errorData = {}
                            let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
                            if (index == -1) {
                                errorData.errorRow = ress[i].substr(7).substring(1, 2);
                                errorDataRow.push(errorData.errorRow);
                                errorData.errorInfo = ress[i].substr(7).substring(6);
                                errorDatas.push(errorData);
                            } else {
                                errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(6);
                    }
                        }
                    }
                    var fileContentData = component.get("v.fileContentData").split('\n');
                    let errorColumns = [
                        { label: '错误行', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
                        { label: '错误信息', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true,initialWidth: 300,wrapText: true }
                    ];
                    for (var i = 0; i < fileContentData[0].split(',').length - 1; i++) {
                        errorColumns.push({
                            label: fileContentData[0].split(',')[i], fieldName: 'field' + i, type: 'text', hideDefaultActions: true,wrapText: true
                        });
                    }
                    
                    for(var i = 0; i < errorDatas.length; i++){
                        let data = fileContentData[errorDatas[i].errorRow];
                        console.log('data = ' + JSON.stringify(data));
                        for(var j = 0; j < data.split(',').length; j++){
                            let label = 'field' + j;
                            errorDatas[i][label] = data.split(',')[j];
                        }
                    }
                    console.log('errorDatas = ' + JSON.stringify(errorDatas))
                    
                    component.set('v.errorColumns', errorColumns);
                    component.set('v.errorData', errorDatas);
                    component.set("v.showErrorInfo", true);

                    console.log("==" + res1);
                    // this.error( "请修改后重新上传");
                    component.set('v.errorMessage', res1 + "请修改后重新上传");
                    this.showErrorToast(component);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', true); 
                } else {
                    // this.success('导入成功');
                    component.set('v.successMessage', '导入成功');
                    this.showSuccessToast01(component);
                    component.set("v.showMain", true);
                    component.set('v.login', false);
                    component.find('save_con').set('v.disabled', false); 
                }
            }
            else if (state === "INCOMPLETE") {
@@ -122,8 +157,18 @@
                var errors = response.getError();
                if (errors) {
                    if (errors[0] && errors[0].message) {
                        console.log("Error message: " +
                            errors[0].message);
                        console.log("Error message: " + errors[0].message);
                        let errorDatas = [{
                            errorRow: '1',
                            errorInfo: errors[0].message
                        }];
                        let errorColumns = [
                            { label: '错误行', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 50 },
                            { label: '错误信息', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true,initialWidth: 300,wrapText: true }
                        ];
                        component.set('v.errorData', errorDatas);
                        component.set('v.errorColumns', errorColumns);
                        component.set("v.showErrorInfo", true);
                        component.set('v.login', false);
                    }
                } else {
@@ -150,7 +195,7 @@
        window.setTimeout($A.getCallback(function () {
            $A.util.addClass(component.find('errorDiv'), 'slds-hide');
        }),
            7000
            4000
        );
    },
    success : function(message) {
@@ -182,4 +227,68 @@
        });
        toastEvent.fire();
    },
    //zhj å¯¼å‡ºé”™è¯¯ä¿¡æ¯ 2023-05-16 start
    exportErrorInfoHelper: function (component) {
        var errorData = component.get('v.errorData');
        var errorColumns = component.get('v.errorColumns');

        var datas = [];
        let errorColumnsArray = [];
        for(var i in errorColumns){
            errorColumnsArray.push(errorColumns[i].label);
        }
        datas.push(errorColumnsArray);
        //datas.push(errorColumns);

        for (var i in errorData) {
            let data = [];
            data.push(errorData[i].errorRow)
            data.push(errorData[i].errorInfo)
            for(var j = 0 ; j < Object.keys(errorData[i]).length - 2 ; j++){
                data.push(errorData[i]['field' + j])
            }
            datas.push(data);
        }

        console.log('datas = ' + JSON.stringify(datas));
        var csv = this.convertToCSV(component, datas);
        console.log('csv = ' + JSON.stringify(csv))
        this.downloadCSV(component, csv);
    },

    convertToCSV: function (component, data) {
        console.log('enter convertToCSV')
        console.log('data = ' + data);
        var csv = '';
        for (var i = 0; i < data.length; i++) {
            var row = data[i];
            console.log('row = ' + JSON.stringify(row));
            for (var j = 0; j < row.length; j++) {
                var val = '';
                val = row[j] === null ? '' : row[j].toString();
                console.log('val = ' + val);
                if (val.indexOf(',') !== -1 || val.indexOf('"') !== -1 || val.indexOf('\n') !== -1) {
                    //val = '"' + val.replace(/"/g,'""') + '"';
                }
                if (j > 0) {
                    csv += ',';
                }
                csv += val;
            }
            csv += '\n';
        }
        return csv;
    },

    downloadCSV: function (component, csv) {
        var link = document.createElement('a');
        // è®¾ç½®å­—符集和文件头
        let bom = "\uFEFF";
        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom+csv);
        link.download = 'data.csv';
        document.body.appendChild(link);
        link.click();
        document.body.removeChild(link);
    },
    //zhj å¯¼å‡ºé”™è¯¯ä¿¡æ¯ 2023-05-16 end
})

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.auradoc

New file
@@ -0,0 +1,6 @@
<aura:documentation>
    <aura:description>Documentation</aura:description>
    <aura:example name="ExampleName" ref="exampleComponentName" label="Label">
        Example Description
    </aura:example>
</aura:documentation>

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp

New file
@@ -0,0 +1,27 @@
<aura:component
    implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,forceCommunity:availableForAllPageTypes,force:lightningQuickActionWithoutHeader,lightning:actionOverride"
    access="global">
    Â  Â  <aura:html tag="style">
        Â  Â  Â  Â  .slds-modal__container{
        Â  Â  Â  Â  max-width: 65rem !important;
        Â  Â  Â  Â  width:100% !important;
        Â  Â  Â  Â  }
        Â  Â  Â  Â  .cuf-content {
        Â  Â  Â  Â  padding: 0 0rem !important;
        Â  Â  Â  Â  }
        Â  Â  Â  Â  .slds-p-around--medium {
        Â  Â  Â  Â  padding: 0rem !important;
        Â  Â  Â  Â  }
        Â  Â  Â  Â  .slds-modal__content{
        Â  Â  Â  Â  overflow-y:auto !important;
        Â  Â  Â  Â  height:unset !important;
        Â  Â  Â  Â  max-height:unset !important;
        Â  Â  Â  Â  min-height:8rem;
        Â  Â  Â  Â  }
        Â  Â  Â  Â  .slds-tile_board{
        Â  Â  Â  Â  padding:20px 40px;
        Â  Â  Â  Â  }
        Â  Â  </aura:html>
    Â  Â 
    <c:lexNewAndEditContactPIPL onclose="{!c.closeModal}" onrefresh="{!c.refreshView}" recordId="{!v.recordId}" />
</aura:component>

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.cmp-meta.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>57.0</apiVersion>
    <description>A Lightning Component Bundle</description>
</AuraDefinitionBundle>

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.css

New file
@@ -0,0 +1,2 @@
.THIS {
}

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.design

New file
@@ -0,0 +1,3 @@
<design:component >

</design:component>

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAura.svg

New file
@@ -0,0 +1,7 @@
<?xml version="1.0" encoding="UTF-8" standalone="no" ?>
<svg width="120px" height="120px" viewBox="0 0 120 120" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
    <g stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
        <path d="M120,108 C120,114.6 114.6,120 108,120 L12,120 C5.4,120 0,114.6 0,108 L0,12 C0,5.4 5.4,0 12,0 L108,0 C114.6,0 120,5.4 120,12 L120,108 L120,108 Z" id="Shape" fill="#2A739E" />
        <path d="M77.7383308,20 L61.1640113,20 L44.7300055,63.2000173 L56.0543288,63.2000173 L40,99.623291 L72.7458388,54.5871812 L60.907727,54.5871812 L77.7383308,20 Z" id="Path-1" fill="#FFFFFF" />
    </g>
</svg>

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraController.js

New file
@@ -0,0 +1,9 @@
({
    closeModal : function(cmp,event,helper){
        $A.get('e.force:closeQuickAction').fire();
    },

    refreshView : function(cmp,event,helper){
        $A.get('e.force:refreshView').fire();
    }
})

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraHelper.js

New file
@@ -0,0 +1,5 @@
({
    helperMethod : function() {

    }
})

 force-app/main/default/aura/LexContactPIPLAura/LexContactPIPLAuraRenderer.js

New file
@@ -0,0 +1,5 @@
({

// Your renderer method overrides go here

})

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp

@@ -5,11 +5,9 @@
  @last modified on  : 07-08-2022
  @last modified by  : ChangeMeIn@UserSettingsUnder.SFDoc
-->
<aura:component
  implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable"
  access="global"
  controller="NewAgencyOpportunityController"
>
<aura:component implements="force:lightningQuickActionWithoutHeader,force:hasRecordId,lightning:actionOverride,lightning:isUrlAddressable" access="global" 
                controller="NewAgencyOpportunityController">
    
  <aura:attribute name="recordId" type="Id" default="" />
  <aura:attribute name="recordTypeId" type="Id" default="" />
  <aura:attribute name="ac_name" type="string" />
@@ -31,11 +29,9 @@
  <aura:attribute name="login" type="Boolean" default="false" />
  <aura:attribute name="show" type="Boolean" default="false" />
  <aura:attribute name="showNewAgencyContact" type="Boolean" default="false" />
  <aura:handler
    name="NewAgencyContactEvent"
    event="c:NewAgencyContactEvent"
    action="{!c.closeAgencyContact}"
  />
    <aura:handler name="NewAgencyContactEvent" event="c:NewAgencyContactEvent" action="{!c.closeAgencyContact}"/>

    

  <div class="{! v.container_class}">
    <!-- header -->
@@ -49,56 +45,27 @@
      <aura:if isTrue="{!v.showSpinner}">
        <lightning:spinner alternativeText="Loading" size="medium" />
      </aura:if>

      <lightning:recordEditForm objectApiName="Agency_Opportunity__c">
        <lightning:accordion
          activeSectionName="{! v.section_names }"
          allowMultipleSectionsOpen="true"
          class="greyyyy"
        >
                <lightning:accordion activeSectionName="{! v.section_names }" allowMultipleSectionsOpen="true" class="greyyyy" >
          <aura:iteration items="{!v.layout}" var="section">
            <aura:if isTrue="{! section.editHeading }">
              <lightning:accordionSection
                name="{! section.label }"
                label="经销商询价信息"
              >
                            <lightning:accordionSection name="{! section.label }" label="经销商询价信息">
                <aura:iteration items="{! section.layoutColumns}" var="col">
                  <aura:iteration items="{! col.layoutItems}" var="field">
                    <aura:if
                      isTrue="{! and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}"
                    >
                      <lightning:inputField
                        required="{! field.behavior == 'Required' }"
                        aura:id="field"
                        fieldName="{! field.field}"
                        value="{! field.value}"
                      />
                                        
                                        <aura:if isTrue="{!and(field.behavior != 'Readonly', field.field != 'Agency_Contact__c')}">
                                            <lightning:inputField required="{! field.behavior == 'Required' }" aura:id="field" fieldName="{! field.field}" value="{! field.value}" />
                    </aura:if>
                    <aura:if isTrue="{! field.field == 'Agency_Contact__c' }">
                      <lightning:layout>
                        <lightning:layoutItem size="12">
                          <lightning:input
                            required="{! field.behavior == 'Required' }"
                            label="客户人员"
                            value="{! field.value}"
                            variant="label-inline"
                            style="margin-left: 0cm; display: none"
                            onclick="{! c.openModel }"
                          />
                          <lightning:input
                            required="{! field.behavior == 'Required' }"
                            label="客户人员"
                            value="{! v.ac_name}"
                            variant="label-inline"
                            style="margin-left: 0cm"
                            onclick="{! c.openModel }"
                          />
                                                    <lightning:input required="{! field.behavior == 'Required' }" label="客户人员" value = "{! field.value}" variant = "label-inline" style="margin-left: 0cm; display: none;" onclick="{! c.openModel }"/>
                                                    <lightning:input required="{! field.behavior == 'Required' }" label="客户人员" value = "{! v.ac_name}" variant = "label-inline" style="margin-left: 0cm; " onclick="{! c.openModel }"/>
                        </lightning:layoutItem>
                        <!-- <lightning:layoutItem size="1">
                                                    <lightning:buttonIcon iconName="utility:settings" variant="container" alternativeText="Settings" title="Settings" class = "name" />
                                                </lightning:layoutItem> -->
                      </lightning:layout>
                    </aura:if>


                  </aura:iteration>
                </aura:iteration>
              </lightning:accordionSection>
@@ -107,36 +74,23 @@
        </lightning:accordion>
      </lightning:recordEditForm>

      <div style="text-align: center; margin: 5px">
        <lightning:button
          class="slds-button slds-button_neutral"
          label="取消"
          onclick="{! c.cancelClick }"
        />
        <lightning:button
          class="slds-button slds-button_brand"
          variant="brand"
          label="保存"
          onclick="{! c.saveClick }"
        />
            <div  style="text-align:center;margin: 5px;">
                <lightning:button class="slds-button slds-button_neutral" label="取消" onclick="{! c.cancelClick }" />
                <lightning:button class="slds-button slds-button_brand" variant="brand" label="保存" onclick="{! c.saveClick }" />
      </div>
    </div>
    <aura:if isTrue="{!v.isModalOpen}">
                
      <!-- Modal/Popup Box starts here-->
      <section
        role="dialog"
        tabindex="-1"
        aria-labelledby="modal-heading-01"
        aria-modal="true"
        aria-describedby="modal-content-id-1"
        class="slds-modal slds-fade-in-open"
      >
                <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" 
                aria-modal="true" aria-describedby="modal-content-id-1"   
                    class="slds-modal slds-fade-in-open" >



        <aura:renderIf isTrue="{!v.login}">
          <div class="slds-spinner_container height100vh">
            <div
              class="slds-spinner--brand slds-spinner slds-spinner--medium"
              role="alert"
            >
                            <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
              <span id="aa" class="slds-assistive-text">Loading</span>
              <div class="slds-spinner__dot-a"></div>
              <div class="slds-spinner__dot-b"></div>
@@ -144,77 +98,48 @@
          </div>
        </aura:renderIf>



        <div class="slds-modal__container">
          <!-- Modal/Popup Box Header Starts here-->
          <header class="slds-modal__header">
            <lightning:buttonIcon
              iconName="utility:close"
                        <lightning:buttonIcon iconName="utility:close"
              onclick="{! c.closeModel }"
              alternativeText="close"
              variant="bare-inverse"
              class="slds-modal__close"
            />
            <h2
              id="modal-heading-01"
              class="slds-text-heading_medium slds-hyphenate"
            >
                            class="slds-modal__close"/>
                        <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
              æœç´¢å®¢æˆ·äººå‘˜
            </h2>
          </header>

          <!--Modal Body Start here-->
          <div
            class="slds-modal__content slds-p-around_medium modal-body"
            id="modal-content-id-1"
          >
                    <div class="slds-modal__content slds-p-around_medium modal-body" id="modal-content-id-1">
            <lightning:layout>
              <lightning:layoutItem size="7">
                <ui:inputText
                  label="请输入客户姓名"
                  class="field"
                  value="{!v.searchKeyWord}"
                />
                                <ui:inputText label="请输入客户姓名" class="field" value="{!v.searchKeyWord}"/>
              </lightning:layoutItem>
              <lightning:layoutItem size="2" class="searchButton">
                <ui:button
                  aura:id="button"
                  buttonTitle="Click to see agency contact"
                  class="button"
                  label="搜索"
                  press="{!c.searchAgencyContact}"
                  disabled="false"
                />
                                <ui:button aura:id="button" buttonTitle="Click to see agency contact" class="button" label="搜索" press="{!c.searchAgencyContact}" disabled="false"/>
              </lightning:layoutItem>
              <lightning:layoutItem size="3" class="searchButton">
                <ui:button
                  aura:id="newAgencyContact"
                  buttonTitle="Click to see agency contact"
                  class="newAgencyContact"
                  label="新建.客户人员"
                  disabled="false"
                  press="{!c.showNewAgency}"
                />
                                <ui:button aura:id="newAgencyContact" buttonTitle="Click to see agency contact" class="newAgencyContact" label="新建.客户人员"  disabled="false" press="{!c.showNewAgency}"/>
              </lightning:layoutItem>
            </lightning:layout>
            <div id="QueryResult" style="margin-top: 20px"></div>
                        <div id="QueryResult" style = "margin-top:20px;">
                        </div>
          </div>

          <aura:if isTrue="{!v.showNewAgencyContact}">
            <section
              role="dialog"
              tabindex="-1"
              aria-modal="true"
              aria-labelledby="modal-heading-01"
              class="slds-modal slds-fade-in-open"
              aura:id="NewAgencyContact"
              id="NewAgencyContact"
            >
                            <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01" class="slds-modal slds-fade-in-open"  aura:id="NewAgencyContact" id="NewAgencyContact">
              <c:NewAgencyContact2 />
            </section>
          </aura:if>
                        
        </div>
      </section>
      <div class="slds-backdrop slds-backdrop_open"></div>
                
    </aura:if>
  </div>
</aura:component>

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css

@@ -61,3 +61,7 @@
  margin-top: 20px;
  margin-left: 20px;
}

.THIS .slds-spinner_container{
    position: revert;
}

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js

@@ -1,158 +1,152 @@
({
    
  doInit: function (component, event, helper) {
    let rid = component.get("v.recordId");
        let rid = component.get('v.recordId');
    let pid = null;
    if (!rid) {
      pid = window.location.href.replace("https://", "").split("/")[4];
    }

    let record_type_id = "";
    let pageref = component.get("v.pageReference");
        let record_type_id = '';
        let pageref = component.get("v.pageReference")
    if (!record_type_id && pageref) {
      record_type_id = pageref.state.recordTypeId
        ? pageref.state.recordTypeId
        : "";
            record_type_id = pageref.state.recordTypeId ? pageref.state.recordTypeId : '';
    }

    let isClone = component.get("v.isClone");
        let isClone = component.get('v.isClone');
    if (!rid || isClone) {
      component.set("v.title", $A.get("$Label.c.New") + "经销商询价");
            component.set('v.title',$A.get("$Label.c.New")+'经销商询价');
      component.set("v.recordTypeId", record_type_id);
    } else {
      component.set("v.title", $A.get("$Label.c.Edit") + "经销商询价");
            component.set('v.title',$A.get("$Label.c.Edit")+'经销商询价');
    }
    console.log("rid: " + rid);
    console.log("pid: " + pid);
    console.log("record_type_id: " + record_type_id);
        console.log('rid: ' + rid);
        console.log('pid: ' + pid);
        console.log('record_type_id: ' + record_type_id);
    component.set("v.showSpinner", true);
    helper.CallBackAction(
      component,
      "Init",
      {
        helper.CallBackAction(component,'Init',{
        rid: rid,
        pid: pid,
        //rid : component.get('v.recordId'),
        record_type_id: record_type_id
      },
      function (data) {
        console.log("data: " + data);
        if (data.getState() == "SUCCESS") {
        },function(data){
            console.log('data: ' + data);
          var rv = data.getReturnValue();
          console.log(rv);
            console.log('rv:' + rv);
            console.log('rv.Data:' + rv.Data);
            console.log('rv.IsSuccess:' + rv.IsSuccess);
            if(data.getState() == "SUCCESS"){
          if (rv.IsSuccess) {
            debugger;
            let layout = JSON.parse(rv.Data.layout);
                    debugger;
            let fields = rv.Data.fields;
            let staticResource = JSON.parse(rv.Data.staticResource);
            let section_names = [];
                    debugger;
                    let staticResource = JSON.parse(rv.Data.staticResource)
                    debugger;
                    let section_names = layout.map(s=>s.label);
                    debugger;
            // let awsData = rv.Data.awsDataIds;
            section_names = layout.map((s) => s.label);
            component.set("v.section_names", section_names);

                    // section_names = layout.map(s=>s.label);
                    component.set('v.section_names',section_names);
                    component.set('v.layout',layout);
                    component.set('v.fields',fields);
                    component.set('v.staticResource',staticResource);
                    debugger;
            let m = {};
            for (let f of staticResource.PIDetails) {
              m[f.SF_Field_API_Name__c] = f;
            }
            component.set("v.pi_fields_map", m);

                    component.set('v.pi_fields_map',m);
            if (rv.Data && rv.Data.data) {
              console.log("rv.Data.data = " + rv.Data.data);
                        debugger;
                        console.log('rv.Data.data = ' + rv.Data.data);
              for (let s of layout) {
                for (let c of s.layoutColumns) {
                  for (let item of c.layoutItems) {
                    if (rv.Data.data.hasOwnProperty(item.field)) {
                      item.value = rv.Data.data[item.field];
                    }

                    if (fields.hasOwnProperty(item.field)) {
                      item.fi = fields[item.field];
                    }
                  }
                }
              }

              component.set("v.layout", layout);
              component.set("v.record_data", rv.Data.data);

                        // component.set('v.layout',layout);
                        component.set('v.record_data',rv.Data.data);
              if (rv.Data.data.Agency_Contact__r) {
                if (rv.Data.data.Agency_Contact__r.AWS_Data_Id__c) {
                  helper.AwsGet(
                    staticResource.queryUrl,
                    {
                                helper.AwsGet(staticResource.queryUrl, {
                      dataId: rv.Data.data.Agency_Contact__r.AWS_Data_Id__c
                    },
                    function (data) {
                      console.log("data = " + data);
                                }, function(data){
                                    console.log('data = ' + data);
                      if (data.object) {
                        component.set("v.ac_name", data.object.name);
                                        component.set('v.ac_name',data.object.name);
                      }
                    },
                    staticResource.token
                  );
                                }, staticResource.token);
                }
              }

              // }, staticResource.token);
            } else {
                        debugger;
                        console.log('rv.Data.data = ' + rv.Data.data);
                        console.log('layout = ' + layout);
              for (let s of layout) {
                for (let c of s.layoutColumns) {
                  for (let item of c.layoutItems) {
                    if (
                      rv.Data &&
                      fields.hasOwnProperty(item.field) &&
                      fields[item.field].References &&
                      fields[item.field].References.map((m) => m.value).indexOf(
                        rv.Data.pidType
                      ) > -1
                    ) {
                                    if(rv.Data && fields.hasOwnProperty(item.field) && fields[item.field].References && fields[item.field].References.map(m=>m.value).indexOf(rv.Data.pidType) > -1){
                      item.value = pid;
                    }
                  }
                }
              }
              component.set("v.layout", layout);
                        debugger;
                        // component.set('v.layout',layout);
                    }
                    // component.set('v.fields',fields);
                    // component.set('v.staticResource',staticResource);
                    component.set("v.showSpinner", false);
                }else{
                    component.set("v.showSpinner", false);
                    helper.ShowToast({
                        "message" : rv.Message,
                        "type" : "error"
                    });
            }

            component.set("v.fields", fields);
            component.set("v.staticResource", staticResource);
            component.set("v.showSpinner", false);
          } else {
            component.set("v.showSpinner", false);
            helper.ShowToast({
              message: rv.Message,
              type: "error"
                    "message" : "Init error",
                    "type" : "error"
            });
                
          }
        } else {
          component.set("v.showSpinner", false);
          helper.ShowToast({
            message: "Init error",
            type: "error"
          });
        }
      }
    );
  },
  saveClick: function (component, event, helper) {
    let staticResource = component.get("v.staticResource");
    let record_id = component.get("v.recordId");
    let record_type_id = component.get("v.recordTypeId");

    let isClone = component.get("v.isClone");
        let staticResource = component.get('v.staticResource');
        let record_id = component.get('v.recordId');
        let record_type_id = component.get('v.recordTypeId');
        
        let isClone = component.get('v.isClone');
    let url = staticResource.newUrl;
    let payloadPi = {};
    if (record_id && !isClone) {
      url = staticResource.updateUrl;
      payloadPi["dataId"] = component.get("v.record_data").AWS_Data_Id__c;
            url = staticResource.updateUrl
            payloadPi['dataId'] = component.get('v.record_data').AWS_Data_Id__c;
    }
    let layout = component.get("v.layout");
        let layout = component.get('v.layout');

    let pi_fields_map = component.get("v.pi_fields_map");
        let pi_fields_map = component.get('v.pi_fields_map');

    for (let s of layout) {
      for (let c of s.layoutColumns) {
        for (let item of c.layoutItems) {
          if (pi_fields_map.hasOwnProperty(item.field)) {
                        
            payloadPi[pi_fields_map[item.field].AWS_Field_API__c] = item.value;
          }

@@ -160,7 +154,7 @@
            let fs = component.find("field");
            for (let fi in fs) {
              let f = fs[fi];
              if (!f.get("v.value")) {
                            if(!f.get('v.value')){
                f.reset();
              }
            }
@@ -171,7 +165,7 @@
    }

    component.set("v.showSpinner", true);
    debugger;
        debugger
    let data = {};
    if (record_id && !isClone) {
      data.Id = record_id;
@@ -186,15 +180,11 @@
      }
    }
    let x = 1;
    helper.CallBackAction(
      component,
      "Save",
      {
        helper.CallBackAction(component,'Save',{
        data: data,
        transId: "1",
                         transId :'1',
        recordTypeId: record_type_id
      },
      function (data) {
                     },function(data){
        component.set("v.showSpinner", false);
        if (data.getState() == "SUCCESS") {
          var rv = data.getReturnValue();
@@ -203,48 +193,47 @@
          if (rv.IsSuccess) {
            sfId = rv.Data.recordId;
            helper.ShowToast({
              message: "成功",
              type: "success"
                                    "message" : "成功",
                                    "type" : "success"
            });
            if (record_id) {
              $A.get("e.force:closeQuickAction").fire();
              $A.get("e.force:refreshView").fire();
                                    $A.get('e.force:refreshView').fire();
            } else {
              var sObjectEvent = $A.get("e.force:navigateToSObject");
              sObjectEvent.setParams({
                recordId: sfId
              });
                                        "recordId": sfId
                                    })
              sObjectEvent.fire();
            }
          } else {
            helper.ShowToast({
              message: rv.Message,
              type: "error"
                                    "message" : rv.Message,
                                    "type" : "error"
            });
          }
        } else {
          helper.ShowToast({
            message: "Init error",
            type: "error"
                                "message" : "Init error",
                                "type" : "error"
          });
        }
      }
    );
                     })
  },
  cancelClick: function (component, event, helper) {
    $A.get("e.force:closeQuickAction").fire();
    //component.set("v.showNewAgencyContact", false);
  },
  searchAgencyContact: function (component, event, helper) {
    component.find("button").set("v.disabled", true);
        component.find('button').set('v.disabled', true);
    helper.resetTable();
    helper.preparePayloadForSearchAgencyContact(component, event, helper);
  },
  initContactTable: function (component, event, helper) {
    let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
        let cols = ['Name','AgencyHospital', 'DoctorDivision1','Type'];
    let contactInfoList = [];
    let awsDataIds = [];
    let data = component.get("v.result");
        let data = component.get('v.result');
    if (data.object) {
      for (var i = 0; i < data.object.length; i++) {
        if (data.object[i].dataId) {
@@ -256,7 +245,7 @@
          contactInfo.Type = data.object[i].type;
          contactInfo.pi = true;
          awsDataIds.push(contactInfo.AWSDataId);
          contactInfo.sfRecordId = "";
                    contactInfo.sfRecordId = '';
          contactInfoList.push(contactInfo);
        }
      }
@@ -264,24 +253,24 @@
    let AWSIdToSFIdMapValue = {};
  },
  openModel: function (component, event, helper) {
    let layout = component.get("v.layout");
        let layout = component.get('v.layout');
    for (let s of layout) {
      for (let c of s.layoutColumns) {
        for (let item of c.layoutItems) {
          if (item.field == "Agency_Hospital__c" && !item.value) {
            console.log("item.value = " + item.value);
                    if(item.field == 'Agency_Hospital__c' && !item.value){
                        console.log('item.value = ' + item.value)
            helper.ShowToast({
              message: "请先选择经销商医院",
              type: "warning"
                            "message" : "请先选择经销商医院",
                            "type" : "warning"
            });
            return;
                        return
          }
        }
      }
    }
    // Set isModalOpen true
    component.set("v.isModalOpen", true);
    component.find("button").set("v.disabled", true);
        component.find('button').set('v.disabled', true);
    helper.preparePayloadForSearchAgencyContact(component, event, helper);
  },

@@ -302,8 +291,8 @@
  closeAgencyContact: function (component, event, helper) {
    var message = event.getParam("showNewAgencyContact");
    component.set("v.showNewAgencyContact", message);
    component.find("button").set("v.disabled", true);
        component.find('button').set('v.disabled', true);
    helper.resetTable();
    helper.preparePayloadForSearchAgencyContact(component, event, helper);
  }
});
       },
})

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js

@@ -1,8 +1,6 @@
({
  CallBackAction: function (component, action_name, para, callback) {
    var action = component.get(
      "c." + action_name.trimStart().replace("c.", "")
    );
        var action = component.get("c." + action_name.trimStart().replace("c.",""));
    if (para) {
      action.setParams(para);
    }
@@ -20,81 +18,63 @@
    toastEvent.fire();
  },
  AwsPost: function (postURL, data, callback, token) {
    let payloadForNewPI = "";
    if (typeof data == "string") {
        let payloadForNewPI = '';
        if(typeof(data) == 'string'){
      payloadForNewPI = data;
    } else {
      payloadForNewPI = JSON.stringify(data);
    }

    AWSService.post(
      postURL,
      payloadForNewPI,
      function (result) {
        AWSService.post(postURL,payloadForNewPI,function(result) {
        //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
        if (callback) callback(result);
      },
      token
    );
        },token);
  },
  AwsGet: function (url, data, callback, token) {
    if (typeof data == "string") {
        
        if(typeof(data) == 'string'){
      url += data;
    } else {
      let i = 0;
      for (let p in data) {
        url += i++ ? "&" : "?";
        url += p + "=" + data[p];
                url += (i++) ? '&' : '?';
                url += p + '=' + data[p];
      }
    }

    AWSService.get(
      url,
      function (result) {
        AWSService.get(url,function(result){
        //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
        if (callback) callback(result);
        },token);
      },
      token
    );
  },
  refreshTable: function (
    component,
    event,
    helper,
    cols,
    contactInfoList,
    contactsInfo
  ) {
    refreshTable : function(component, event, helper,cols,contactInfoList,contactsInfo){
    let that = this;
    let myTableDiv = document.getElementById("QueryResult");
    let table = document.createElement("TABLE");
    table.border = "1";
    table.id = "table";
    table.setAttribute(
      "class",
      "slds-table slds-table_cell-buffer slds-table_bordered"
    );
    let tableBody = document.createElement("TBODY");
        let table = document.createElement('TABLE');
        table.border = '1';
        table.id = 'table';
        table.setAttribute('class','slds-table slds-table_cell-buffer slds-table_bordered');
        let tableBody = document.createElement('TBODY');
    table.appendChild(tableBody);
    let headerTR = document.createElement("TR");
    headerTR.setAttribute("class", "slds-line-height_reset");
    let colsHeader = ["姓名", "医院", "医生区分(职务)", "分类"];
        let headerTR = document.createElement('TR');
        headerTR.setAttribute('class','slds-line-height_reset');
        let colsHeader = ['姓名','医院', '医生区分(职务)','分类'];
    tableBody.appendChild(headerTR);
    for (let i = 0; i < colsHeader.length; i++) {
      let td = document.createElement("TH");
      td.width = "75";
      td.setAttribute("class", "slds-truncate");
            let td = document.createElement('TH');
            td.width = '75';
            td.setAttribute('class','slds-truncate slds-border_right');
      td.appendChild(document.createTextNode(colsHeader[i]));
      headerTR.appendChild(td);
    }
    //3. Init the AWS data
    for (let i = 0; i < contactInfoList.length; i++) {
      let tr = document.createElement("TR");
            let tr = document.createElement('TR');
      tableBody.appendChild(tr);
      let contactInfoTemp = contactInfoList[i];
            let contactInfoTemp = contactInfoList[i]
      for (let j = 0; j < cols.length; j++) {
        let td = document.createElement("TD");
        td.width = "75";
                let td = document.createElement('TD');
                td.width = '75';
        if (contactInfoTemp.pi) {
          if (!contactsInfo.hasOwnProperty(contactInfoTemp.AWSDataId)) {
            continue;
@@ -105,12 +85,8 @@
        } else {
          td.id = contactInfoTemp.sfRecordId;
        }
        td.appendChild(
          document.createTextNode(
            contactInfoTemp[cols[j]] != null ? contactInfoTemp[cols[j]] : ""
          )
        );
        if (cols[j] == "Name") {
                td.appendChild(document.createTextNode(contactInfoTemp[cols[j]]!=null?contactInfoTemp[cols[j]]:''));
                if (cols[j] == 'Name') {
          td.addEventListener("click", function (obj) {
            that.redirectToParentPage(component, event, helper, obj);
          });
@@ -119,17 +95,17 @@
      }
    }
    myTableDiv.appendChild(table);
    component.find("button").set("v.disabled", false);
        component.find('button').set('v.disabled', false);
  },
  redirectToParentPage: function (component, event, helper, obj) {
    let agencyContactName = obj.currentTarget.innerText;
    let id = obj.currentTarget.id;
    component.set("v.ac_name", agencyContactName);
    let layout = component.get("v.layout");
        component.set('v.ac_name',agencyContactName);
        let layout = component.get('v.layout');
    for (let s of layout) {
      for (let c of s.layoutColumns) {
        for (let item of c.layoutItems) {
          if (item.field == "Agency_Contact__c") {
                    if(item.field == 'Agency_Contact__c'){
            item.value = id;
          }
        }
@@ -138,144 +114,126 @@
    component.set("v.isModalOpen", false);
  },
  resetTable: function () {
    let queryResult = document.getElementById("QueryResult");
    let table = document.getElementsByTagName("table");
        let queryResult = document.getElementById('QueryResult');
        let table = document.getElementsByTagName('table');
        debugger;
        console.log('table:' + table);
        debugger;
    if (table.length > 1) {
      for (var i = 1; i < table.length; i++) {
        queryResult.removeChild(table[i]);
                queryResult.removeChild(table[i])
      }
    }
  },
  preparePayloadForSearchAgencyContact: function (component, event, helper) {
    let that = this;
    let agencyHospitalId = "";
    let accountId = "";
    let layout = component.get("v.layout");
        let agencyHospitalId = '';
        let accountId = '';
        let layout = component.get('v.layout');
    for (let s of layout) {
      for (let c of s.layoutColumns) {
        for (let item of c.layoutItems) {
          if (item.field == "Agency_Hospital__c") {
                    if(item.field == 'Agency_Hospital__c'){
            agencyHospitalId = item.value;
          }
          if (item.field == "Account_Opp__c") {
                    if(item.field == 'Account_Opp__c'){
            accountId = item.value;
          }
        }
      }
    }
    var action = component.get("c.getAWSDataIds");
        var action = component.get('c.getAWSDataIds');
    action.setParams({
      agencyHospitalId: agencyHospitalId,
      accountId: accountId
            "agencyHospitalId" : agencyHospitalId,
            "accountId" : accountId
    });
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var rv = response.getReturnValue();
        if (rv.Data.length == 0) {
          component.find("button").set("v.disabled", false);
                    component.find('button').set('v.disabled', false);
          helper.ShowToast({
            message: "该经销商医院下面没有客户人员",
            type: "warning"
                        "message" : "该经销商医院下面没有客户人员",
                        "type" : "warning"
          });
          return;
                    return
        }
        let searchPayload = new Object();
        let searchAgencyContactName = component.get("v.searchKeyWord");
                let searchAgencyContactName = component.get('v.searchKeyWord');
        searchPayload.dataIds = rv.Data;
        searchPayload.name = searchAgencyContactName;
        component.set("v.contactAWSIds", rv.Data);
        let staticResource = component.get("v.staticResource");
                component.set('v.contactAWSIds',rv.Data);
                let staticResource = component.get('v.staticResource');
        let url = staticResource.searchUrl;
        let token = staticResource.token;
        this.AwsPost(
          url,
          searchPayload,
          function (data) {
                this.AwsPost(url,searchPayload,function(data){
            if (data.success) {
              let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
                        let cols = ['Name','AgencyHospital', 'DoctorDivision1','Type'];
              let contactInfoList = [];
              let awsDataIds = [];
              if (data.object.length == 0) {
                component.find("button").set("v.disabled", false);
                            component.find('button').set('v.disabled', false);
                that.ShowToast({
                  message: "没有查询到该客户人员",
                  type: "warning"
                                "message" : '没有查询到该客户人员',
                                "type" : "warning"
                });
                return;
                            return
              }
              for (var i = 0; i < data.object.length; i++) {
                if (data.object[i].dataId) {
                  let contactInfo = new Object();
                  //需要修改
                  contactInfo.Name = data.object[i].name;
                  contactInfo.AgencyHospital = "";
                                contactInfo.AgencyHospital = '';
                  contactInfo.DoctorDivision1 = data.object[i].doctorDivision1;
                  contactInfo.AWSDataId = data.object[i].dataId;
                  contactInfo.Type = data.object[i].type;
                  contactInfo.pi = true;
                  awsDataIds.push(contactInfo.AWSDataId);
                  contactInfo.sfRecordId = "";
                                contactInfo.sfRecordId = '';
                  contactInfoList.push(contactInfo);
                }
              }
              //let AWSIdToSFIdMapValue = {};
              var searchAgencyContacts = component.get(
                "c.searchAgencyContacts"
              );
                        var searchAgencyContacts = component.get('c.searchAgencyContacts');
              searchAgencyContacts.setParams({
                awsAgencyContactIds: JSON.stringify(awsDataIds),
                agencyHospitalId: agencyHospitalId,
                accountId: accountId
                            "awsAgencyContactIds" : JSON.stringify(awsDataIds),
                            "agencyHospitalId" : agencyHospitalId,
                            "accountId" : accountId                            
              });
              searchAgencyContacts.setCallback(this, function (response) {
                var state = response.getState();
                if (state == "SUCCESS") {
                            if(state == 'SUCCESS'){
                  var rv = response.getReturnValue();
                  if (rv.IsSuccess) {
                    let contactsInfo = "";
                                    let contactsInfo = '';
                    if (rv.Data) {
                      contactsInfo = JSON.parse(
                        rv.Data.replace(/(&quot\;)/g, '"')
                      );
                                        contactsInfo = JSON.parse(rv.Data.replace(/(&quot\;)/g,"\""));
                      if (Object.keys(contactsInfo).length > 0) {
                        for (let i = 0; i < contactInfoList.length; i++) {
                          let contactFromSF =
                            contactsInfo[contactInfoList[i]["AWSDataId"]];
                                                let contactFromSF = contactsInfo[contactInfoList[i]['AWSDataId']];
                          if (contactFromSF) {
                            contactInfoList[i].sfRecordId = contactFromSF["Id"];
                            if (contactFromSF["Agency_Hospital__r"]) {
                              contactInfoList[i].AgencyHospital =
                                contactFromSF["Agency_Hospital__r"]["Name"];
                                                    contactInfoList[i].sfRecordId = contactFromSF['Id'];
                                                    if(contactFromSF['Agency_Hospital__r']){
                                                         contactInfoList[i].AgencyHospital = contactFromSF['Agency_Hospital__r']['Name'];
                            }
                            if (contactFromSF["Department_Class__r"]) {
                              contactInfoList[i].AgencyHospital =
                                contactFromSF["Department_Class__r"]["Parent"][
                                  "Name"
                                ];
                                                    if(contactFromSF['Department_Class__r']){
                                                        contactInfoList[i].AgencyHospital = contactFromSF['Department_Class__r']['Parent']['Name'];
                            }
                          }
                        }
                      }
                    }
                    that.refreshTable(
                      component,
                      event,
                      helper,
                      cols,
                      contactInfoList,
                      contactsInfo
                    );
                                    that.refreshTable(component, event, helper,cols,contactInfoList,contactsInfo);
                  }
                }
              });
              $A.enqueueAction(searchAgencyContacts);
            }
          },
          token
        );
                },token);
      }
    });
    $A.enqueueAction(action);
  }
});
})

 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js

@@ -1,3 +1,5 @@
({

  // Your renderer method overrides go here
});

})

 force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp

@@ -1,30 +1,10 @@
<aura:component
  controller="WeeklyReportCmp"
  implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes"
  access="global"
>
<aura:component controller="WeeklyReportCmp" implements="force:appHostable,flexipage:availableForAllPageTypes,flexipage:availableForRecordHome,force:hasRecordId,force:lightningQuickAction,forceCommunity:availableForAllPageTypes" access="global" >
  <ltng:require styles="{!$Resource.multilineToastCSS}" /> 
  <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
  <aura:handler
    event="c:strike_evt"
    action="{!c.createAopp}"
    name="strike_evt_addNewRecord"
  />
  <aura:attribute
    name="data"
    type="Agency_Report__c"
    default="{sobjectType:'Agency_Report__c'}"
  />
  <aura:attribute
    name="oppdata"
    type="Agency_Opportunity__c"
    default="{sobjectType:'Agency_Opportunity__c'}"
  />
  <aura:attribute
    name="acondata"
    type="Agency_Contact__c"
    default="{sobjectType:'Agency_Contact__c'}"
  />
    <aura:handler event="c:strike_evt" action="{!c.createAopp}" name="strike_evt_addNewRecord"/>
    <aura:attribute name="data" type="Agency_Report__c" default="{sobjectType:'Agency_Report__c'}"/>
    <aura:attribute name="oppdata" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/>
    <aura:attribute name="acondata" type="Agency_Contact__c" default="{sobjectType:'Agency_Contact__c'}"/>
  <!-- <aura:attribute name="oppdata_old" type="Agency_Opportunity__c" default="{sobjectType:'Agency_Opportunity__c'}"/> -->
  <aura:attribute name="Close_Forecasted_Date__c_o" type="Date" />
  <aura:attribute name="Amount__c_o" type="String" />
@@ -53,11 +33,7 @@
  <aura:attribute name="doctor_list" type="Map" />
  <aura:attribute name="doctor_title" type="String" />
  <aura:attribute name="opportunity_list" type="Map" />
  <aura:handler
    name="change"
    value="{!v.data.Opportunity__c}"
    action="{!c.opportunityChange}"
  />
    <aura:handler name="change" value="{!v.data.Opportunity__c}" action="{!c.opportunityChange}"/>
  <aura:attribute name="edit_copy_select_report_id" type="String" />
  <aura:attribute name="create_agency_report_id" type="String" />
  <aura:attribute name="reports" type="List" />
@@ -80,31 +56,15 @@
    <aura:handler name="change" value="{!v.data.Product_Category2__c}" action="{!c.productcategoryChange2}"/>
    <aura:handler name="change" value="{!v.data.Product_Category3__c}" action="{!c.productcategoryChange3}"/> -->
  <!-- <aura:handler name="change" value="{!v.oppdata.StageName__c}" action="{!c.stageNameChange}"/> -->
  <aura:attribute
    name="update_select_report_data_id"
    type="String"
    default=""
  />
    <aura:attribute name="update_select_report_data_id" type="String" default=""/>

  <!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ start-->
  <aura:attribute name="reports_date" type="List" />
  <!-- <aura:attribute name="reports_date1" type="Date" />
    <aura:attribute name="reports_date2" type="Date" /> -->
  <aura:attribute
    name="TableContent"
    type="String"
    description=" Show the Result class"
  />
  <aura:attribute
    name="TableContent2"
    type="String"
    description=" Show the Result class"
  />
  <aura:attribute
    name="TargetFileName"
    type="String"
    description="Name of the file"
  />
    <aura:attribute name="TableContent" type="String"  description=" Show the Result class"/>
    <aura:attribute name="TableContent2" type="String"  description=" Show the Result class"/>
    <aura:attribute name="TargetFileName" type="String"  description="Name of the file"/>
  <aura:attribute name="tableheaders" type="Object[]" />
  <aura:attribute name="fileContentData" type="String" />
  <aura:attribute name="filename" type="String" />
@@ -121,129 +81,92 @@
  <aura:attribute name="contactawsurl" type="Map" />
  <aura:attribute name="allselectlistAgencyPerson" type="Map" />
  <!-- PIPL update Yin Mingjie 21/02/2022 end -->

    <!-- start DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->
    <aura:attribute name="errorData" type="Object" />
    <aura:attribute name="errorColumns" type="List" />
    <!-- show Error information -->
    <aura:attribute name="showErrorInfo" type="Boolean" default="false" />
    <!-- end DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->

  <!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ end-->
  <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
  <ltng:require scripts="{! $Resource.jquery183minjs }" />

  <!--ロード中...-->
  <aura:renderIf isTrue="{!v.login}">
    <div class="slds-spinner_container height100vh">
      <div
        class="slds-spinner--brand slds-spinner slds-spinner--medium"
        role="alert"
      >
       <div class="weeklyReportSpinner">
          <div class="slds-spinner_container">
              <div class="slds-spinner--brand slds-spinner slds-spinner--medium" role="alert">
        <span id="aa" class="slds-assistive-text">Loading</span>
        <div class="slds-spinner__dot-a"></div>
        <div class="slds-spinner__dot-b"></div>
      </div>
    </div>
      </div>
  </aura:renderIf>

  <div aura:id="report" id="report" class="contents_wrapper">
    <div aura:id="report" id="report">
    <div class="slds-grid slds-wrap slds-grid--pull-padded">
      <div
        class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
      >
            <div class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
        å‘¨
      </div>
      <div
        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
      >
        <ui:inputSelect
          aura:id="select_date"
          class="slds-select"
          change="{!c.select_date_change}"
        />
            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
                <ui:inputSelect aura:id="select_date" class="slds-select" change="{!c.select_date_change}"/>
      </div>

      <!-- ä»£ç†åº—担当者 -->
      <div
        class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12"
      >
            <div class="tr mt5 slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
        {!v.fieldsmap.Person_In_Charge2__c}
      </div>
      <div
        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
      >
        <ui:inputSelect
          aura:id="select_agency_person"
          class="slds-select agency_person_select"
          change="{!c.select_agency_change}"
        />
            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
                <ui:inputSelect aura:id="select_agency_person" class="slds-select agency_person_select" change="{!c.select_agency_change}"/>
      </div>
      <div
        class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
      >
        <ui:button
          aura:id="new_button"
          label="新建"
          press="{!c.new_report}"
          disabled="true"
        />
            <div class="tr slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-12 slds-large-size--1-of-12">
                <ui:button aura:id="new_button" label="新建" press="{!c.new_report}" disabled="true"/>
      </div>
      <div
        class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
      >
        <ui:button
          aura:id="copy_button"
          label="复制"
          press="{!c.copy_button}"
          disabled="true"
        />
            <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
                <ui:button aura:id="copy_button" label="复制" press="{!c.copy_button}" disabled="true"/>
        <!-- <ui:button aura:id="import" label="导入" press="{!c.import}" /> -->
        <ui:button aura:id="import" label="导入" press="{!c.import}" />

        <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}"  style="position:absolute;filter:alpha(opacity=0);" size="1" hidden="true" />  -->
        <!-- <ui:button aura:id="import" label="导出" press="{!c.export}"/> -->
        <ui:button
          aura:id="export"
          label="导出"
          press="{!c.export_condition}"
        />
                <ui:button aura:id="export" label="导出" press="{!c.export_condition}"/>
      </div>
            
    </div>
  </div>

  <div aura:id="report_list" class="report_list_area">
    <div class="slds-table--edit_container slds-is-relative">
      <table
        class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus"
        role="grid"
        style="width: 66.75rem"
      >
            <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid" style="width:66.75rem;">
        <thead>
          <tr class="slds-line-height--reset">
            <th class="table_header slds-text-title--caps"></th>
            <th class="table_header slds-text-title--caps">
              <span class="slds-truncate" title="Name"
                >{!v.fieldsmap.Person_In_Charge2__c}</span
              >
                        <th class="table_header slds-text-title--caps" style="width: 250px;">
                            
            </th>
            <th class="table_header slds-text-title--caps">
                        <th class="table_header slds-text-title--caps" style="width: 100px;">
                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Person_In_Charge2__c}</span>
                        </th>
                        <th class="table_header slds-text-title--caps" style="width: 250px;">
              <span class="slds-truncate" title="Name">医院</span>
            </th>
            <th class="table_header slds-text-title--caps">
              <span class="slds-truncate" title="Name"
                >{!v.fieldsmap.Department_Cateogy__c}</span
              >
                        <th class="table_header slds-text-title--caps" style="width: 100px;">
                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
            </th>
            <th class="table_header slds-text-title--caps">
                        <th class="table_header slds-text-title--caps" style="width: 100px;">
              <!-- PIPL update Yin Mingjie 21/02/2022 start
                            <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__r}</span>
                            PIPL update Yin Mingjie 21/02/2022 end-->
              <span class="slds-truncate" title="Name"
                >{!v.fieldsmap.Agency_Contact__c}</span
              >
                            <span class="slds-truncate" title="Name" style="width: 100px;">{!v.fieldsmap.Agency_Contact__c}</span>
                            
                        </th>
                        <th class="table_header slds-text-title--caps" style="width: 100px;">
                            <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
            </th>
            <th class="table_header slds-text-title--caps">
              <span class="slds-truncate" title="Name"
                >{!v.fieldsmap.visitor_title__c}</span
              >
            </th>
            <th class="table_header slds-text-title--caps">
              <span class="slds-truncate" title="Name"
                >{!v.fieldsmap.Purpose_Type__c}</span
              >
                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
            </th>
          </tr>
        </thead>
@@ -251,44 +174,25 @@
          <aura:iteration items="{!v.reports}" var="item" indexVar="index">
            <tr class="slds-hint-parent">
              <td role="gridcell" class="slds-cell-edit">
                <ui:inputRadio
                  class="report_radio"
                  name="report_radio"
                  label="{!item.Name}"
                  change="{!c.change_report_radio}"
                />
                <lightning:buttonIcon
                  class="edit_button"
                  iconName="utility:edit"
                  size="small"
                  alternativeText="edit"
                  value="{!index}"
                  onclick="{!c.edit_button}"
                />
                                <ui:inputRadio class="report_radio" name="report_radio" label="{!item.Name}" change="{!c.change_report_radio}"/>
                                <lightning:buttonIcon class="edit_button" iconName="utility:edit" size="small" alternativeText="edit" value="{!index}" onclick="{!c.edit_button}"/>
              </td>
              <td role="gridcell" class="slds-cell-edit">
                <span class="slds-grid slds-grid--align-spread">
                  <span
                    class="slds-truncate"
                    title="{!item.Person_In_Charge2__r.Name}"
                  >
                                    <span class="slds-truncate" title="{!item.Person_In_Charge2__r.Name}">
                    {!item.Person_In_Charge2__r.Name}
                    <!-- <span class="decrypt">{!item.Person_In_Charge2__r.awsdata.lastName}</span> -->
                  </span>
                </span>
              </td>
              <th scope="row" tabindex="0" class="slds-cell-edit">
                <span class="slds-grid slds-grid--align-spread">
                                <span class="slds-grid slds-grid--align-spread" style="word-wrap:break-word;word-break:break-all; ">
                  {!item.Agency_Hospital__r.Name}
                </span>
              </th>
              <td role="gridcell" class="slds-cell-edit">
                <span class="slds-grid slds-grid--align-spread">
                  <span
                    class="slds-truncate"
                    title="{!item.Department_Cateogy__c}"
                    >{!item.Department_Cateogy__c}</span
                  >
                                    <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
                </span>
              </td>
              <td role="gridcell" class="slds-cell-edit">
@@ -303,17 +207,13 @@
                <span class="slds-grid slds-grid--align-spread">
                  <span class="slds-truncate" title="{!item.visitor_title__c}">
                    <span class="encrypt">{!item.visitor_title__c}</span>
                    <span class="decrypt"
                      >{!item.doctor2__r.awsdata.doctorDivision1}</span
                    >
                                        <span class="decrypt">{!item.doctor2__r.awsdata.doctorDivision1}</span>
                  </span>
                </span>
              </td>
              <td role="gridcell" class="slds-cell-edit">
                <span class="slds-grid slds-grid--align-spread">
                  <span class="slds-truncate" title="{!item.Purpose_Type__c}"
                    >{!item.Purpose_Type__c}</span
                  >
                                    <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
                </span>
              </td>
            </tr>
@@ -323,140 +223,89 @@
    </div>
    <aura:renderIf isTrue="{!v.report_count > 0}">
      <aura:set attribute="else">
        <div class="no_data_area">{!v.list_message}</div>
                <div class="no_data_area">
                    {!v.list_message}
                </div>
      </aura:set>
    </aura:renderIf>
  </div>

  <!--    <ui:button aura:id="test_button" label="test" class="fade animation_on" press="{!c.test}"/>-->
  <!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ start-->
  <div
    aura:id="modal_import"
    role="dialog"
    tabindex="-1"
    class="disp_none slds-modal slds-fade-in-open slds-modal--large"
    aria-labelledby="headerTarget"
  >
    <div aura:id="modal_import" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
    <div class="slds-modal__container">
      <div class="slds-modal__header">
        <h4 id="headerTarget" class="slds-float--left"></h4>
        <h2 id="headerTarget" class="slds-text-heading--medium">
          å‘¨æŠ¥æ‰¹é‡å¯¼å…¥
        </h2>
        <ui:button
          aura:id="close_button"
          label="关闭"
          class="close_button slds-button slds-button--neutral slds-order--1"
          press="{!c.close_import}"
        />
                <h2 id="headerTarget" class="slds-text-heading--medium">周报批量导入</h2>
                <ui:button aura:id="close_button" label="关闭" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_import}"/>
      </div>
      <div
        class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
      >
            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium " >
        <aura:if isTrue="{!v.showMain}">
          <div>
            <!-- <input type="file" class="file" aura:id="file" onchange="{!c.CreateRecord}" value="导入" /> -->
            <lightning:input
              type="file"
              class="file"
              uara:id="file"
              onchange="{!c.CreateRecord}"
            />
                        <lightning:input type="file" class="file" uara:id="file" onchange="{!c.CreateRecord}" />
            <!-- <ui:button label="Create Accounts" press="{!c.CreateRecord}"/> -->
          </div>
          <aura:set attribute="else">
            <!-- <ui:outputRichText class="uiOutputRichText slds-m-around-large" value="{!v.TargetFileName}"/>  -->
            <ui:outputRichText
              class="uiOutputRichText slds-m--around-large"
              value="{!v.TableContent}"
            />
                        <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent}"/>
            <div class="slds-p-around--large slds-align--absolute-center">
              <lightning:button
                label="保存"
                variant="brand"
                onclick="{!c.processFileContent}"
                            <lightning:button label="保存" variant="brand" onclick="{!c.processFileContent}"
              />
              <lightning:button
                label="取消"
                variant="brand"
                onclick="{!c.cancel}"
              />
                            <lightning:button label="取消" variant="brand" 
                                              onclick="{!c.cancel}" /> 
            </div>
                        <!-- start DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->
                        <aura:if isTrue="{!v.showErrorInfo}">
                            <div class="slds-p-around--large slds-align--absolute-center">
                                <lightning:button label="导出错误信息" variant="brand" onclick="{!c.exportErrorInfo}" />
                            </div>
                            <div class="slds-p-around--large slds-align--absolute-center">
                                <div style="height: 300px;overflow-x:scroll">
                                    <lightning:datatable keyField="id" data="{! v.errorData }"
                                        columns="{! v.errorColumns }" hideCheckboxColumn="true" />
                                </div>
                            </div>
                        </aura:if>
                        <!-- start DTT-zhj å¢žåŠ é”™è¯¯ä¿¡æ¯table 2023-05-16-->
          </aura:set>
        </aura:if>
      </div>
    </div>
  </div>
  <div
    aura:id="modal_importbg"
    class="disp_none slds-backdrop slds-backdrop--open"
  ></div>
    <div aura:id="modal_importbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
  <!-- æ‰¹é‡æ·»åŠ å‘¨æŠ¥ end-->

  <!-- æ‰¹é‡å¯¼å‡ºå‘¨æŠ¥ start-->
  <div
    aura:id="modal_export"
    role="dialog"
    tabindex="-1"
    class="disp_none slds-modal slds-fade-in-open slds-modal--large"
  >
    <div aura:id="modal_export" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" >
    <div class="slds-modal__container">
      <div class="slds-modal__header">
        <h4 id="headerTarget" class="slds-float--left"></h4>
        <h2 id="headerTarget" class="slds-text-heading--medium">
          å‘¨æŠ¥æ‰¹é‡å¯¼å‡º
        </h2>
        <ui:button
          aura:id="close_button"
          label="关闭"
          class="close_button slds-button slds-button--neutral slds-order--1"
          press="{!c.close_export}"
        />
                <h2 id="headerTarget" class="slds-text-heading--medium">周报批量导出</h2>
                <ui:button aura:id="close_button" label="关闭" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.close_export}"/>
      </div>
      <div
        class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium"
      >
            <div class="slds-modal__content slds-scrollable slds-grow slds-p-around--medium">
        <aura:if isTrue="{!v.showMain}">
          <div class="slds-grid slds-wrap slds-grid--pull-padded">
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
            ></div>
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
                        </div>
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
              æ´»åŠ¨æ—¥å¼€å§‹æ—¥æœŸ

              <lightning:input
                type="Date"
                class="slds-input slds-input_bare"
                aura:id="input-report-date1"
              />
                            <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date1" />
            </div>
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
              æ´»åŠ¨æ—¥ç»“束日期
              <lightning:input
                type="Date"
                class="slds-input slds-input_bare"
                aura:id="input-report-date2"
              />
                            <lightning:input type="Date" class="slds-input slds-input_bare " aura:id="input-report-date2" />
            </div>
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4"
            ></div>
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-4">
                        </div>

            <div class="slds-p-around--large slds-align--absolute-center">
              <lightning:button
                label="确认"
                variant="brand"
                onclick="{!c.select_repores_date}"
                            <lightning:button label="确认" variant="brand" onclick="{!c.select_repores_date}"
              />
              <lightning:button
                label="取消"
                variant="brand"
                onclick="{!c.close_export}"
              />
                            <lightning:button label="取消" variant="brand" 
                                                  onclick="{!c.close_export}" /> 
            </div>
          </div>
          <!-- <div>
@@ -469,97 +318,47 @@
                                              onclick="{!c.close_export}" /> 
                    </div> -->
          <aura:set attribute="else">
            <ui:outputRichText
              class="uiOutputRichText slds-m--around-large"
              value="{!v.TableContent2}"
            />
                        <ui:outputRichText class="uiOutputRichText slds-m--around-large" value="{!v.TableContent2}"/>
            <div class="slds-p-around--large slds-align--absolute-center">
              <lightning:button
                label="确认"
                variant="brand"
                onclick="{!c.exportDate}"
                            <lightning:button label="确认" variant="brand" onclick="{!c.exportDate}"
              />
              <lightning:button
                label="取消"
                variant="brand"
                onclick="{!c.close_export}"
              />
                            <lightning:button label="取消" variant="brand" 
                                              onclick="{!c.close_export}" /> 
            </div>
                        
          </aura:set>
        </aura:if>
      </div>
    </div>
  </div>
  <div
    aura:id="modal_exportbg"
    class="disp_none slds-backdrop slds-backdrop--open"
  ></div>
    <div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
  <!-- æ‰¹é‡å¯¼å‡ºå‘¨æŠ¥ end-->

  <div
    aura:id="modal_window"
    role="dialog"
    tabindex="-1"
    class="disp_none slds-modal slds-fade-in-open slds-modal--large"
    aria-labelledby="headerTarget"
  >
    <div aura:id="modal_window" role="dialog" tabindex="-1" class="disp_none slds-modal slds-fade-in-open slds-modal--large" aria-labelledby="headerTarget">
    <div class="slds-modal__container">
      <div class="slds-modal__header">
        <h4 id="headerTarget" class="slds-float--left">{!v.dialog_type}</h4>
        <h2 id="headerTarget" class="slds-text-heading--medium">
          å‘¨æŠ¥({!v.selected_date}&nbsp;{!v.selected_agency_person})
        </h2>
        <ui:button
          aura:id="close_button"
          label="关闭"
          class="close_button slds-button slds-button--neutral slds-order--1"
          press="{!c.toggle_report}"
        />
                <h2 id="headerTarget" class="slds-text-heading--medium">周报({!v.selected_date}&nbsp;{!v.selected_agency_person})</h2>
                <ui:button aura:id="close_button" label="关闭" class="close_button slds-button slds-button--neutral slds-order--1" press="{!c.toggle_report}"/>
      </div>
      <div class="slds-modal__content slds-grow slds-p-around--medium">
        <div class="slds-box slds-theme--shade">
          <div class="slds-grid slds-wrap slds-grid--pull-padded">
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
              æ´»åŠ¨æ—¥
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <force:inputField
                value="{!v.data.Report_Date__c}"
                aura:id="input-report-date"
              />
                            <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/>
            </div>
            <!-- åŒ»é™¢ -->
            <div
              aura:id="hospital_list"
              class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5"
              data-select="single"
            >
              <ui:inputText
                aura:id="hospital_input_text"
                label="医院"
                class="field"
                value="{!v.hospital}"
                updateOn="keyup"
              />
                        <div aura:id="hospital_list" class="slds-form-element slds-lookup slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-5" data-select="single">
                            <ui:inputText aura:id="hospital_input_text" label="医院" class="field" value="{!v.hospital}" updateOn="keyup"/>
              <div class="slds-lookup__menu" id="lookup-66">
                <ul class="slds-lookup__list" role="listbox">
                  <aura:iteration var="hospital" items="{!v.hospitalList}">
                    <li
                      role="presentation"
                      onclick="{!c.selectHos}"
                      data-accName="{!hospital.Hospital_Name_readonly__c}"
                      data-accId="{!hospital.Hospital__c}"
                    >
                      <span
                        class="slds-lookup__item-action slds-media"
                        id="lookup-option-498"
                        role="option"
                      >
                                        <li role="presentation" onclick="{!c.selectHos}" data-accName="{!hospital.Hospital_Name_readonly__c}" data-accId="{!hospital.Hospital__c}">
                                            <span class="slds-lookup__item-action slds-media" id="lookup-option-498" role="option">
                        <div class="slds-media__body">
                          <div class="slds-lookup__result-text">
                            {!hospital.Hospital_Name_readonly__c}
                          </div>
                                                    <div class="slds-lookup__result-text">{!hospital.Hospital_Name_readonly__c}</div>
                        </div>
                      </span>
                    </li>
@@ -569,70 +368,38 @@
            </div>

            <!-- ç§‘室分类 -->
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
              {!v.fieldsmap.Department_Cateogy__c}
              <ui:inputSelect
                aura:id="select_department"
                class="slds-select"
                change="{!c.select_department}"
              />
                            <ui:inputSelect aura:id="select_department" class="slds-select" change="{!c.select_department}"/>
            </div>

            <!-- å…ˆç”Ÿ -->
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
              {!v.fieldsmap.doctor2__c}
              <ui:inputSelect
                aura:id="select_doctor"
                class="slds-select"
                change="{!c.doctor_change}"
              />
                            <ui:inputSelect aura:id="select_doctor" class="slds-select" change="{!c.doctor_change}"/>
            </div>

            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-12">
              <br />
              <ui:button
                label="新建"
                class="slds-button"
                press="{!c.createCon}"
                disabled="true"
                aura:id="new_con"
              />
                            <ui:button label="新建" class="slds-button" press="{!c.createCon}" disabled="true" aura:id="new_con"/>
            </div>

            <!-- èŒä½ -->
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-8">
              {!v.fieldsmap.visitor_title__c}
              <div>{!v.doctor_title}</div>
            </div>
            <!-- æ´»åŠ¨åŒºåˆ† -->
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
              {!v.fieldsmap.Purpose_Type__c}
              <ui:inputSelect
                aura:id="select_purpose_type"
                class="slds-select"
                change="{!c.select_purpose_type}"
              />
                            <ui:inputSelect aura:id="select_purpose_type" class="slds-select" change="{!c.select_purpose_type}"/>
            </div>
            <!-- è¯¢ä»· -->
            <div
              aura:id="input-opportunity-opp"
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12"
            >
                        <div aura:id="input-opportunity-opp" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--4-of-12 slds-large-size--4-of-12">
              {!v.fieldsmap.Opportunity__c}
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <!-- <force:inputField value="{!v.data.Opportunity__c}" aura:id="input-opportunity"/> -->
              <c:strike_lookup
                label=""
                            <c:strike_lookup label=""
                object="Agency_Opportunity__c"
                searchField="Name"
                placeholder="搜索经销商询价..."
@@ -647,102 +414,55 @@
                showRecentRecords="true"
                value="{!v.data.Opportunity__c}"
                filter="{!v.opportunity_cfilter}"
                subTitleFormat="{0}+{1}+{2}"
              />
                                    subTitleFormat="{0}+{1}+{2}"/>
            </div>
            <div
              aura:id="input-opportunity-blank"
              class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12"
            ></div>
            <div
              aura:id="input-opportunity-stage"
              class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
            >
                        <div aura:id="input-opportunity-blank" class="lds-p-horizontal--small slds-size--1-of-1 slds-medium-size--8-of-12 slds-large-size--8-of-12">
                        </div>
                        <div aura:id="input-opportunity-stage" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
              {!v.fieldsmap.StageName__c}
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <ui:inputSelect aura:id="select_stageName" class="slds-select" />
              <!-- <force:inputField value="{!v.oppdata.StageName__c}" aura:id="input-oppstage" /> -->
            </div>
            <div
              aura:id="input-opportunity-amount1"
              class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
            >
                        <div aura:id="input-opportunity-amount1" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
              {!v.fieldsmap.Amount__c}
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <force:inputField value="{!v.oppdata.Amount__c}" class="" />
            </div>
            <div
              aura:id="input-opportunity-amount2"
              class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
            >
                        <div aura:id="input-opportunity-amount2" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
              {!v.fieldsmap.OCMSale_Price__c}
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <force:inputField
                value="{!v.oppdata.OCMSale_Price__c}"
                class=""
              />
                            <force:inputField value="{!v.oppdata.OCMSale_Price__c}" class=""/>
            </div>
            <div
              aura:id="input-opportunity-date"
              class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12"
            >
                        <div aura:id="input-opportunity-date" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--2-of-12 slds-large-size--2-of-12">
              {!v.fieldsmap.Close_Forecasted_Date__c}
              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
              <force:inputField
                value="{!v.oppdata.Close_Forecasted_Date__c}"
                class=""
              />
                            <force:inputField value="{!v.oppdata.Close_Forecasted_Date__c}" class=""/>
            </div>
            <!-- è£½å“åˆ†é¡ž -->
            <div
              aura:id="product_category_select1"
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
            >
                        <div aura:id="product_category_select1" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
              {!v.fieldsmap.Product_Category1__c}
              <!-- <force:inputField value="{!v.data.Product_Category1__c}" aura:id="input-product-category1"/> -->
              <ui:inputSelect
                aura:id="select_Product1"
                class="slds-select"
                change="{!c.productcategoryChange1}"
              />
                            <ui:inputSelect aura:id="select_Product1" class="slds-select" change="{!c.productcategoryChange1}"/>
            </div>
            <div
              aura:id="product_category_select2"
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
            >
                        <div aura:id="product_category_select2" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
              {!v.fieldsmap.Product_Category2__c}
              <!-- <force:inputField value="{!v.data.Product_Category2__c}" aura:id="input-product-category2"/> -->
              <ui:inputSelect
                aura:id="select_Product2"
                class="slds-select"
                change="{!c.productcategoryChange2}"
              />
                            <ui:inputSelect aura:id="select_Product2" class="slds-select" change="{!c.productcategoryChange2}"/>
            </div>
            <div
              aura:id="product_category_select3"
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
            >
                        <div aura:id="product_category_select3" class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
              {!v.fieldsmap.Product_Category3__c}
              <!-- <force:inputField value="{!v.data.Product_Category3__c}" aura:id="input-product-category3"/> -->
              <ui:inputSelect
                aura:id="select_Product3"
                class="slds-select"
                change="{!c.productcategoryChange3}"
              />
                            <ui:inputSelect aura:id="select_Product3" class="slds-select" change="{!c.productcategoryChange3}"/>
            </div>
            <!--SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start-->
            <!-- æ”¯æ´éœ€æ±‚ change="{!c.SupportNeeds__c}"-->
            <div
              class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6"
            >
                        <div class="slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--1-of-5 slds-large-size--1-of-6">
              {!v.fieldsmap.SupportNeeds__c}
              <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
            </div>
            <!--SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end-->
            <div
              aura:id="result"
              class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12"
            >
                        <div aura:id="result" class="disp_none slds-p-horizontal--small slds-size--1-of-1 slds-medium-size--3-of-12 slds-large-size--3-of-12">
              {!v.fieldsmap.Result__c}
              <ui:inputSelect aura:id="select_result" class="slds-select" />
              <!-- <ui:inputText label="结果" class="bcolor" value="{!v.result}"/> -->
@@ -750,21 +470,13 @@
          </div>
        </div>
        <div class="save_button_area">
          <ui:button
            aura:id="save_button"
            label="保存并新建"
            class="save_button slds-button slds-button--brand slds-order--3"
            press="{!c.save_report}"
          />
                    <ui:button aura:id="save_button" label="保存并新建" class="save_button slds-button slds-button--brand slds-order--3" press="{!c.save_report}"/>
        </div>

        <aura:renderIf isTrue="{!v.reports_now_count > 0}">
          <div class="mt40 slds-box slds-theme--shade">
            <div class="slds-table--edit_container slds-is-relative">
              <table
                class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus"
                role="grid"
              >
                            <table class="slds-table slds-table--edit slds-table--bordered slds-table--fixed-layout slds-no-cell-focus" role="grid">
                <thead>
                  <tr class="slds-line-height--reset">
                    <th class="table_header slds-text-title--caps">
@@ -774,96 +486,56 @@
                      <span class="slds-truncate" title="Name">医院</span>
                    </th>
                    <th class="table_header slds-text-title--caps">
                      <span class="slds-truncate" title="Name"
                        >{!v.fieldsmap.Department_Cateogy__c}</span
                      >
                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Department_Cateogy__c}</span>
                    </th>
                    <th class="table_header slds-text-title--caps">
                      <span class="slds-truncate" title="Name"
                        >{!v.fieldsmap.doctor2__c}</span
                      >
                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.doctor2__c}</span>
                    </th>
                    <th class="table_header slds-text-title--caps">
                      <span class="slds-truncate" title="Name"
                        >{!v.fieldsmap.visitor_title__c}</span
                      >
                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.visitor_title__c}</span>
                    </th>
                    <th class="table_header slds-text-title--caps">
                      <span class="slds-truncate" title="Name"
                        >{!v.fieldsmap.Purpose_Type__c}</span
                      >
                                            <span class="slds-truncate" title="Name">{!v.fieldsmap.Purpose_Type__c}</span>
                    </th>
                  </tr>
                </thead>
                <tbody>
                  <aura:iteration
                    items="{!v.reports_now}"
                    var="item"
                    indexVar="index"
                  >
                                    <aura:iteration items="{!v.reports_now}" var="item" indexVar="index">
                    <tr aura:id="modal_data_list_tr" class="slds-hint-parent">
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.Department_Cateogy__c}"
                            >{!item.Name}</span
                          >
                                                    <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Name}</span>
                        </span>
                      </td>
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.Agency_Hospital__r.Name}"
                            >{!item.Agency_Hospital__r.Name}</span
                          >
                                                    <span class="slds-truncate" title="{!item.Agency_Hospital__r.Name}">{!item.Agency_Hospital__r.Name}</span>
                        </span>
                      </td>
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.Department_Cateogy__c}"
                            >{!item.Department_Cateogy__c}</span
                          >
                                                    <span class="slds-truncate" title="{!item.Department_Cateogy__c}">{!item.Department_Cateogy__c}</span>
                        </span>
                      </td>
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.doctor2__r.Name}"
                          >
                                                    <span class="slds-truncate" title="{!item.doctor2__r.Name}">
                            <span class="encrypt">{!item.doctor2__r.Name}</span>
                            <span class="decrypt"
                              >{!item.doctor2NameOrigin}</span
                            >
                                                        <span class="decrypt">{!item.doctor2NameOrigin}</span>
                          </span>
                        </span>
                      </td>
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.visitor_title__c}"
                          >
                            <span class="encrypt"
                              >{!item.visitor_title__c}</span
                            >
                            <span class="decrypt"
                              >{!item.visitorTitleOrigin}</span
                            >
                                                    <span class="slds-truncate" title="{!item.visitor_title__c}">
                                                        <span class="encrypt">{!item.visitor_title__c}</span>
                                                        <span class="decrypt">{!item.visitorTitleOrigin}</span>
                          </span>
                        </span>
                      </td>
                      <td role="gridcell" class="slds-cell-edit">
                        <span class="slds-grid slds-grid--align-spread">
                          <span
                            class="slds-truncate"
                            title="{!item.Purpose_Type__c}"
                            >{!item.Purpose_Type__c}</span
                          >
                                                    <span class="slds-truncate" title="{!item.Purpose_Type__c}">{!item.Purpose_Type__c}</span>
                        </span>
                      </td>
                    </tr>
@@ -876,80 +548,37 @@
      </div>
    </div>
  </div>
  <div
    aura:id="modal_bg"
    class="disp_none slds-backdrop slds-backdrop--open"
  ></div>
    <div aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>

  <div
    aura:id="modal_confirm"
    role="dialog"
    tabindex="-2"
    aria-labelledby="header43"
    class="disp_none slds-modal slds-fade-in-open"
  >
    <div aura:id="modal_confirm" role="dialog" tabindex="-2" aria-labelledby="header43" class="disp_none slds-modal slds-fade-in-open">
    <div class="slds-modal__container">
      <div class="slds-modal__header">
        <h2 id="header43" class="slds-text-heading--medium">
          {!v.modal_confirm_title}
        </h2>
                <h2 id="header43" class="slds-text-heading--medium">{!v.modal_confirm_title}</h2>
      </div>
      <div class="slds-modal__content slds-p-around--medium">
        <p>{!v.modal_confirm_text}</p>
      </div>
      <div class="slds-modal__footer">
        <ui:button
          label="是"
          class="slds-button slds-button--brand"
          press="{!c.yes_button}"
        />
        <ui:button
          label="否"
          class="slds-button slds-button--neutral"
          press="{!c.no_button}"
        />
                <ui:button label="是" class="slds-button slds-button--brand" press="{!c.yes_button}"/>
                <ui:button label="否" class="slds-button slds-button--neutral" press="{!c.no_button}" />
      </div>
    </div>
  </div>
  <div
    aura:id="modal_confirm_bg"
    class="disp_none slds-backdrop slds-backdrop--open"
  ></div>
    <div aura:id="modal_confirm_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>

  <div
    aura:id="modal_newAC"
    role="dialog"
    tabindex="-3"
    aria-labelledby="headertest"
    class="disp_none slds-modal slds-fade-in-open"
  >
    <div aura:id="modal_newAC" role="dialog" tabindex="-3" aria-labelledby="headertest" class="disp_none slds-modal slds-fade-in-open">
    <div class="slds-modal__container">
      <div class="slds-modal__header">
        <h2 id="headertest" class="slds-text-heading--medium">新建.客户人员</h2>
      </div>
      <div class="slds-modal__content slds-p-around--medium">
        <lightning:recordEditForm
          aura:id="recordEditForm"
          objectApiName="Agency_Contact__c"
          onsuccess="{!c.handleSuccess}"
          onload="{!c.showRequiredFields}"
          onsubmit="{!c.handleSubmit}"
        >
                <lightning:recordEditForm aura:id="recordEditForm"  objectApiName="Agency_Contact__c" onsuccess="{!c.handleSuccess}" onload="{!c.showRequiredFields}" onsubmit="{!c.handleSubmit}">
          <lightning:messages aura:id="OppMessage" />
          <!-- onload="{!c.showRequiredFields}" -->
          <aura:renderIf isTrue="{!v.truthy}">
            <lightning:inputField
              fieldName="Name"
              aura:id="newOpportunityField"
            />
            <lightning:inputField
              fieldName="Type__c"
              aura:id="newOpportunityField"
            />
            <lightning:inputField
              fieldName="Doctor_Division1__c"
              aura:id="newOpportunityField"
            />
                        <lightning:inputField fieldName="Name" aura:id="newOpportunityField" />
                        <lightning:inputField fieldName="Type__c" aura:id="newOpportunityField" />
                        <lightning:inputField fieldName="Doctor_Division1__c" aura:id="newOpportunityField" />
            <!-- <lightning:inputField class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
                        <lightning:inputField class="customRequired none" aura:id="Input_Doctor_Division1__c" fieldName="Doctor_Division1__c"/> -->
          </aura:renderIf>
@@ -959,20 +588,15 @@
          <br />
          <br />
          <div class="save_button_area">
            <lightning:button
              class="slds-m-top_small"
              type="button"
              label="取消"
              onclick="{!c.createCancel}"
            />
            <lightning:button
              class="slds-m-top_small"
              type="submit"
              label="保存"
            />
                        <lightning:button class="slds-m-top_small" type="button" label="取消" onclick="{!c.createCancel}"/>
                        <lightning:button class="slds-m-top_small" type="submit" label="保存" />
          </div>

                    
        </lightning:recordEditForm>
      </div>
    </div>
  </div>
    

</aura:component>

 force-app/main/default/aura/WeeklyReport/WeeklyReport.css

@@ -139,3 +139,12 @@
.THIS tr:hover .encrypt{
    display: none;
}

.THIS .weeklyReportSpinner{
    top:100px;
}

.THIS .slds-spinner_container{
    position: absolute;
    top:100px;
}

 force-app/main/default/aura/WeeklyReport/WeeklyReportController.js

@@ -1,29 +1,31 @@
({
  doInit: function (component, event, helper) {
    console.log("zhj æ–°æ–¹æ¡ˆ");
        console.log('zhj æ–°æ–¹æ¡ˆweeklyReport');
    if (window.location.href.endsWith("weekly-report")) {
      helper.doinit(component, event, helper);
    } else {
      helper.hideCmp(component, event, helper);
    }
        component.set("v.showErrorInfo", false);
  },

  createAopp: function (component, event, helper) {
    var addRecordEvent = $A.get("e.force:createRecord");
        var addRecordEvent = $A.get('e.force:createRecord');
    addRecordEvent.setParams({
      entityApiName: "Agency_Opportunity__c",
      recordTypeId: "012100000006KW7"
            entityApiName: 'Agency_Opportunity__c',
            recordTypeId: '012100000006KW7'
    });
    addRecordEvent.fire();
        component.set("v.showErrorInfo", false);
  },

  new_report: function (component, event, helper) {
    component.find("save_button").set("v.label", "保存并新建");
        component.find('save_button').set('v.label', '保存并新建');
    helper.new_report(component, event, helper);
  },

  copy_button: function (component, event, helper) {
    component.find("save_button").set("v.label", "保存并新建");
        component.find('save_button').set('v.label', '保存并新建');
    helper.copy_button(component, event, helper);
  },

@@ -32,7 +34,7 @@
  },

  edit_button: function (component, event, helper) {
    component.find("save_button").set("v.label", "保存");
        component.find('save_button').set('v.label', '保存');
    helper.edit_button(component, event, helper);
  },

@@ -61,7 +63,7 @@
    // helper.handleFormSubmit(component);
    var showValidationError = false;
    var fields = component.find("newOpportunityField");
    var vaildationFailReason = "";
        var vaildationFailReason = '';
    // var vaildationFailReason2 = '';
    // var currentDate = new Date().toJSON().slice(0,10);

@@ -70,30 +72,25 @@
    // PIPL update Yin Mingjie 21/02/2022 end

    fields.forEach(function (field) {
      if (
        field.get("v.fieldName") === "Type__c" &&
        $A.util.isEmpty(field.get("v.value"))
      ) {
            if(field.get("v.fieldName") === 'Type__c' && $A.util.isEmpty(field.get("v.value"))){
        showValidationError = true;
        vaildationFailReason = "分类不能为空！";
      } else if (
        field.get("v.fieldName") === "Doctor_Division1__c" &&
        $A.util.isEmpty(field.get("v.value"))
      ) {
            }else if(field.get("v.fieldName") === 'Doctor_Division1__c' && $A.util.isEmpty(field.get("v.value"))){
        showValidationError = true;
        if (vaildationFailReason != "") {
                if(vaildationFailReason != ''){
          vaildationFailReason += "医生区分(职务)不能为空！";
        } else {
          vaildationFailReason = "医生区分(职务)不能为空！";
        }
                
      }
      // PIPL update Yin Mingjie 21/02/2022 start
      if (field.get("v.fieldName") === "Name") {
        agencyReport["name"] = field.get("v.value");
      } else if (field.get("v.fieldName") === "Type__c") {
        agencyReport["type"] = field.get("v.value");
      } else if (field.get("v.fieldName") === "Doctor_Division1__c") {
        agencyReport["doctorDivision1"] = field.get("v.value");
            if(field.get("v.fieldName") === 'Name'){
                agencyReport['name'] = field.get("v.value");
            }else if(field.get("v.fieldName") === 'Type__c'){
                agencyReport['type'] = field.get("v.value");
            }else if(field.get("v.fieldName") === 'Doctor_Division1__c'){
                agencyReport['doctorDivision1'] = field.get("v.value");
      }
      // PIPL update Yin Mingjie 21/02/2022 end
    });
@@ -106,65 +103,52 @@
            component.find('recordEditForm').submit(eventFields);
            */

      var agencyHospitalid = component.get("v.hospitalLinkId");
            var agencyHospitalid = component.get('v.hospitalLinkId');
      //zhj MEBG新方案改造 2022-11-29 start
      debugger;
      let hospitalName = "";
            debugger
            let hospitalName = '';
      //调用后端searchAgencyDataId方法查询出医院下面所有客户人员dataid
      helper.CallBackAction(
        component,
        "searchAgencyDataId",
        {
            helper.CallBackAction(component,'searchAgencyDataId',{
          hospitalId: agencyHospitalid
        },
        function (data) {
            },function(data){
          if (data.getState() == "SUCCESS") {
            var data = data.getReturnValue();
            if (data.IsSuccess == true) {
              let agencyContactIds = "";
              if (data.Message == "" && data.Data && data.Data.length > 0) {
                        let agencyContactIds = ''
                        if(data.Message == '' && data.Data && data.Data.length > 0){
                hospitalName = data.Data[0].Agency_Hospital__r.Name;
                for (var i = 0; i < data.Data.length; i++) {
                  if (data.Data[i].AWS_Data_Id__c)
                    agencyContactIds += "," + data.Data[i].AWS_Data_Id__c;
                                    agencyContactIds += ','+data.Data[i].AWS_Data_Id__c;
                }
                agencyContactIds = agencyContactIds.substring(1);
                agencyReport["agencyContactIds"] = agencyContactIds;
                            agencyReport['agencyContactIds'] = agencyContactIds;
              } else {
                agencyReport["agencyContactIds"] = agencyContactIds;
                            agencyReport['agencyContactIds'] = agencyContactIds;
              }
              var arr = new Array();
              arr.push(agencyReport);
              var requestData = JSON.stringify(arr);
              // helper.set_aws_url(component,data,agencyHospitalid);

              var token = component.get("v.AWStoken");
              var newUrl = component.get("v.AWSinsert") + "V2";
                        var token = component.get('v.AWStoken');
                        var newUrl = component.get('v.AWSinsert') + 'V2';

              component.set("v.login", true);
              helper.insert_agencycontact(
                component,
                token,
                newUrl,
                requestData,
                agencyHospitalid,
                helper,
                hospitalName
              );
                        component.set('v.login',true);
                        helper.insert_agencycontact(component,token,newUrl,requestData,agencyHospitalid,helper,hospitalName);
            } else {
              helper.ShowToast({
                message: data.message,
                type: "error"
                            "message" : data.message,
                            "type" : "error"
              });
            }
          } else {
            helper.ShowToast({
              message: "searchAgency失败",
              type: "error"
                        "message" : 'searchAgency失败',
                        "type" : "error"
            });
          }
        }
      );
            })
      //zhj MEBG新方案改造 2022-11-29 end
      // var arr = new Array();
      // arr.push(agencyReport);
@@ -179,7 +163,7 @@

      // PIPL update Yin Mingjie 21/02/2022 end
    } else {
      component.find("OppMessage").setError(vaildationFailReason);
            component.find('OppMessage').setError(vaildationFailReason);
    }
    // var eventFields = event.getParam("fields");
    // eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
@@ -192,21 +176,13 @@
  },

  yes_button: function (component, event, helper) {
    component.set("v.confirm_status", 1);
    helper.close_confirm(
      component,
      component.get("v.modal_confirm_title"),
      component.get("v.modal_confirm_text")
    );
        component.set('v.confirm_status', 1);
        helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
  },

  no_button: function (component, event, helper) {
    component.set("v.confirm_status", 2);
    helper.close_confirm(
      component,
      component.get("v.modal_confirm_title"),
      component.get("v.modal_confirm_text")
    );
        component.set('v.confirm_status', 2);
        helper.close_confirm(component, component.get('v.modal_confirm_title'), component.get('v.modal_confirm_text'));
  },

  toggle_report: function (component, event, helper) {
@@ -273,7 +249,7 @@
  onDrop: function (component, event, helper) {
    event.stopPropagation();
    event.preventDefault();
    event.dataTransfer.dropEffect = "copy";
        event.dataTransfer.dropEffect='copy';
    var files = event.dataTransfer.files;
    helper.readFile(component, helper, files[0]);
  },
@@ -282,10 +258,12 @@
    // var fileInput = component.find("file").getElement();
    // var file = fileInput.files[0];
    helper.readFile(component, helper, files[0]);
        component.set("v.showErrorInfo", false);
  },

  processFileContent: function (component, event, helper) {
    helper.saveRecords(component, event, helper);
        component.set("v.showErrorInfo", false);
  },

  cancel: function (component, event, helper) {
@@ -299,22 +277,20 @@
  },
  exportDate: function (component, event, helper) {
    var stockData = component.get("v.reports_date");
    console.log("导出数据" + stockData);
        console.log('导出数据'+stockData); 
    var csv = helper.convertArrayOfObjectsToCSV(component, stockData);
    if (csv == null) {
      return;
    }
        if (csv == null){return;} 

    // ####--code for create a temp. <a> html tag [link tag] for download the CSV file--####
    var universalBOM = "\uFEFF";
    var hiddenElement = document.createElement("a");
    hiddenElement.href =
      "data:text/csv;charset=utf-8," + encodeURI(universalBOM + csv);
    hiddenElement.target = "_self"; //
    hiddenElement.download = "ExportData.csv"; // CSV file Name* you can change it.[only name not .csv]
        var hiddenElement = document.createElement('a');
        hiddenElement.href = 'data:text/csv;charset=utf-8,' + encodeURI(universalBOM+csv);
        hiddenElement.target = '_self'; // 
        hiddenElement.download = 'ExportData.csv';  // CSV file Name* you can change it.[only name not .csv] 
    document.body.appendChild(hiddenElement); // Required for FireFox browser
    hiddenElement.click(); // using click() js function to download csv file
    // helper.showExport(component);
        
  },

  export_condition: function (component, event, helper) {
@@ -329,9 +305,9 @@
    // this.export(component,event,helper);
  },
  export: function (component, event, helper) {
    console.log("进入export");
        console.log('进入export');
    var stockData = component.get("v.reports_date");
    console.log("查出的数据" + stockData);
        console.log('查出的数据'+stockData);
    // helper.showExportDate(component,stockData);
    // helper.showExport(component);
  },
@@ -342,5 +318,8 @@
  close_export: function (component, event, helper) {
    component.set("v.showMain", true);
    helper.close_export(component);
  }
});
    },
    exportErrorInfo: function(component,event,helper){
        helper.exportErrorInfoHelper(component);
    },
})

 force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js

@@ -1,71 +1,39 @@
({
  doinit: function (component, event, helper) {
    this.report_date_list(component, event, helper, 5);
    component.set("v.login", true);
    var action = component.get("c.getalldata");
        component.set('v.login',true);
        var action = component.get('c.getalldata');
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var res = response.getReturnValue();
        component.set("v.alldata", res.reports);
        component.set("v.fieldsmap", res.fieldsMap);
        component.set("v.allselectlist", res.allselectlist);
        component.set("v.doclist", res.doclist);
                component.set('v.alldata',res.reports);
                component.set('v.fieldsmap',res.fieldsMap);
                component.set('v.allselectlist',res.allselectlist);
                component.set('v.doclist',res.doclist);
        // PIPL update Yin Mingjie 21/02/2022 start
        component
          .find("select_agency_person")
          .set(
            "v.options",
            this.conv_selected(res.allselectlist.AgencyPerson__c)
          );
                component.find('select_agency_person').set('v.options', this.conv_selected(res.allselectlist.AgencyPerson__c));
        // this.search_contact(component, event, helper,res.allselectlist.AgencyPerson__c);
        // PIPL update Yin Mingjie 21/02/2022 end
        component
          .find("select_department")
          .set(
            "v.options",
            this.conv_selected(res.allselectlist.Department_Cateogy__c)
          );
        component
          .find("select_purpose_type")
          .set(
            "v.options",
            this.conv_selected(res.allselectlist.Purpose_Type__c)
          );
        component
          .find("select_result")
          .set("v.options", this.conv_selected(res.allselectlist.Result__c));
        component
          .find("select_stageName")
          .set("v.options", this.conv_selected(res.allselectlist.StageName__c));
                component.find('select_department').set('v.options', this.conv_selected(res.allselectlist.Department_Cateogy__c));
                component.find('select_purpose_type').set('v.options', this.conv_selected(res.allselectlist.Purpose_Type__c));
                component.find('select_result').set('v.options', this.conv_selected(res.allselectlist.Result__c));
                component.find('select_stageName').set('v.options', this.conv_selected(res.allselectlist.StageName__c));
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
        component
          .find("SupportNeeds__c")
          .set(
            "v.options",
            this.conv_selected(res.allselectlist.SupportNeeds__c)
          );
                 component.find('SupportNeeds__c').set('v.options', this.conv_selected(res.allselectlist.SupportNeeds__c));
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
        component.set(
          "v.selected_agency_person",
          res.allselectlist.AgencyPerson__c[0].label
        );
        component.set("v.dialog_type", "新建");
        component.set("v.awsurl", res.awsurl); // 20220222 PI改造 by Bright
        component.set("v.contactawsurl", res.contactawsurl); // 20220222 PI改造 by Bright
                component.set('v.selected_agency_person', res.allselectlist.AgencyPerson__c[0].label);
                component.set('v.dialog_type', '新建');
                component.set('v.awsurl', res.awsurl);// 20220222 PI改造 by Bright
                component.set('v.contactawsurl', res.contactawsurl);// 20220222 PI改造 by Bright

        this.get_reports(
          component,
          event,
          helper,
          component.find("select_date").get("v.value"),
          component.find("select_agency_person").get("v.value")
        );
                this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));

        component.set("v.login", false);
      } else {
        this.error("doinit failed.");
        component.set("v.login", false);
                component.set('v.login',false);
            }
            else{
                this.error('doinit failed.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
@@ -76,35 +44,30 @@
    let contactData = Object.create(null);
    var dataArr = new Array();
    for (let i = 0; i < resobj.length; i++) {
      if (resobj[i].awsid != null && resobj[i].awsid != "") {
            if (resobj[i].awsid != null && resobj[i].awsid != ''){
        contactData[resobj[i].awsid] = resobj[i];
        dataArr.push(resobj[i].awsid);
      }
    }
    let obj = Object.create(null);
    obj["dataIds"] = dataArr;
        obj['dataIds'] = dataArr;
    var payload = JSON.stringify(obj);
    this.search_contact_url(component, "Contact", (result) => {
        this.search_contact_url(component, 'Contact', (result)=>{
      var token = result.token;
      var searchUrl = result.searchUrl;
      this.search_core(
        token,
        searchUrl,
        payload,
        (result) => {
          if (result.status == "0") {
            this.search_core(token,searchUrl,payload,(result)=>{
                if(result.status == '0'){
            if (result.object != null) {
              this.to_contact_list(result, contactData, component);
            } else {
              component.set("v.login", false);
                        component.set('v.login',false);
            }
          } else {
            this.error("AWS search status1 : " + result.status);
            component.set("v.login", false);
                    this.error('AWS search status1 : ' + result.status);
                    component.set('v.login',false);
          }
        },
        component
      );
            },component);
            
    });
  },

@@ -112,37 +75,38 @@
    var resls = result.object;
    var res = [];
    var space = {};
    space["label"] = "";
    space["selected"] = true;
    space["value"] = "";
        space['label'] = '';
        space['selected'] = true;
        space['value'] = '';
    res.push(space);

    for (var i = 0; i < resls.length; i++) {
      var t = {};
      t["label"] = resls[i].lastName;
      t["selected"] = false;
      t["Doctor_Division1__c"] = resls[i].doctorDivision1;
      t["value"] = retMap[resls[i].dataId].value;
            t['label'] = resls[i].lastName;
            t['selected'] = false;
            t['Doctor_Division1__c'] = resls[i].doctorDivision1;
            t['value'] = retMap[resls[i].dataId].value;
      res.push(t);
    }
    component.find("select_agency_person").set("v.options", res);
    component.set("v.allselectlistAgencyPerson", res);
    component.set("v.login", false);
        component.find('select_agency_person').set('v.options',res);
        component.set('v.allselectlistAgencyPerson',res);
        component.set('v.login',false);
  },

  search_contact_url: function (component, sobject, callback) {
    var action = component.get("c.getAwsurl");
        var action = component.get('c.getAwsurl');
    action.setParams({
      sobj: sobject
            "sobj" : sobject,
    });
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var result = response.getReturnValue();
        if (callback) callback(result);
      } else {
        this.error("AWS url/token error.");
        component.set("v.login", false);
            }
            else{
                this.error('AWS url/token error.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
@@ -151,45 +115,42 @@

  select_department: function (component, event, helper) {
    var dc = component.find("select_department").get("v.value");
    dc = dc ? "%" + dc + "%" : "";
        dc = dc ? '%'+dc+'%' : '';
    var purpose_type = component.find("select_purpose_type").get("v.value");
    if (purpose_type) {
      if (purpose_type.substr(-3) == "OPD") {
        purpose_type = "OPD";
      } else if (purpose_type.substr(-3) == "SIS") {
        purpose_type = "SIS";
            if (purpose_type.substr(-3) == 'OPD') {
                purpose_type = 'OPD';
            } else if (purpose_type.substr(-3) == 'SIS') {
                purpose_type = 'SIS';
      } else {
        purpose_type = "";
                purpose_type = '';
      }
    }
    if (dc != "" || purpose_type != "") {
      var action = component.get("c.getProductList");
        if (dc != '' || purpose_type != '') {

            var action = component.get('c.getProductList');
      action.setParams({
        dc: dc,
        opdsis: purpose_type
                "dc" : dc,
                "opdsis" : purpose_type,
      });
      action.setCallback(this, function (response) {
        var state = response.getState();
        if (state == "SUCCESS") {
                if(state == 'SUCCESS'){

          var res = response.getReturnValue();
          component
            .find("select_Product1")
            .set("v.options", JSON.parse(JSON.stringify(res)));
          component
            .find("select_Product2")
            .set("v.options", JSON.parse(JSON.stringify(res)));
          component
            .find("select_Product3")
            .set("v.options", JSON.parse(JSON.stringify(res)));
        } else {
          this.error("getProductList failed.");
                    component.find('select_Product1').set("v.options", JSON.parse(JSON.stringify(res)));
                    component.find('select_Product2').set("v.options", JSON.parse(JSON.stringify(res)));
                    component.find('select_Product3').set("v.options", JSON.parse(JSON.stringify(res)));
                }
                else{
                    this.error('getProductList failed.');
        }
      });
      $A.enqueueAction(action);
    } else {
      component.find("select_Product1").set("v.options", []);
      component.find("select_Product2").set("v.options", []);
      component.find("select_Product3").set("v.options", []);
            component.find('select_Product1').set('v.options', []);
            component.find('select_Product2').set('v.options', []);
            component.find('select_Product3').set('v.options', []);
    }
  },

@@ -200,18 +161,18 @@

    date_str = this.get_date_string(date_str);

    var action = component.get("c.getReports");
        var action = component.get('c.getReports');
    action.setParams({
      date_str: date_str,
      person_str: person_str
            "date_str" : date_str,
            "person_str" : person_str,
    });

    component.set("v.login", true);
        component.set('v.login',true);
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var res = response.getReturnValue();
        component.set("v.reports", res.reports);
                component.set('v.reports', res.reports);

        // 20220222 PI改造 by Bright--start
        let dataIds = [];
@@ -224,10 +185,7 @@
            dataIds.push(rep.doctor2__r.AWS_Data_Id__c);
          }

          if (
            rep.Person_In_Charge2__r &&
            rep.Person_In_Charge2__r.AWS_Data_Id__c
          ) {
                    if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c) {
            dataIds1.push(rep.Person_In_Charge2__r.AWS_Data_Id__c);
          }
        }
@@ -235,40 +193,28 @@
        Foo = function () {
          if (b && b1) {
            for (const rep of res.reports) {
              if (
                rep.doctor2__r &&
                rep.doctor2__r.AWS_Data_Id__c &&
                mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)
              ) {
                            if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.doctor2__r.AWS_Data_Id__c)) {
                rep.doctor2__r.awsdata = mm[rep.doctor2__r.AWS_Data_Id__c];
              }
              if (
                rep.Person_In_Charge2__r &&
                rep.Person_In_Charge2__r.AWS_Data_Id__c &&
                mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)
              ) {
                rep.Person_In_Charge2__r.awsdata =
                  mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
                            if (rep.Person_In_Charge2__r && rep.Person_In_Charge2__r.AWS_Data_Id__c && mm.hasOwnProperty(rep.Person_In_Charge2__r.AWS_Data_Id__c)) {
                                rep.Person_In_Charge2__r.awsdata = mm[rep.Person_In_Charge2__r.AWS_Data_Id__c];
              }
            }

            $A.getCallback(() => component.set("v.reports", res.reports))();
                        $A.getCallback(()=>component.set('v.reports', res.reports))();
          } else {
            console.log("b=" + b + ",b1=" + b1 + ",continue");
                        console.log('b='+b + ',b1='+b1+',continue');
            setTimeout(Foo, 100);
          }
        };
                }

        if (dataIds.length > 0) {
          let awsurl = component.get("v.awsurl");
          helper.search_core(
            awsurl.token,
            awsurl.searchUrl,
            JSON.stringify({
              dataIds: dataIds
            }),
            (result) => {
              if (result.status == "0") {
                    let awsurl = component.get('v.awsurl');
                    helper.search_core(awsurl.token,awsurl.searchUrl,JSON.stringify({
                        "dataIds":dataIds
                    }),(result)=>{
                        if(result.status == '0'){
                            
                for (const m of result.object) {
                  mm[m.dataId] = m;
                }
@@ -276,108 +222,92 @@
                Foo();
              } else {
                //this.error('AWS search status2 : ' + result.status);
                this.success("请重新刷新页面进行解密");
                            this.success('请重新刷新页面进行解密');
              }
            },
            component
          );
                    },component);
        } else {
          b = true;
        }

                
                
        if (dataIds1.length > 0) {
          let contactawsurl = component.get("v.contactawsurl");
          helper.search_core(
            contactawsurl.token,
            contactawsurl.searchUrl,
            JSON.stringify({
              dataIds: dataIds1
            }),
            (result) => {
              if (result.status == "0") {
                    let contactawsurl = component.get('v.contactawsurl');
                    helper.search_core(contactawsurl.token,contactawsurl.searchUrl,JSON.stringify({
                        "dataIds":dataIds1
                    }),(result)=>{
                        if(result.status == '0'){
                            
                for (const m of result.object) {
                  mm[m.dataId] = m;
                }
                b1 = true;
                Foo();
              } else {
                this.error("AWS search status3 : " + result.status);
                            this.error('AWS search status3 : ' + result.status);
              }
            },
            component
          );
                    },component);
        } else {
          b1 = true;
        }
        // 20220222 PI改造 by Bright--end

        component.set("v.report_count", res.reports.length);
                component.set('v.report_count', res.reports.length);

        // æ›´æ–°ä¿å­˜å¾Œã®select_data用
        var report_id = component.get("v.update_select_report_data_id");
                var report_id = component.get('v.update_select_report_data_id');

        if (report_id != "") {
          for (i = 0; i < res.reports.length; i++) {
            if (res.reports[i]["Id"] == report_id) {
              component.set("v.select_report_data", res.reports[i]);
                        if (res.reports[i]['Id'] == report_id) {
                            component.set('v.select_report_data', res.reports[i]);
              break;
            }
          }
          component.set("v.update_select_report_data_id", "");
                    component.set('v.update_select_report_data_id', '');
        }

        if (res.reports.length > 0) {
          component.set("v.list_message", "");
                    component.set('v.list_message', '');
        } else {
          component.set("v.list_message", "no_data");
                    component.set('v.list_message', 'no_data');
        }
        component.set("v.login", false);
      } else {
        this.error("get_reports failed.");
        component.set("v.login", false);
                component.set('v.login',false);
            }
            else{
                this.error('get_reports failed.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
  },

  select_date_change: function (component, event, helper) {
    this.get_reports(
      component,
      event,
      helper,
      component.find("select_date").get("v.value"),
      component.find("select_agency_person").get("v.value")
    );
        this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));
    this.new_button_disabled(component, event, helper);

    component.set("v.select_report_data_radio", "");
    component.find("copy_button").set("v.disabled", true);
        component.set('v.select_report_data_radio', '');
        component.find('copy_button').set('v.disabled', true);
  },

  select_agency_change: function (component, event, helper) {
    var select_value = component.find("select_agency_person").get("v.value");
        var select_value = component.find('select_agency_person').get('v.value');
    var new_label = this.get_agency_person_name(component, select_value);
    component.set("v.selected_agency_person", new_label);
        component.set('v.selected_agency_person', new_label);

    this.get_reports(
      component,
      event,
      helper,
      component.find("select_date").get("v.value"),
      select_value
    );
        this.get_reports(component, event, helper, component.find('select_date').get('v.value'), select_value);
    this.new_button_disabled(component, event, helper);

    component.set("v.select_report_data_radio", "");
    component.find("copy_button").set("v.disabled", true);
        component.set('v.select_report_data_radio', '');
        component.find('copy_button').set('v.disabled', true);
  },

  get_agency_person_name: function (component, agency_person_value) {
    // PIPL update Yin Mingjie 21/02/2022 start
    var allselectlist = component.get("v.allselectlist.AgencyPerson__c");
        var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
    // var allselectlist = component.get('v.allselectlistAgencyPerson');
    // PIPL update Yin Mingjie 21/02/2022 end
    var new_label = "";
        var new_label = '';
    for (var i = 0; i < allselectlist.length; i++) {
      if (agency_person_value == allselectlist[i].value) {
        new_label = allselectlist[i].label;
@@ -388,104 +318,80 @@
  },

  new_button_disabled: function (component, event, helper) {
    var select_date = component.find("select_date").get("v.value");
    var select_agency = component.find("select_agency_person").get("v.value");
        var select_date = component.find('select_date').get('v.value');
        var select_agency = component.find('select_agency_person').get('v.value');
    if (select_date && select_agency) {
      component.find("new_button").set("v.disabled", false);
            component.find('new_button').set('v.disabled', false);
    } else {
      component.find("new_button").set("v.disabled", true);
            component.find('new_button').set('v.disabled', true);
    }
  },

  toggle_report: function (component) {
    var modal_window = component.find("modal_window");
    var modal_bg = component.find("modal_bg");
    if ($A.util.hasClass(modal_window, "disp_none")) {
        var modal_window = component.find('modal_window');
        var modal_bg = component.find('modal_bg');
        if ($A.util.hasClass(modal_window, 'disp_none')) {
      // OPEN
      $A.util.removeClass(modal_window, "disp_none");
      $A.util.removeClass(modal_bg, "disp_none");
            $A.util.removeClass(modal_window, 'disp_none');
            $A.util.removeClass(modal_bg, 'disp_none');

      if (
        component.get("v.mode") == "edit" ||
        component.get("v.mode") == "copy"
      ) {
        var select_data = "";
        if (component.get("v.mode") == "edit") {
          select_data = component.get("v.select_report_data");
        } else if (component.get("v.mode") == "copy") {
          select_data = component.get("v.select_report_data_radio");
            if (component.get('v.mode') == 'edit' || component.get('v.mode') == 'copy') {
                var select_data = '';
                if (component.get('v.mode') == 'edit') {
                    select_data = component.get('v.select_report_data');
                } else if (component.get('v.mode') == 'copy') {
                    select_data = component.get('v.select_report_data_radio');
        }

        var reports = component.get("v.reports");
        var Agency_Hospital_text = "";
        var Agency_Hospital_parent_id = "";
        debugger;
                var reports = component.get('v.reports');
                var Agency_Hospital_text = '';
                var Agency_Hospital_parent_id = '';
                debugger
        // åŒ»é™¢å
        if (select_data["Agency_Hospital__c"] != "") {
                if (select_data['Agency_Hospital__c'] != '') {
          for (var i = 0; i < reports.length; i++) {
            if (
              reports[i]["Agency_Hospital__c"] ==
              select_data["Agency_Hospital__c"]
            ) {
              Agency_Hospital_text = reports[i]["Agency_Hospital__r"]["Name"];
              Agency_Hospital_parent_id =
                reports[i]["Agency_Hospital__r"]["Hospital__c"];
                        if (reports[i]['Agency_Hospital__c'] == select_data['Agency_Hospital__c']) {
                            Agency_Hospital_text = reports[i]['Agency_Hospital__r']['Name'];
                            Agency_Hospital_parent_id = reports[i]['Agency_Hospital__r']['Hospital__c'];
            }
          }
          component.set("v.hospital", Agency_Hospital_text);
          component.set("v.hospitalId", Agency_Hospital_parent_id);
          component.set("v.hospitalLinkId", select_data["Agency_Hospital__c"]);
          component.find("new_con").set("v.disabled", false);
                    component.set('v.hospital', Agency_Hospital_text);
                    component.set('v.hospitalId', Agency_Hospital_parent_id);
                    component.set('v.hospitalLinkId', select_data['Agency_Hospital__c']);
                    component.find('new_con').set('v.disabled', false);
        }

        // ç§‘室
        if (select_data["Department_Cateogy__c"] != "") {
          this.set_selected(
            component,
            "select_department",
            select_data["Department_Cateogy__c"]
          );
                if (select_data['Department_Cateogy__c'] != '') {
                    this.set_selected(component, 'select_department', select_data['Department_Cateogy__c']);
        }
        // æ‹œè®¿äºº
        component.set("v.default_select_doctor_id", select_data["doctor2__c"]);
                component.set('v.default_select_doctor_id', select_data['doctor2__c']);
        this.set_doctor_list(component);

        // æ´»åŠ¨åŒºåˆ†
        if (select_data["Purpose_Type__c"] != "") {
          this.set_selected(
            component,
            "select_purpose_type",
            select_data["Purpose_Type__c"]
          );
                if (select_data['Purpose_Type__c'] != '') {
                    this.set_selected(component, 'select_purpose_type', select_data['Purpose_Type__c']);
          this.select_purpose_type(component);
        }
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
        // æ”¯æ´éœ€æ±‚
        if (select_data["SupportNeeds__c"] != "") {
          this.set_selected(
            component,
            "SupportNeeds__c",
            select_data["SupportNeeds__c"]
          );
                if (select_data['SupportNeeds__c'] != '') {
                    this.set_selected(component, 'SupportNeeds__c', select_data['SupportNeeds__c']);
        }
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
        // çµæžœ
        if (
          select_data["Result__c"] != "" &&
          typeof select_data["Result__c"] !== "undefined"
        ) {
          component
            .find("select_result")
            .set("v.value", select_data["Result__c"]);
                if (select_data['Result__c'] != '' && typeof select_data['Result__c'] !== "undefined") {
                    component.find('select_result').set('v.value', select_data['Result__c']);
        }

        // è¯¢ä»·
        var report_id = component.get("v.edit_copy_select_report_id");
                var report_id = component.get('v.edit_copy_select_report_id');
        if (report_id != "") {
          var select_opp = "";
          var select_product_category1 = "";
          var select_product_category2 = "";
          var select_product_category3 = "";
                    var select_opp = '';
                    var select_product_category1 = '';
                    var select_product_category2 = '';
                    var select_product_category3 = '';
          var reportDate;
          var i = 0;
          for (i = 0; i < reports.length; i++) {
@@ -500,115 +406,84 @@
          }

          // è¯¢ä»·
          if (select_opp != null && select_opp != "") {
            var select_opp_name = component.get("v.reports")[i].OppName__c;
            component.set("v.data.Opportunity__c", select_opp);
            if ($A.get("$Browser.formFactor") == "DESKTOP") {
              var values = [
                {
                  type: "Agency_Opportunity__c",
                    if (select_opp != null && select_opp != '') {
                        var select_opp_name = component.get('v.reports')[i].OppName__c;
                        component.set('v.data.Opportunity__c', select_opp);
                        if ($A.get("$Browser.formFactor") == 'DESKTOP') {
                            var values = [{
                                type: 'Agency_Opportunity__c',
                  id: select_opp,
                  label: select_opp_name,
                  icon: {
                    url: "/img/icon/t4v35/custom/custom12_120.png",
                    backgroundColor: "dc71d1",
                    alt: "Agency_Opportunity__c"
                                    url:'/img/icon/t4v35/custom/custom12_120.png',
                                    backgroundColor:'dc71d1',
                                    alt:'Agency_Opportunity__c'
                  }
                }
              ];
              component.set("v.data.Opportunity__c", select_opp);
                            }];
                            component.set('v.data.Opportunity__c', select_opp);
              // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
            } else {
              component
                .find("input-opportunity")
                .get("v.body")[0]
                .set("v.selectedLabel", select_opp_name);
                            component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', select_opp_name);
            }
          }

          // äº§å“åŒºåˆ†
          if (
            select_product_category1 != null &&
            select_product_category1 != ""
          ) {
            component
              .find("select_Product1")
              .set("v.value", select_product_category1);
                    if (select_product_category1 != null && select_product_category1 != '') {
                        component.find('select_Product1').set('v.value', select_product_category1);
          }
          if (
            select_product_category2 != null &&
            select_product_category2 != ""
          ) {
            component
              .find("select_Product2")
              .set("v.value", select_product_category2);
                    if (select_product_category2 != null && select_product_category2 != '') {
                        component.find('select_Product2').set('v.value', select_product_category2);
          }
          if (
            select_product_category3 != null &&
            select_product_category3 != ""
          ) {
            component
              .find("select_Product3")
              .set("v.value", select_product_category3);
                    if (select_product_category3 != null && select_product_category3 != '') {
                        component.find('select_Product3').set('v.value', select_product_category3);
          }

          if (reportDate != null) {
            component.set("v.data.Report_Date__c", reportDate);
                        component.set('v.data.Report_Date__c', reportDate);
          }

          component.set("v.edit_copy_select_report_id", "");
                    component.set('v.edit_copy_select_report_id', "");
        }
      }
    } else {
      // CLOSE

      var select_report_data = component.get("v.select_report_data");
      var Report_Date__c = component.get("v.data.Report_Date__c");
      var Agency_Hospital__c = component.get("v.hospitalLinkId");
      var Department_Cateogy__c = component
        .find("select_department")
        .get("v.value");
      var doctor2__c = component.find("select_doctor").get("v.value");
      var Purpose_Type__c = component
        .find("select_purpose_type")
        .get("v.value");
      var SupportNeeds__c = component.find("SupportNeeds__c").get("v.value");
      var Opportunity__c = component.get("v.data.Opportunity__c");
      var Product_Category1__c = component
        .find("select_Product1")
        .get("v.value");
      var Product_Category2__c = component
        .find("select_Product2")
        .get("v.value");
      var Product_Category3__c = component
        .find("select_Product3")
        .get("v.value");
      var Result__c = component.find("select_result").get("v.value");
            var select_report_data = component.get('v.select_report_data');
            var Report_Date__c = component.get('v.data.Report_Date__c');
            var Agency_Hospital__c = component.get('v.hospitalLinkId');
            var Department_Cateogy__c = component.find('select_department').get('v.value');
            var doctor2__c = component.find('select_doctor').get('v.value');
            var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
            var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
            var Opportunity__c = component.get('v.data.Opportunity__c');
            var Product_Category1__c = component.find('select_Product1').get('v.value');
            var Product_Category2__c = component.find('select_Product2').get('v.value');
            var Product_Category3__c = component.find('select_Product3').get('v.value');
            var Result__c = component.find('select_result').get('v.value');

      if (select_report_data !== null) {
        if (typeof select_report_data["Opportunity__c"] === "undefined") {
          select_report_data["Opportunity__c"] = "";
                if (typeof select_report_data['Opportunity__c'] === "undefined") {
                    select_report_data['Opportunity__c'] = "";
        }
        if (typeof select_report_data["Product_Category1__c"] === "undefined") {
          select_report_data["Product_Category1__c"] = "";
                if (typeof select_report_data['Product_Category1__c'] === "undefined") {
                    select_report_data['Product_Category1__c'] = "";
        }
        if (typeof select_report_data["Product_Category2__c"] === "undefined") {
          select_report_data["Product_Category2__c"] = "";
                if (typeof select_report_data['Product_Category2__c'] === "undefined") {
                    select_report_data['Product_Category2__c'] = "";
        }
        if (typeof select_report_data["Product_Category3__c"] === "undefined") {
          select_report_data["Product_Category3__c"] = "";
                if (typeof select_report_data['Product_Category3__c'] === "undefined") {
                    select_report_data['Product_Category3__c'] = "";
        }
        if (typeof select_report_data["Result__c"] === "undefined") {
          select_report_data["Result__c"] = "";
                if (typeof select_report_data['Result__c'] === "undefined") {
                    select_report_data['Result__c'] = "";
        }
      }

      if (component.get("v.mode") == "new") {
        var confirm_title = "警告!";
        var confirm_text = "放弃新建周报？";
            if (component.get('v.mode') == 'new') {
                var confirm_title = '警告!'
                var confirm_text = '放弃新建周报？';

        if (
          !Report_Date__c &&
                if (!Report_Date__c &&
          !Agency_Hospital__c &&
          !Department_Cateogy__c &&
          !doctor2__c &&
@@ -618,166 +493,144 @@
          !Product_Category1__c &&
          !Product_Category2__c &&
          !Product_Category3__c &&
          !Result__c
        ) {
                    !Result__c)
                {
          this.allclear(component);
          $A.util.addClass(modal_window, "disp_none");
          $A.util.addClass(modal_bg, "disp_none");
                    $A.util.addClass(modal_window, 'disp_none');
                    $A.util.addClass(modal_bg, 'disp_none');
        } else {
          this.close_confirm(component, confirm_title, confirm_text);
        }
      } else if (component.get("v.mode") == "copy") {
        var confirm_title = "警告!";
        var confirm_text = "放弃新建周报？";
            } else if (component.get('v.mode') == 'copy') {
                var confirm_title = '警告!'
                var confirm_text = '放弃新建周报？';

        if (
          select_report_data["Report_Date__c"] == Report_Date__c &&
          select_report_data["Agency_Hospital__c"] == Agency_Hospital__c &&
          select_report_data["Department_Cateogy__c"] ==
            Department_Cateogy__c &&
          select_report_data["doctor2__c"] == doctor2__c &&
          select_report_data["Purpose_Type__c"] == Purpose_Type__c &&
          select_report_data["SupportNeeds__c"] == SupportNeeds__c && //WAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加
          select_report_data["Opportunity__c"] == Opportunity__c &&
          select_report_data["Product_Category1__c"] == Product_Category1__c &&
          select_report_data["Product_Category2__c"] == Product_Category2__c &&
          select_report_data["Product_Category3__c"] == Product_Category3__c &&
          select_report_data["Result__c"] == Result__c
        ) {
                if (select_report_data['Report_Date__c'] == Report_Date__c &&
                    select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
                    select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
                    select_report_data['doctor2__c'] == doctor2__c &&
                    select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
                    select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加
                    select_report_data['Opportunity__c'] == Opportunity__c &&
                    select_report_data['Product_Category1__c'] == Product_Category1__c &&
                    select_report_data['Product_Category2__c'] == Product_Category2__c &&
                    select_report_data['Product_Category3__c'] == Product_Category3__c &&
                    select_report_data['Result__c'] == Result__c)
                {
          this.allclear(component);
          $A.util.addClass(modal_window, "disp_none");
          $A.util.addClass(modal_bg, "disp_none");
                    $A.util.addClass(modal_window, 'disp_none');
                    $A.util.addClass(modal_bg, 'disp_none');
        } else {
          this.close_confirm(component, confirm_title, confirm_text);
        }
      } else if (component.get("v.mode") == "edit") {
        var confirm_title = "警告!";
        var confirm_text = "放弃编辑周报？";
            } else if (component.get('v.mode') == 'edit') {
                var confirm_title = '警告!'
                var confirm_text = '放弃编辑周报？';

        if (
          select_report_data["Report_Date__c"] == Report_Date__c &&
          select_report_data["Agency_Hospital__c"] == Agency_Hospital__c &&
          select_report_data["Department_Cateogy__c"] ==
            Department_Cateogy__c &&
          select_report_data["doctor2__c"] == doctor2__c &&
          select_report_data["Purpose_Type__c"] == Purpose_Type__c &&
          select_report_data["SupportNeeds__c"] == SupportNeeds__c && //WAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加
          select_report_data["Opportunity__c"] == Opportunity__c &&
          select_report_data["Product_Category1__c"] == Product_Category1__c &&
          select_report_data["Product_Category2__c"] == Product_Category2__c &&
          select_report_data["Product_Category3__c"] == Product_Category3__c &&
          select_report_data["Result__c"] == Result__c
        ) {
                if (select_report_data['Report_Date__c'] == Report_Date__c &&
                    select_report_data['Agency_Hospital__c'] == Agency_Hospital__c &&
                    select_report_data['Department_Cateogy__c'] == Department_Cateogy__c &&
                    select_report_data['doctor2__c'] == doctor2__c &&
                    select_report_data['Purpose_Type__c'] == Purpose_Type__c &&
                    select_report_data['SupportNeeds__c'] == SupportNeeds__c &&//WAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加
                    select_report_data['Opportunity__c'] == Opportunity__c &&
                    select_report_data['Product_Category1__c'] == Product_Category1__c &&
                    select_report_data['Product_Category2__c'] == Product_Category2__c &&
                    select_report_data['Product_Category3__c'] == Product_Category3__c &&
                    select_report_data['Result__c'] == Result__c)
                {
          this.allclear(component);
          $A.util.addClass(modal_window, "disp_none");
          $A.util.addClass(modal_bg, "disp_none");
                    $A.util.addClass(modal_window, 'disp_none');
                    $A.util.addClass(modal_bg, 'disp_none');
        } else {
          this.close_confirm(component, confirm_title, confirm_text);
        }
      }

    }
  },

  close_confirm: function (component, title, text) {
    var confirm_status = component.get("v.confirm_status");
    component.set("v.modal_confirm_title", title);
    component.set("v.modal_confirm_text", text);
    var modal_window = component.find("modal_window");
    var modal_bg = component.find("modal_bg");
    var modal_confirm = component.find("modal_confirm");
    var modal_confirm_bg = component.find("modal_confirm_bg");
        var confirm_status = component.get('v.confirm_status');
        component.set('v.modal_confirm_title', title);
        component.set('v.modal_confirm_text', text);
        var modal_window = component.find('modal_window');
        var modal_bg = component.find('modal_bg');
        var modal_confirm = component.find('modal_confirm'); 
        var modal_confirm_bg = component.find('modal_confirm_bg'); 

    if (confirm_status == 0) {
      $A.util.addClass(modal_window, "disp_none");
      $A.util.addClass(modal_bg, "disp_none");
      $A.util.removeClass(modal_confirm, "disp_none");
      $A.util.removeClass(modal_confirm_bg, "disp_none");
            $A.util.addClass(modal_window, 'disp_none');
            $A.util.addClass(modal_bg, 'disp_none');
            $A.util.removeClass(modal_confirm, 'disp_none');
            $A.util.removeClass(modal_confirm_bg, 'disp_none');
    } else if (confirm_status == 1) {
      // æ˜¯
      $A.util.addClass(modal_confirm, "disp_none");
      $A.util.addClass(modal_confirm_bg, "disp_none");
      component.set("v.mode", "");
            $A.util.addClass(modal_confirm, 'disp_none');
            $A.util.addClass(modal_confirm_bg, 'disp_none');
            component.set('v.mode', '');
      this.allclear(component);
      component.set("v.reports_now", "");
      component.set("v.reports_now_count", 0);
      component.set("v.confirm_status", 0);
            component.set('v.reports_now', "");
            component.set('v.reports_now_count', 0);
            component.set('v.confirm_status', 0);
    } else if (confirm_status == 2) {
      // å¦
      $A.util.removeClass(modal_window, "disp_none");
      $A.util.removeClass(modal_bg, "disp_none");
      $A.util.addClass(modal_confirm, "disp_none");
      $A.util.addClass(modal_confirm_bg, "disp_none");
      component.set("v.confirm_status", 0);
            $A.util.removeClass(modal_window, 'disp_none');
            $A.util.removeClass(modal_bg, 'disp_none');
            $A.util.addClass(modal_confirm, 'disp_none');
            $A.util.addClass(modal_confirm_bg, 'disp_none');
            component.set('v.confirm_status', 0);
    }
  },

  new_report: function (component, event, helper) {
    component.set("v.mode", "new");
    component.set("v.dialog_type", "新建");
    var select_date = component.find("select_date").get("v.value");
    var select_agency = component.find("select_agency_person").get("v.value");
    component.set("v.selected_date", select_date);
    var name = component.get("v.selected_agency_person");
    var ret = this.create_report_header(
      component,
      name,
      select_agency,
      select_date
    );
        component.set('v.mode', 'new');
        component.set('v.dialog_type', '新建');
        var select_date = component.find('select_date').get('v.value');
        var select_agency = component.find('select_agency_person').get('v.value');
        component.set('v.selected_date', select_date);
        var name = component.get('v.selected_agency_person');
        var ret = this.create_report_header(component, name, select_agency, select_date);
    // PIPL update Yin Mingjie 21/02/2022 start
    this.set_aws_url(component, "Agency_Contact__c");
        this.set_aws_url(component,'Agency_Contact__c')
    // PIPL update Yin Mingjie 21/02/2022 end
  },

  copy_button: function (component, event, helper) {
    this.allclear(component);
    component.set("v.mode", "copy");
    component.set("v.dialog_type", "新建");
    var select_report_data = component.get("v.select_report_data_radio");
    component.set("v.loadOpp", true);
        component.set('v.mode', 'copy');
        component.set('v.dialog_type', '新建');
        var select_report_data = component.get('v.select_report_data_radio');
        component.set('v.loadOpp', true);
    // é€±
    var now = new Date();
    var start_day = new Date(
      now.getFullYear(),
      now.getMonth(),
      now.getDate() - now.getDay() + 1
    );
    var select_date =
      start_day.getFullYear() +
      "/" +
      (start_day.getMonth() + 1) +
      "/" +
      start_day.getDate();
    this.set_selected(component, "select_date", select_date);
    component.set("v.selected_date", select_date);
        var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1));
        var select_date = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate();
        this.set_selected(component, 'select_date', select_date);
        component.set('v.selected_date', select_date);

    // æ‹…当
    var select_agency = select_report_data["Person_In_Charge2__c"];
        var select_agency = select_report_data['Person_In_Charge2__c'];
    var new_label = this.get_agency_person_name(component, select_agency);
    component.set("v.selected_agency_person", new_label);
    this.set_selected(component, "select_agency_person", select_agency);
        component.set('v.selected_agency_person', new_label);
        this.set_selected(component, 'select_agency_person', select_agency);

    this.new_button_disabled(component, event, helper);

    var name = component.get("v.selected_agency_person");
        var name = component.get('v.selected_agency_person');

    component.set("v.edit_copy_select_report_id", select_report_data["Id"]);
    component.set("v.select_report_data", select_report_data);
        component.set('v.edit_copy_select_report_id', select_report_data['Id']);
        component.set('v.select_report_data', select_report_data);

    var ret = this.create_report_header(
      component,
      name,
      select_agency,
      select_date
    );
        var ret = this.create_report_header(component, name, select_agency, select_date);
  },

  change_report_radio: function (component, event, helper) {
    var reports = component.get("v.reports");
        var reports = component.get('v.reports');
    for (var i = 0; i < reports.length; i++) {
      if (reports[i].Name == event.getSource().get("v.label")) {
        component.set("v.select_report_data_radio", reports[i]);
        component.find("copy_button").set("v.disabled", false);
            if (reports[i].Name == event.getSource().get('v.label')) {
                component.set('v.select_report_data_radio', reports[i]);
                component.find('copy_button').set('v.disabled', false);
        break;
      }
    }
@@ -785,44 +638,36 @@

  edit_button: function (component, event, helper) {
    this.allclear(component);
    component.set("v.loadOpp", true);
    var index = event.getSource().get("v.value");
    component.set("v.select_report_data", component.get("v.reports")[index]);
    component.set("v.mode", "edit");
    component.set("v.dialog_type", "编辑");
        component.set('v.loadOpp', true);
        var index = event.getSource().get('v.value');
        component.set('v.select_report_data', component.get('v.reports')[index]);
        component.set('v.mode', 'edit');
        component.set('v.dialog_type', '编辑');

    var select_date = component.get("v.reports")[index].Submit_date__c;
    var select_agency = component.get("v.reports")[index].Person_In_Charge2__c;
    var text_tmp = select_date.split("-");
    var select_date_text =
      text_tmp[0] + "/" + Number(text_tmp[1]) + "/" + Number(text_tmp[2]);
    component.set("v.selected_date", select_date_text);
    var name = component.get("v.reports")[index].Person_In_Charge2__r.Name;
        var select_date = component.get('v.reports')[index].Submit_date__c;
        var select_agency = component.get('v.reports')[index].Person_In_Charge2__c;
        var text_tmp = select_date.split('-');
        var select_date_text = text_tmp[0] + '/' + Number(text_tmp[1]) + '/' + Number(text_tmp[2]);
        component.set('v.selected_date', select_date_text);
        var name = component.get('v.reports')[index].Person_In_Charge2__r.Name;

    this.set_selected(component, "select_agency_person", select_agency);
        this.set_selected(component, 'select_agency_person', select_agency);
    this.new_button_disabled(component, event, helper);

    var new_label = this.get_agency_person_name(component, select_agency);
    component.set("v.selected_agency_person", new_label);
        component.set('v.selected_agency_person', new_label);

    component.set(
      "v.edit_copy_select_report_id",
      component.get("v.reports")[index].Id
    );
        component.set('v.edit_copy_select_report_id', component.get('v.reports')[index].Id);

    var ret = this.create_report_header(
      component,
      name,
      select_agency,
      select_date
    );
        var ret = this.create_report_header(component, name, select_agency, select_date);
  },

  save_report: function (component, event, helper) {

    // 20220222 PI改造  by Bright--start
    let doctor2Name = "";
    let visitortitle = "";
    for (let op of component.find("select_doctor").get("v.options")) {
        let doctor2Name = '';
        let visitortitle = '';
        for(let op of component.find('select_doctor').get('v.options')){
      if (op.selected) {
        doctor2Name = op.label;
        visitortitle = op.Doctor_Division1__c;
@@ -830,227 +675,165 @@
    }
    // 20220222 PI改造  by Bright--end

    component.find("save_button").set("v.disabled", true);

    var Report_Date__c = component.get("v.data.Report_Date__c");
        component.find('save_button').set('v.disabled', true);

        var Report_Date__c = component.get('v.data.Report_Date__c');
    // alert('Report_Date__c'+Report_Date__c);
    var Person_In_Charge2__c = "";
    var Submit_date__c = "";
    if (component.get("v.mode") == "edit") {
        if (component.get('v.mode') == 'edit') {
      // å‘¨ Submit_date__c
      Submit_date__c = component.get("v.select_report_data").Submit_date__c;
            Submit_date__c = component.get('v.select_report_data').Submit_date__c;
      // alert('Submit_date__c'+Submit_date__c);


      // æ‹…当 Person_In_Charge2__c
      Person_In_Charge2__c = component.get(
        "v.select_report_data"
      ).Person_In_Charge2__c;
            Person_In_Charge2__c = component.get('v.select_report_data').Person_In_Charge2__c;            
    } else {
      // å‘¨ Submit_date__c
      Submit_date__c = this.get_date_string(
        component.find("select_date").get("v.value")
      );
            Submit_date__c = this.get_date_string(component.find('select_date').get('v.value'));
      // alert('Submit_date__c'+Submit_date__c);

      // æ‹…当 Person_In_Charge2__c
      Person_In_Charge2__c = component
        .find("select_agency_person")
        .get("v.value");
            Person_In_Charge2__c = component.find('select_agency_person').get('v.value');
    }
    // Agency_Report_Header__c
    var Agency_Report_Header__c = component.get("v.agency_report_header_id");
        var Agency_Report_Header__c = component.get('v.agency_report_header_id');

    // åŒ»é™¢ Agency_Hospital__c (Agency_Hospital_Link__c)
    var Agency_Hospital__c = component.get("v.hospitalLinkId");
        var Agency_Hospital__c = component.get('v.hospitalLinkId');

    // ç§‘室 Department_Cateogy__c
    var Department_Cateogy__c = component
      .find("select_department")
      .get("v.value");
        var Department_Cateogy__c = component.find('select_department').get('v.value');

    // æ‹œè®¿äºº doctor2__c
    var doctor2__c = component.find("select_doctor").get("v.value");
        var doctor2__c = component.find('select_doctor').get('v.value');

    // æ´»åŠ¨åŒºåˆ† Purpose_Type__c
    var Purpose_Type__c = component.find("select_purpose_type").get("v.value");
        var Purpose_Type__c = component.find('select_purpose_type').get('v.value');
    //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
    // æ”¯æ´éœ€æ±‚ SupportNeeds__c
    var SupportNeeds__c = component.find("SupportNeeds__c").get("v.value");
        var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
    //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
    // è¯¢ä»· Opportunity__c
    var Opportunity__c = component.get("v.data.Opportunity__c");
        var Opportunity__c = component.get('v.data.Opportunity__c');

    var StageName__c = component.find("select_stageName").get("v.value");
    var Amount__c =
      component.get("v.oppdata.Amount__c") != null
        ? component.get("v.oppdata.Amount__c").toString()
        : "";
    var OCMSale_Price__c =
      component.get("v.oppdata.OCMSale_Price__c") != null
        ? component.get("v.oppdata.OCMSale_Price__c").toString()
        : "";
    var Close_Forecasted_Date__c = component.get(
      "v.oppdata.Close_Forecasted_Date__c"
    );
        var StageName__c = component.find('select_stageName').get('v.value');
        var Amount__c = component.get('v.oppdata.Amount__c') != null ? component.get('v.oppdata.Amount__c').toString() : '';
        var OCMSale_Price__c = component.get('v.oppdata.OCMSale_Price__c') != null ? component.get('v.oppdata.OCMSale_Price__c').toString() : '';
        var Close_Forecasted_Date__c = component.get('v.oppdata.Close_Forecasted_Date__c');

    var StageName__c_o = component.get("v.StageName__c_o");
    var Amount__c_o = component.get("v.Amount__c_o");
    var OCMSale_Price__c_o = component.get("v.OCMSale_Price__c_o");
    var Close_Forecasted_Date__c_o = component.get(
      "v.Close_Forecasted_Date__c_o"
    );
    if (StageName__c_o == undefined) StageName__c_o = "";
    if (Amount__c_o == undefined) Amount__c_o = "";
    if (OCMSale_Price__c_o == undefined) OCMSale_Price__c_o = "";
    if (Close_Forecasted_Date__c_o == undefined)
      Close_Forecasted_Date__c_o = "";
    if (
      StageName__c == StageName__c_o &&
      OCMSale_Price__c_o == OCMSale_Price__c &&
      Amount__c == Amount__c_o &&
      Close_Forecasted_Date__c == Close_Forecasted_Date__c_o
    ) {
      StageName__c = "";
      Amount__c = "";
      OCMSale_Price__c = "";
      Close_Forecasted_Date__c = "";
        var StageName__c_o = component.get('v.StageName__c_o');
        var Amount__c_o = component.get('v.Amount__c_o');
        var OCMSale_Price__c_o = component.get('v.OCMSale_Price__c_o');
        var Close_Forecasted_Date__c_o = component.get('v.Close_Forecasted_Date__c_o');
        if (StageName__c_o == undefined) StageName__c_o = '';
        if (Amount__c_o == undefined) Amount__c_o = '';
        if (OCMSale_Price__c_o == undefined) OCMSale_Price__c_o = '';
        if (Close_Forecasted_Date__c_o == undefined) Close_Forecasted_Date__c_o = '';
        if (StageName__c == StageName__c_o && OCMSale_Price__c_o == OCMSale_Price__c && Amount__c == Amount__c_o && Close_Forecasted_Date__c == Close_Forecasted_Date__c_o) {
            StageName__c = '';
            Amount__c = '';
            OCMSale_Price__c = '';
            Close_Forecasted_Date__c = '';
    }

    // äº§å“åŒºåˆ† Product_Category__c (ProductTypes__c)
    var Product_Category1__c = component.find("select_Product1").get("v.value");
    var Product_Category2__c = component.find("select_Product2").get("v.value");
    var Product_Category3__c = component.find("select_Product3").get("v.value");
        var Product_Category1__c = component.find('select_Product1').get('v.value');
        var Product_Category2__c = component.find('select_Product2').get('v.value');
        var Product_Category3__c = component.find('select_Product3').get('v.value');

    // çµæžœ Result__c
    var Result__c = component.find("select_result").get("v.value");
        var Result__c = component.find('select_result').get('v.value');

    // ãƒãƒªãƒ‡ãƒ¼ã‚·ãƒ§ãƒ³
    var error = [];
    if (!Report_Date__c) {
      error.push("活动日 ä¸å­˜åœ¨");
    }
    if (!Submit_date__c) {
      error.push("周 ä¸å­˜åœ¨");
    }
        if (!Report_Date__c) { error.push("活动日 ä¸å­˜åœ¨"); }
        if (!Submit_date__c) { error.push("周 ä¸å­˜åœ¨"); }
    var rDate = new Date(Report_Date__c);
    var sDate = new Date(Submit_date__c);
    sDate.setDate(sDate.getDate() - 1);
    if (rDate < sDate) {
      error.push("活动日必须是本周！");
    }
        if (rDate < sDate) {error.push('活动日必须是本周！'); }
    sDate.setDate(sDate.getDate() + 7);
    if (rDate >= sDate) {
      error.push("活动日必须是本周！");
    }
        if (rDate >= sDate) {error.push('活动日必须是本周！'); }

    if (!Person_In_Charge2__c) {
      error.push("担当 ä¸å­˜åœ¨");
    }
    if (!Agency_Report_Header__c) {
      this.error("Report Header Id ä¸å­˜åœ¨");
    }
    if (!Agency_Hospital__c) {
      error.push("医院 ä¸å­˜åœ¨");
    }
    if (!Department_Cateogy__c) {
      error.push("科室 ä¸å­˜åœ¨");
    }
    if (!doctor2__c) {
      error.push("拜访人 ä¸å­˜åœ¨");
    }
    if (!Purpose_Type__c) {
      error.push("活动区分 ä¸å­˜åœ¨");
    }
        if (!Person_In_Charge2__c) { error.push("担当 ä¸å­˜åœ¨"); }
        if (!Agency_Report_Header__c) { this.error("Report Header Id ä¸å­˜åœ¨"); }
        if (!Agency_Hospital__c) { error.push("医院 ä¸å­˜åœ¨"); }
        if (!Department_Cateogy__c) { error.push("科室 ä¸å­˜åœ¨"); }
        if (!doctor2__c) { error.push("拜访人 ä¸å­˜åœ¨"); }
        if (!Purpose_Type__c) { error.push("活动区分 ä¸å­˜åœ¨"); }
    // if (!SupportNeeds__c) { error.push("支援需求 ä¸å­˜åœ¨"); }
    if (!Opportunity__c) {
      Opportunity__c = "";
    }
    if (!Product_Category1__c) {
      error.push("产品区分1 ä¸å­˜åœ¨");
    }
    if (
      Purpose_Type__c &&
      (Purpose_Type__c.substr(-3) == "SIS" ||
        Purpose_Type__c.substr(-3) == "OPD")
    ) {
      if (!Result__c) {
        error.push("结果 ä¸å­˜åœ¨");
      }
        if (!Opportunity__c) { Opportunity__c = ""; }
        if (!Product_Category1__c) { error.push("产品区分1 ä¸å­˜åœ¨"); }
        if (Purpose_Type__c && (Purpose_Type__c.substr(-3) == 'SIS' || Purpose_Type__c.substr(-3) == 'OPD')) {
            if (!Result__c) { error.push("结果 ä¸å­˜åœ¨"); }
    }
    for (var i = 0; i < error.length; i++) {
      this.warning(error[i]);
    }
    if (error.length > 0) {
      component.find("save_button").set("v.disabled", false);
            component.find('save_button').set('v.disabled', false);
      return false;
    }

        
    // ä¿å­˜å‡¦ç†
    component.set("v.login", true);
    if (component.get("v.mode") == "edit") {
      var Agency_Report__c = component.get("v.select_report_data").Id;
      var action = component.get("c.editAgencyReport");
      debugger;
        component.set('v.login',true);
        if (component.get('v.mode') == 'edit') {
            var Agency_Report__c = component.get('v.select_report_data').Id;
            var action = component.get('c.editAgencyReport');
            debugger
      // alert("Purpose_Type:"+Purpose_Type__c+","+"SupportNeedsc:"+SupportNeeds__c);
      action.setParams({
        Agency_Report_Id: Agency_Report__c,
        Department_Cateogy: Department_Cateogy__c,
        Purpose_Type: Purpose_Type__c,
                "Agency_Report_Id" : Agency_Report__c,
                "Department_Cateogy" : Department_Cateogy__c,
                "Purpose_Type" : Purpose_Type__c,
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
        SupportNeedsc: SupportNeeds__c,
                 "SupportNeedsc" : SupportNeeds__c,
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
        Agency_Report_Header: Agency_Report_Header__c,
        Agency_Hospital: Agency_Hospital__c,
        Person_In_Charge2: Person_In_Charge2__c,
        doctor: doctor2__c,
        Submit_date: Submit_date__c,
        Product_Category1: Product_Category1__c,
        Product_Category2: Product_Category2__c,
        Product_Category3: Product_Category3__c,
        Result: Result__c,
        Opportunity: Opportunity__c,
        StageName: StageName__c,
        oppAmount: Amount__c,
        oppOCMPrice: OCMSale_Price__c,
        Close_Forecasted_Date: Close_Forecasted_Date__c,
        Report_Date: Report_Date__c
                "Agency_Report_Header" : Agency_Report_Header__c,
                "Agency_Hospital" : Agency_Hospital__c,
                "Person_In_Charge2" : Person_In_Charge2__c,
                "doctor" : doctor2__c,
                "Submit_date" : Submit_date__c,
                "Product_Category1" : Product_Category1__c,
                "Product_Category2" : Product_Category2__c,
                "Product_Category3" : Product_Category3__c,
                "Result" : Result__c,
                "Opportunity" : Opportunity__c,
                "StageName" : StageName__c,
                "oppAmount" : Amount__c,
                "oppOCMPrice" : OCMSale_Price__c,
                "Close_Forecasted_Date" : Close_Forecasted_Date__c,
                "Report_Date" : Report_Date__c,
      });

      action.setCallback(this, function (response) {
        var state = response.getState();
        if (state == "SUCCESS") {
          this.success("编辑保存成功");
                if(state == 'SUCCESS'){
                    this.success('编辑保存成功');
          var report_id = response.getReturnValue();
          component.set("v.create_agency_report_id", report_id);
                    component.set('v.create_agency_report_id', report_id);

          var select_agency_list =
            component.get("v.allselectlist").AgencyPerson__c;
                    var select_agency_list = component.get('v.allselectlist').AgencyPerson__c;
          for (var i = 0; i < select_agency_list.length; i++) {
            if (
              select_agency_list[i].value ==
              component.get("v.select_report_data").Person_In_Charge2__c
            ) {
                        if (select_agency_list[i].value == component.get('v.select_report_data').Person_In_Charge2__c) {
              select_agency_list[i].selected = true;
            } else {
              select_agency_list[i].selected = false;
            }
          }
          component
            .find("select_agency_person")
            .set("v.options", select_agency_list);
                    component.find('select_agency_person').set('v.options', select_agency_list);

          component.set("v.update_select_report_data_id", report_id);
          this.get_reports(
            component,
            event,
            helper,
            component.get("v.select_report_data").Submit_date__c,
            component.get("v.select_report_data").Person_In_Charge2__c
          );
                    component.set('v.update_select_report_data_id', report_id);
                    this.get_reports(component, event, helper, component.get('v.select_report_data').Submit_date__c, component.get('v.select_report_data').Person_In_Charge2__c);

          component.find("save_button").set("v.disabled", false);
          component.set("v.login", false);
        } else {
                    component.find('save_button').set('v.disabled', false);
                    component.set('v.login',false);
                }
                else{
          // var error = response.getError();
          // alert(JSON.stringify(error));
          // alert(JSON.stringify(error[0].fieldErrors));
@@ -1060,66 +843,60 @@
          // else () {
          //     error[0].fieldErrors[0]
          // }
          this.error("save_report failed.");
          component.find("save_button").set("v.disabled", false);
          component.set("v.login", false);
                    this.error('save_report failed.');
                    component.find('save_button').set('v.disabled', false);
                    component.set('v.login',false);
        }
      });
      $A.enqueueAction(action);
    } else {
      /* Save (New & Copy) */

      var action = component.get("c.saveAgencyReport");
            var action = component.get('c.saveAgencyReport');
      debugger;
      // alert(SupportNeeds__c);
      action.setParams({
        Department_Cateogy: Department_Cateogy__c,
        Purpose_Type: Purpose_Type__c,
                "Department_Cateogy" : Department_Cateogy__c,
                "Purpose_Type" : Purpose_Type__c,
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
        SupportNeedsc: SupportNeeds__c,
                "SupportNeedsc" : SupportNeeds__c,
        //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
        Agency_Report_Header: Agency_Report_Header__c,
        Agency_Hospital: Agency_Hospital__c,
        Person_In_Charge2: Person_In_Charge2__c,
        doctor: doctor2__c,
        Submit_date: Submit_date__c,
        Product_Category1: Product_Category1__c,
        Product_Category2: Product_Category2__c,
        Product_Category3: Product_Category3__c,
        Result: Result__c,
        Opportunity: Opportunity__c,
        StageName: StageName__c,
        oppAmount: Amount__c,
        oppOCMPrice: OCMSale_Price__c,
        Close_Forecasted_Date: Close_Forecasted_Date__c,
        Report_Date: Report_Date__c
                "Agency_Report_Header" : Agency_Report_Header__c,
                "Agency_Hospital" : Agency_Hospital__c,
                "Person_In_Charge2" : Person_In_Charge2__c,
                "doctor" : doctor2__c,
                "Submit_date" : Submit_date__c,
                "Product_Category1" : Product_Category1__c,
                "Product_Category2" : Product_Category2__c,
                "Product_Category3" : Product_Category3__c,
                "Result" : Result__c,
                "Opportunity" : Opportunity__c,
                "StageName" : StageName__c,
                "oppAmount" : Amount__c,
                "oppOCMPrice" : OCMSale_Price__c,
                "Close_Forecasted_Date" : Close_Forecasted_Date__c,
                "Report_Date" : Report_Date__c,
      });

      action.setCallback(this, function (response) {
        var state = response.getState();
        if (state == "SUCCESS") {
          this.success("保存成功");
                if(state == 'SUCCESS'){
                    this.success('保存成功');
          var report_id = response.getReturnValue();
          component.set("v.create_agency_report_id", report_id);
                    component.set('v.create_agency_report_id', report_id);

          this.get_reports(
            component,
            event,
            helper,
            component.find("select_date").get("v.value"),
            component.find("select_agency_person").get("v.value")
          );
                    this.get_reports(component, event, helper, component.find('select_date').get('v.value'), component.find('select_agency_person').get('v.value'));

          // ãƒ¢ãƒ¼ãƒ€ãƒ«ã‚¦ã‚£ãƒ³ãƒ‰ã‚¦å†…の一覧用
          var action2 = component.get("c.getReportsById");
                    var action2 = component.get('c.getReportsById');
          action2.setParams({
            report_id: report_id
                        "report_id" : report_id,
          });
          action2.setCallback(this, function (response) {
            var state = response.getState();
            if (state == "SUCCESS") {
                        if(state == 'SUCCESS'){
              var res = response.getReturnValue();
              var reports_now = component.get("v.reports_now");
                            var reports_now = component.get('v.reports_now');
              var reports_now_count = 0;
              if (reports_now.length > 0 && reports_now != "") {
                reports_now_count = reports_now.length;
@@ -1139,27 +916,29 @@
                  return 0;
                });

                component.set("v.reports_now", reports_now);
                component.set("v.reports_now_count", reports_now.length);
                var data_list = component.find("modal_data_list_tr");
                                component.set('v.reports_now', reports_now);
                                component.set('v.reports_now_count', reports_now.length);
                                var data_list = component.find('modal_data_list_tr');
              }
            } else {
              this.error("get_reports_now failed.");
              component.find("save_button").set("v.disabled", false);
              component.set("v.login", false);
                        }
                        else{
                            this.error('get_reports_now failed.');
                            component.find('save_button').set('v.disabled', false);
                            component.set('v.login',false);
            }
          });
          $A.enqueueAction(action2);

          this.allclear(component);
          component.find("save_button").set("v.disabled", false);
          component.set("v.login", false);
        } else {
                    component.find('save_button').set('v.disabled', false);
                    component.set('v.login',false);
                }
                else{
          var error = response.getError();
          // alert(JSON.stringify(error));
          this.error("saveAgencyReport failed.");
          component.find("save_button").set("v.disabled", false);
          component.set("v.login", false);
                    this.error('saveAgencyReport failed.');
                    component.find('save_button').set('v.disabled', false);
                    component.set('v.login',false);
        }
      });
      $A.enqueueAction(action);
@@ -1167,55 +946,38 @@
  },

  allclear: function (component) {
    var clear = [{ label: "", value: "", selected: true }];
    component.set("v.hospital", "");
    component.set("v.hospitalId", "");
    component.set("v.hospitalLinkId", "");
    component.find("new_con").set("v.disabled", true);
    component.find("select_doctor").set("v.options", clear);
    component.set("v.doctor_title", "");
    component
      .find("select_department")
      .set(
        "v.options",
        this.conv_selected(
          component.get("v.allselectlist.Department_Cateogy__c")
        )
      );
    component
      .find("select_purpose_type")
      .set(
        "v.options",
        this.conv_selected(component.get("v.allselectlist.Purpose_Type__c"))
      );
        var clear = [{label:'', value:'', selected:true}];
        component.set('v.hospital', '');
        component.set('v.hospitalId', '');
        component.set('v.hospitalLinkId', '');
        component.find('new_con').set('v.disabled', true);
        component.find('select_doctor').set('v.options', clear);
        component.set('v.doctor_title', '');
        component.find('select_department').set('v.options', this.conv_selected(component.get('v.allselectlist.Department_Cateogy__c')));
        component.find('select_purpose_type').set('v.options', this.conv_selected(component.get('v.allselectlist.Purpose_Type__c')));
    //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
    component
      .find("SupportNeeds__c")
      .set(
        "v.options",
        this.conv_selected(component.get("v.allselectlist.SupportNeeds__c"))
      );
        component.find('SupportNeeds__c').set('v.options', this.conv_selected(component.get('v.allselectlist.SupportNeeds__c')));
    //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 end
    // ToDo需要测试手机上能运行不
    component.set("v.data.Opportunity__c", "");
    component.find("select_Product1").set("v.value", "");
    component.find("select_Product2").set("v.value", "");
    component.find("select_Product3").set("v.value", "");
    component.set("v.data.Report_Date__c", "");
    component.set("v.oppdata.Close_Forecasted_Date__c", "");
    component.set("v.oppdata.Amount__c", "");
    component.set("v.oppdata.OCMSale_Price__c", "");
    component.set("v.oppdata.StageName__c", "");
        component.set('v.data.Opportunity__c', '');
        component.find('select_Product1').set('v.value','');
        component.find('select_Product2').set('v.value','');
        component.find('select_Product3').set('v.value','');
        component.set('v.data.Report_Date__c', '');
        component.set('v.oppdata.Close_Forecasted_Date__c', '');
        component.set('v.oppdata.Amount__c', '');
        component.set('v.oppdata.OCMSale_Price__c', '');
        component.set('v.oppdata.StageName__c', '');
    // component.set('v.oppdata', '');
    component.set("v.Close_Forecasted_Date__c_o", "");
    component.set("v.Amount__c_o", "");
    component.set("v.OCMSale_Price__c_o", "");
    component.set("v.StageName__c_o", "");
    $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
    $A.util.addClass(component.find("input-opportunity-amount1"), "disp_none");
    $A.util.addClass(component.find("input-opportunity-amount2"), "disp_none");
    $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
    $A.util.removeClass(component.find("input-opportunity-blank"), "disp_none");
        component.set('v.Close_Forecasted_Date__c_o', '');
        component.set('v.Amount__c_o', '');
        component.set('v.OCMSale_Price__c_o', '');
        component.set('v.StageName__c_o', '');
        $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
        $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
        $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
        $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
        $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
    // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
    // var values = [];
    // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
@@ -1229,7 +991,7 @@
    //     component.find('input-product-category2').get("v.body")[0].set('v.values', values);
    // if (component.find('input-product-category3'))
    //     component.find('input-product-category3').get("v.body")[0].set('v.values', values);
    component.find("select_result").set("v.value", "");
        component.find('select_result').set('v.value', '');
    this.select_purpose_type(component);
  },

@@ -1237,135 +999,78 @@
    var ret_obj = [];
    var now = new Date();
    for (var i = 0; i < count; i++) {
      var start_day = new Date(
        now.getFullYear(),
        now.getMonth(),
        now.getDate() - now.getDay() + 1 - i * 7
      );
      var end_day = new Date(
        now.getFullYear(),
        now.getMonth(),
        now.getDate() + (7 - now.getDay()) - i * 7
      );

      var start_day_show = new Date(
        now.getFullYear(),
        now.getMonth(),
        now.getDate() - now.getDay() - i * 7
      );
      var end_day_show = new Date(
        now.getFullYear(),
        now.getMonth(),
        now.getDate() + (6 - now.getDay()) - i * 7
      );
      var date_text =
        start_day.getFullYear() +
        "/" +
        (start_day.getMonth() + 1) +
        "/" +
        start_day.getDate() +
        "~" +
        end_day.getFullYear() +
        "/" +
        (end_day.getMonth() + 1) +
        "/" +
        end_day.getDate();
            var start_day = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() + 1 - (i * 7)));
            var end_day = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (7 - now.getDay()) - (i * 7));

            var start_day_show = new Date(now.getFullYear(), now.getMonth(), (now.getDate() - now.getDay() - (i * 7)));
            var end_day_show = new Date(now.getFullYear(), now.getMonth(), now.getDate() + (6 - now.getDay()) - (i * 7));
            var date_text = start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate() + '~' + end_day.getFullYear() + '/' + (end_day.getMonth() + 1) + '/' + end_day.getDate();
      if (i == 0) {
        ret_obj.push({
          selected: true,
          value:
            start_day.getFullYear() +
            "/" +
            (start_day.getMonth() + 1) +
            "/" +
            start_day.getDate(),
          label:
            start_day_show.getFullYear() +
            "/" +
            (start_day_show.getMonth() + 1) +
            "/" +
            start_day_show.getDate() +
            "~" +
            end_day_show.getFullYear() +
            "/" +
            (end_day_show.getMonth() + 1) +
            "/" +
            end_day_show.getDate()
                    value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
                    label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
        });
      } else {
        ret_obj.push({
          selected: false,
          value:
            start_day.getFullYear() +
            "/" +
            (start_day.getMonth() + 1) +
            "/" +
            start_day.getDate(),
          label:
            start_day_show.getFullYear() +
            "/" +
            (start_day_show.getMonth() + 1) +
            "/" +
            start_day_show.getDate() +
            "~" +
            end_day_show.getFullYear() +
            "/" +
            (end_day_show.getMonth() + 1) +
            "/" +
            end_day_show.getDate()
                    value : start_day.getFullYear() + '/' + (start_day.getMonth() + 1) + '/' + start_day.getDate(),
                    label : start_day_show.getFullYear() + '/' + (start_day_show.getMonth() + 1) + '/' + start_day_show.getDate() + '~' + end_day_show.getFullYear() + '/' + (end_day_show.getMonth() + 1) + '/' + end_day_show.getDate(),
        });
      }
    }

    component.find("select_date").set("v.options", ret_obj);
    component.set("v.report_date_list", ret_obj);
        component.find('select_date').set('v.options', ret_obj);
        component.set('v.report_date_list', ret_obj);
  },

  create_report_header: function (component, name, s_agency, s_date) {
    s_date = this.get_date_string(s_date);
    if (s_date == false) {
      this.error("get_date_string failed.");
            this.error('get_date_string failed.');
      return false;
    }

    var head_key = this.create_header_input_key(s_agency, s_date);
    component.set("v.agency_report_header", head_key);
        component.set('v.agency_report_header', head_key);
    if (head_key == false) {
      this.error("create_header_input_key failed.");
            this.error('create_header_input_key failed.');
      return false;
    }

    var key2 = s_date.replace(/-/g, "");
    var action = component.get("c.createReportHeader");
        var key2 = s_date.replace(/-/g, '');
        var action = component.get('c.createReportHeader');

    action.setParams({
      name: name,
      s_date: s_date,
      s_agency: s_agency,
      head_key: head_key
            "name" : name,
            "s_date" : s_date,
            "s_agency" : s_agency,
            "head_key" : head_key,
    });

    component.set("v.login", true);
        component.set('v.login',true);
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var res = response.getReturnValue();
        component.set("v.agency_report_header_id", res);
        component.set("v.login", false);
                component.set('v.agency_report_header_id', res);
                component.set('v.login',false);
        this.toggle_report(component);
      } else {
        this.error("createReportHeader callback failed.");
        component.set("v.login", false);
            }
            else{
                this.error('createReportHeader callback failed.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
  },

  create_header_input_key: function (agency_id, s_date) {
    if (typeof s_date != "string") {
        if (typeof(s_date) != 'string') {
      s_date = this.get_date_string(s_date);
      if (s_date == false) {
        this.error("get_date_string in create_header_input_key.");
                this.error('get_date_string in create_header_input_key.')
        return false;
      }
    }
@@ -1373,7 +1078,7 @@
      return false;
    }

    s_date = s_date.replace(/-/g, "");
        s_date = s_date.replace(/-/g, '');
    var headkey = agency_id + ":" + s_date;

    return headkey;
@@ -1389,36 +1094,36 @@

  // create yyyy-mm-dd string
  get_date_string: function (val) {
    if (typeof val == "string") {
        if (typeof(val) == 'string') {
      if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
        val = val.replace(/[\/]/g, "-");
        var tmp = val.split("-");
                val = val.replace(/[\/]/g, '-');
                var tmp = val.split('-');
        if (tmp[1].length == 1) {
          tmp[1] = "0" + tmp[1];
                    tmp[1] = '0' + tmp[1];
        }
        if (tmp[2].length == 1) {
          tmp[2] = "0" + tmp[2];
                    tmp[2] = '0' + tmp[2];
        }
        val = tmp[0] + "-" + tmp[1] + "-" + tmp[2];
                val = tmp[0] + '-' + tmp[1] + '-' + tmp[2];
      } else if (val.match(/^\d{4}-\d{1,2}-\d{1,2}$/)) {
        //ok
      } else {
        return false;
      }
    } else if (this.object_type(val) == "Date") {
        } else if (this.object_type(val) == 'Date') {
      var mm = val.getMonth() + 1;
      if (String(mm).length == 1) {
        mm = "0" + mm;
                mm = '0' + mm;
      }

      var dd = "";
            var dd = '';
      if (String(val.getDate()).length == 1) {
        dd = "0" + val.getDate();
                dd = '0' + val.getDate();
      } else {
        dd = val.getDate();
      }

      val = val.getFullYear() + "-" + mm + "-" + dd;
            val = val.getFullYear() + '-' + mm + '-' + dd;
    } else {
      return false;
    }
@@ -1430,43 +1135,43 @@
    var hospital_name = event.getParam("value");
    var action = component.get("c.getHospitalList");
    debugger;
    action.setParams({ hospital_name: hospital_name });
        action.setParams({"hospital_name": hospital_name});

    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state === "SUCCESS") {
        var hospital_list = component.find("hospital_list");
                var hospital_list = component.find('hospital_list');
        var hosList = response.getReturnValue();
        if (hosList.length > 0) {
          $A.util.addClass(hospital_list, "slds-is-open");
                    $A.util.addClass(hospital_list, 'slds-is-open');
        } else {
          $A.util.removeClass(hospital_list, "slds-is-open");
                    $A.util.removeClass(hospital_list, 'slds-is-open');
        }
        component.set("v.hospitalList", response.getReturnValue());
      } else {
        $A.util.removeClass(hospital_list, "slds-is-open");
                $A.util.removeClass(hospital_list, 'slds-is-open');
      }
    });
    $A.enqueueAction(action);
  },

  hideSearch: function (component, event, helper) {
    var hospital_list = component.find("hospital_list");
    $A.util.removeClass(hospital_list, "slds-is-open");
        var hospital_list = component.find('hospital_list');
        $A.util.removeClass(hospital_list, 'slds-is-open');
  },

  selectHos: function (component, event, helper) {
    debugger;
    var hospital_list = component.find("hospital_list");
    $A.util.removeClass(hospital_list, "slds-is-open");
        debugger
        var hospital_list = component.find('hospital_list');
        $A.util.removeClass(hospital_list, 'slds-is-open');
    var accname = event.currentTarget.dataset.accname;
    var accid = event.currentTarget.dataset.accid;
    var hospital_data = component.get("v.hospitalList");
        var hospital_data = component.get('v.hospitalList');
    for (var i = 0; i < hospital_data.length; i++) {
      if (hospital_data[i].Hospital__c == accid) {
        component.set("v.hospitalLinkId", hospital_data[i].Id);
        component.set("v.data.Agency_Hospital__c", hospital_data[i].Id);
        component.find("new_con").set("v.disabled", false);
                component.set('v.hospitalLinkId', hospital_data[i].Id);
                component.set('v.data.Agency_Hospital__c', hospital_data[i].Id);
                component.find('new_con').set('v.disabled', false);
      }
    }
    component.set("v.hospital", accname);
@@ -1476,69 +1181,58 @@
  },

  select_purpose_type: function (component) {
    var purpose_type = component.find("select_purpose_type").get("v.value");
    if (
      (purpose_type != null &&
        purpose_type != undefined &&
        purpose_type.substr(-3) == "OPD") ||
      purpose_type.substr(-3) == "SIS"
    ) {
      var result = component.find("result");
      $A.util.removeClass(result, "disp_none");
        var purpose_type = component.find('select_purpose_type').get('v.value');
        if (purpose_type != null && purpose_type != undefined && purpose_type.substr(-3) == 'OPD' || purpose_type.substr(-3) == 'SIS') {
            var result = component.find('result');
            $A.util.removeClass(result, 'disp_none');
    } else {
      component.find("select_result").set("v.value", "");
      var result = component.find("result");
      $A.util.addClass(result, "disp_none");
            component.find('select_result').set('v.value', '');
            var result = component.find('result');
            $A.util.addClass(result, 'disp_none');
    }
    this.select_department(component, null, null);
  },

  doctor_change: function (component, event, helper) {
    var doctor_value = component.find("select_doctor").get("v.value");
    var doctor_list = component.get("v.doctor_list");
        var doctor_value = component.find('select_doctor').get('v.value');
        var doctor_list = component.get('v.doctor_list');
    var flg = false;
    for (var i = 0; i < doctor_list.length; i++) {
      if (doctor_list[i].value == doctor_value) {
        component.set("v.doctor_title", doctor_list[i].Doctor_Division1__c);
                component.set('v.doctor_title', doctor_list[i].Doctor_Division1__c);
        flg = true;
        break;
      }
    }
    if (flg == false) {
      component.set("v.doctor_title", "");
            component.set('v.doctor_title', '');
    }
  },
  // PIPL update Yin Mingjie 21/02/2022 start
  set_aws_url: function (component, sobject) {
    var action = component.get("c.getAwsurl");
        var action = component.get('c.getAwsurl');
    action.setParams({
      sobj: sobject
            "sobj" : sobject,
    });
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var awsmap = this.conv_selected(response.getReturnValue());
        component.set("v.AWStoken", awsmap.token);
        component.set("v.AWSinsert", awsmap.newUrl);
        component.set("v.AWSsearch", awsmap.searchUrl);
        component.set("v.AWStransactionURL", awsmap.transactionURL);
      } else {
        this.error("AWS url/token error.");
        component.set("v.login", false);
                component.set('v.AWStoken',awsmap.token);
                component.set('v.AWSinsert',awsmap.newUrl);
                component.set('v.AWSsearch',awsmap.searchUrl);
                component.set('v.AWStransactionURL',awsmap.transactionURL);
            }
            else{
                this.error('AWS url/token error.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
  },

  insert_agencycontact: function (
    component,
    token,
    newUrl,
    payload,
    agencyHospitalid,
    helper,
    hospitalName
  ) {
    insert_agencycontact : function(component,token,newUrl,payload,agencyHospitalid,helper,hospitalName) {

    // AWSService.insert(newUrl,payload,function(result){
    //     if(result.status == '0'){
    //         $A.getCallback(function(){
@@ -1553,80 +1247,75 @@
    // },token);

    fetch(newUrl, {
      method: "POST",
            method: 'POST',
      body: payload,
      headers: {
        "Content-Type": "application/json",
        "pi-token": token
                'Content-Type': 'application/json',
                'pi-token': token
      }
    })
      .then((data) => {
        }).then((data) => {
        return data.json();
      })
      .then((result) => {
        if (result.status == "0") {
        }).then((result) => {
            if(result.status == '0'){
          $A.getCallback(function () {
            helper.to_agencycontact(component, result, agencyHospitalid);
          })();
        } else {
          console.log("AWS status error:" + result);
          component.set("v.login", false);
          if (result.status == "129") {
            component
              .find("OppMessage")
              .setError(
                "该客户人员名字已存在，在" + hospitalName + "医院，请修改"
              );
                console.log('AWS status error:' + result)
                component.set('v.login',false);
                if(result.status == '129'){
                    component.find('OppMessage').setError('该客户人员名字已存在，在'+hospitalName+'医院，请修改');
          } else {
            component.find("OppMessage").setError("AWS insert error.");
                    component.find('OppMessage').setError('AWS insert error.');
          }
        }
      })
      .catch((error) => {
        console.log("AWS insert error:" + error);
        component.set("v.login", false);
        component.find("OppMessage").setError("AWS insert error.");
        }).catch(error => {
            console.log('AWS insert error:' + error)
            component.set('v.login',false);
            component.find('OppMessage').setError('AWS insert error.');
      });
        
  },

  to_agencycontact: function (component, result, agencyHospitalid) {
    var action = component.get("c.saveAgencyContact");
        var action = component.get('c.saveAgencyContact');
    action.setParams({
      name: result.object[0].name,
            "name" : result.object[0].name,
      //"nameEncrypt" : result.object[0].nameEncrypt,
      type: result.object[0].type,
            "type" : result.object[0].type,
      //"typeEncrypt" : result.object[0].typeEncrypt,
      doctorDivision1: result.object[0].doctorDivision1,
            "doctorDivision1" : result.object[0].doctorDivision1,
      //"doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
      agencyHospitalid: agencyHospitalid,
      awsid: result.object[0].dataId
            "agencyHospitalid" : agencyHospitalid,
            "awsid" : result.object[0].dataId,
    });
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state == "SUCCESS") {
            if(state == 'SUCCESS'){
        var acMap = this.conv_selected(response.getReturnValue());
        console.log(acMap);
        if (acMap.AgencyContactId != "") {
                if(acMap.AgencyContactId != ''){
          //确认事务
          var token = component.get("v.AWStoken");
          var confirmUrl = component.get("v.AWStransactionURL");
                    var token = component.get('v.AWStoken');
                    var confirmUrl = component.get('v.AWStransactionURL');

          let data = Object.create(null);
          data["isSuccess"] = 1;
          data["sfRecordId"] = "";
          data["txId"] = result.txId;
                    data['isSuccess'] = 1;
                    data['sfRecordId'] = '';
                    data['txId'] = result.txId;

          this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
        } else if (acMap.errormsg != "") {
                }else if(acMap.errormsg != ''){
          this.error(acMap.errormsg);
          component.set("v.login", false);
                    component.set('v.login',false);
        } else {
          this.error("agency contact insert id error.");
          component.set("v.login", false);
                    this.error('agency contact insert id error.');
                    component.set('v.login',false);
        }
      } else {
        this.error("agency contact insert error.");
        component.set("v.login", false);
            }
            else{
                this.error('agency contact insert error.');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);
@@ -1634,50 +1323,43 @@

  to_confirm: function (component, token, confirmUrl, payload) {
    fetch(confirmUrl, {
      method: "POST",
            method: 'POST',
      body: payload,
      headers: {
        "Content-Type": "application/json",
        "pi-token": token
                'Content-Type': 'application/json',
                'pi-token': token
      }
    })
      .then((data) => {
        }).then((data) => {
        return data.json();
      })
      .then((result) => {
        if (
          result.status == "0" &&
          result.hasOwnProperty("success") &&
          result.success
        ) {
          component.set("v.truthy", false);
          var modal_newAC = component.find("modal_newAC");
          $A.util.addClass(modal_newAC, "disp_none");
          this.success(".客户人员已创建。");
        }).then((result) => {
            if(result.status == '0' && result.hasOwnProperty('success') && result.success){
                component.set('v.truthy', false);
                var modal_newAC = component.find('modal_newAC')
                $A.util.addClass(modal_newAC, 'disp_none');
                this.success('.客户人员已创建。');
          this.set_doctor_list(component);
        } else {
          this.error("AWS confirm error.");
          component.set("v.login", false);
                this.error('AWS confirm error.');
                component.set('v.login',false);
        }
      })
      .catch((error) => {
        this.error("AWS confirm error.");
        component.set("v.login", false);
        }).catch(error => {
            this.error('AWS confirm error.');
            component.set('v.login',false);
      });
  },
  // PIPL update Yin Mingjie 21/02/2022 end

  set_doctor_list: function (component) {
    var hospital_id = component.get("v.hospitalLinkId");
        var hospital_id = component.get('v.hospitalLinkId');
    if (hospital_id) {
      component.set("v.login", true);
      var action = component.get("c.getDoctorList");
            component.set('v.login',true);
            var action = component.get('c.getDoctorList');
      action.setParams({
        hospital_id: hospital_id
                "hospital_id" : hospital_id,
      });
      action.setCallback(this, function (response) {
        var state = response.getState();
        if (state == "SUCCESS") {
                if(state == 'SUCCESS'){
          var retMap = this.conv_selected(response.getReturnValue());
          // PIPL update Yin Mingjie 21/02/2022 start
          this.AWS_search(retMap, component);
@@ -1708,9 +1390,10 @@
                    component.set('v.login',false);
                    */
          // PIPL update Yin Mingjie 21/02/2022 end
        } else {
          this.error("set_doctor_list failed.");
          component.set("v.login", false);
                }
                else{
                    this.error('set_doctor_list failed.');
                    component.set('v.login',false);
        }
      });
      $A.enqueueAction(action);
@@ -1724,43 +1407,29 @@

    var dataArr = new Array();
    for (const key in retMap) {
      if (key == "sre") {
        continue;
      }
            if (key == 'sre') {continue;}
      dataArr.push(key);
    }
    if (dataArr.length == 0) {
      component.set("v.login", false);
      this.warning("没有找到符合条件的客户人员");
            component.set('v.login',false);
            this.warning('没有找到符合条件的客户人员');
      return;
    }
    let obj = Object.create(null);
    obj["dataIds"] = dataArr;
        obj['dataIds'] = dataArr;
    var data = JSON.stringify(obj);
    this.search_agency_contact(token, searchUrl, data, retMap, component);
  },

  search_agency_contact: function (
    token,
    searchUrl,
    payload,
    retMap,
    component
  ) {
    this.search_core(
      token,
      searchUrl,
      payload,
      (result) => {
        if (result.status == "0") {
    search_agency_contact : function(token,searchUrl,payload,retMap,component) {
        this.search_core(token,searchUrl,payload,(result)=>{
            if(result.status == '0'){
          this.to_doctor_list(result, retMap, component);
        } else {
          this.error("AWS search status4 : " + result.status);
          component.set("v.login", false);
                this.error('AWS search status4 : ' + result.status);
                component.set('v.login',false);
        }
      },
      component
    );
        },component);
    // fetch(searchUrl, {
    //     method: 'POST',
    //     body: payload,
@@ -1778,28 +1447,25 @@
    // });
  },
  search_core: function (token, searchUrl, payload, callback, component) {
    console.log("token = " + token);
    console.log("searchUrl = " + searchUrl);
    console.log("payload = " + payload);
        console.log('token = ' + token);
        console.log('searchUrl = ' + searchUrl);
        console.log('payload = ' + payload);
    fetch(searchUrl, {
      method: "POST",
            method: 'POST',
      body: payload,
      headers: {
        "Content-Type": "application/json",
        "pi-token": token
                'Content-Type': 'application/json',
                'pi-token': token
      }
    })
      .then((data) => {
        }).then((data) => {
        return data.json();
      })
      .then((result) => {
        component.set("v.login", false);
        }).then((result) => {
            component.set('v.login',false);
        if (callback) callback(result);
      })
      .catch((error) => {
        console.log("error = " + JSON.stringify(error));
        this.error("AWS search error.");
        component.set("v.login", false);
        }).catch(error => {
            console.log('error = ' + JSON.stringify(error));
            this.error('AWS search error.');
            component.set('v.login',false);
      });
  },

@@ -1807,23 +1473,23 @@
    var resls = result.object;
    var res = [];
    var space = {};
    space["label"] = "";
    space["selected"] = true;
    space["value"] = "";
        space['label'] = '';
        space['selected'] = true;
        space['value'] = '';
    res.push(space);

    for (var i = 0; i < resls.length; i++) {
      var t = {};
      t["label"] = resls[i].name;
      t["selected"] = false;
      t["Doctor_Division1__c"] = resls[i].doctorDivision1;
      t["value"] = retMap[resls[i].dataId].value;
            t['label'] = resls[i].name;
            t['selected'] = false;
            t['Doctor_Division1__c'] = resls[i].doctorDivision1;
            t['value'] = retMap[resls[i].dataId].value;
      res.push(t);
    }

    var default_doctor = component.get("v.default_select_doctor_id");
    if (default_doctor != "" && res.length > 0) {
      var doctor_title = "";
        var default_doctor = component.get('v.default_select_doctor_id');
        if (default_doctor != '' && res.length > 0) {
            var doctor_title = '';
      for (var i = 0; i < res.length; i++) {
        if (res[i].value == default_doctor) {
          res[i].selected = true;
@@ -1833,18 +1499,18 @@
        }
      }

      component.find("select_doctor").set("v.options", res);
      component.set("v.doctor_title", doctor_title);
            component.find('select_doctor').set('v.options', res);
            component.set('v.doctor_title', doctor_title);
    } else {
      component.find("select_doctor").set("v.options", res);
            component.find('select_doctor').set('v.options', res);
      if (res.length > 0) {
        component.set("v.doctor_title", res[0].Doctor_Division1__c);
                component.set('v.doctor_title', res[0].Doctor_Division1__c);
      }
    }

    component.set("v.default_select_doctor_id", "");
    component.set("v.doctor_list", res);
    component.set("v.login", false);
        component.set('v.default_select_doctor_id', '');
        component.set('v.doctor_list', res);
        component.set('v.login',false);
  },
  // PIPL update Yin Mingjie 21/02/2022 end

@@ -1861,62 +1527,32 @@
  // },

  opportunityChange: function (component, event, helper) {
    debugger;
    var opp_id = component.get("v.data.Opportunity__c");
    if (opp_id == "") {
      $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
      $A.util.addClass(
        component.find("input-opportunity-amount1"),
        "disp_none"
      );
      $A.util.addClass(
        component.find("input-opportunity-amount2"),
        "disp_none"
      );
      $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
      $A.util.removeClass(
        component.find("input-opportunity-blank"),
        "disp_none"
      );
    } else if (opp_id == "MALFORMED_ID") {
      component.set("v.data.Opportunity__c", "");
      $A.util.addClass(component.find("input-opportunity-stage"), "disp_none");
      $A.util.addClass(
        component.find("input-opportunity-amount1"),
        "disp_none"
      );
      $A.util.addClass(
        component.find("input-opportunity-amount2"),
        "disp_none"
      );
      $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
      $A.util.removeClass(
        component.find("input-opportunity-blank"),
        "disp_none"
      );
        debugger
        var opp_id = component.get('v.data.Opportunity__c');
        if (opp_id == '') {
            $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
            $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
        } else if (opp_id == 'MALFORMED_ID') {
            component.set('v.data.Opportunity__c', '');
            $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
            $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
            $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
    } else if (opp_id != "") {
      var hospital_link_id = component.get("v.hospitalLinkId");
      if (hospital_link_id == "") {
        this.warning("医院不存在");
            var hospital_link_id = component.get('v.hospitalLinkId');
            if (hospital_link_id == '') {
                this.warning('医院不存在');
        // ToDo需要测试手机上能运行不
        component.set("v.data.Opportunity__c", "");
        $A.util.addClass(
          component.find("input-opportunity-stage"),
          "disp_none"
        );
        $A.util.addClass(
          component.find("input-opportunity-amount1"),
          "disp_none"
        );
        $A.util.addClass(
          component.find("input-opportunity-amount2"),
          "disp_none"
        );
        $A.util.addClass(component.find("input-opportunity-date"), "disp_none");
        $A.util.removeClass(
          component.find("input-opportunity-blank"),
          "disp_none"
        );
                component.set('v.data.Opportunity__c', '');
                $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
                $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
                $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
                $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
                $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
        // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
        //     var values = [];
        //     // component.find('input-opportunity').get("v.body")[0].set('v.values', values);
@@ -1925,50 +1561,35 @@
        // }
        return false;
      }
      var action = component.get("c.selectOpportunityByIdAndHospitalLinkId");
            var action = component.get('c.selectOpportunityByIdAndHospitalLinkId');
      action.setParams({
        opportunity_id: opp_id,
        agency_hospital_link_id: component.get("v.hospitalLinkId")
                "opportunity_id" : opp_id,
                "agency_hospital_link_id" : component.get('v.hospitalLinkId'),
      });

      component.set("v.login", true);
            component.set('v.login',true);
      action.setCallback(this, function (response) {
        var state = response.getState();
        if (state == "SUCCESS") {
                if(state == 'SUCCESS'){
          var res = response.getReturnValue();
          if (res.length <= 0) {
            if (component.get("v.data.Opportunity__c")) {
              this.warning("医院未匹配到");
                        if (component.get('v.data.Opportunity__c')) {
                            this.warning('医院未匹配到');
            }
            // ToDo需要测试手机上能运行不
            component.set("v.data.Opportunity__c", "");
            $A.util.addClass(
              component.find("input-opportunity-stage"),
              "disp_none"
            );
            $A.util.addClass(
              component.find("input-opportunity-amount1"),
              "disp_none"
            );
            $A.util.addClass(
              component.find("input-opportunity-amount2"),
              "disp_none"
            );
            $A.util.addClass(
              component.find("input-opportunity-date"),
              "disp_none"
            );
            $A.util.removeClass(
              component.find("input-opportunity-blank"),
              "disp_none"
            );
                        component.set('v.data.Opportunity__c', '');
                        $A.util.addClass(component.find('input-opportunity-stage'), 'disp_none');
                        $A.util.addClass(component.find('input-opportunity-amount1'), 'disp_none');
                        $A.util.addClass(component.find('input-opportunity-amount2'), 'disp_none');
                        $A.util.addClass(component.find('input-opportunity-date'), 'disp_none');
                        $A.util.removeClass(component.find('input-opportunity-blank'), 'disp_none');
            // if ($A.get("$Browser.formFactor") == 'DESKTOP') {
            //     var values = [];
            //     component.find('input-opportunity').get("v.body")[0].set('v.values', values);
            // } else {
            //     component.find('input-opportunity').get("v.body")[0].set('v.selectedLabel', '');
            // }
            component.set("v.login", false);
                        component.set('v.login',false);
            return false;
          }
          //SWAG-CKH5M8  ã€å§”托】周报关联询价，可选择询价范围调整 fy start
@@ -1992,47 +1613,26 @@
          // }
          //SWAG-CKH5M8  ã€å§”托】周报关联询价，可选择询价范围调整 fy end
          else {
            component.set("v.loadOpp", false);
            component.set("v.oppdata", res[0]);
            this.set_selected(
              component,
              "select_stageName",
              res[0].StageName__c
            );
            component.set(
              "v.Close_Forecasted_Date__c_o",
              res[0].Close_Forecasted_Date__c
            );
            component.set("v.Amount__c_o", res[0].Amount__c);
            component.set("v.OCMSale_Price__c_o", res[0].OCMSale_Price__c);
            component.set("v.StageName__c_o", res[0].StageName__c);
                        component.set('v.loadOpp', false);
                        component.set('v.oppdata',res[0]);
                        this.set_selected(component, 'select_stageName', res[0].StageName__c);
                        component.set('v.Close_Forecasted_Date__c_o', res[0].Close_Forecasted_Date__c);
                        component.set('v.Amount__c_o', res[0].Amount__c);
                        component.set('v.OCMSale_Price__c_o', res[0].OCMSale_Price__c);
                        component.set('v.StageName__c_o', res[0].StageName__c);

            $A.util.removeClass(
              component.find("input-opportunity-stage"),
              "disp_none"
            );
            $A.util.removeClass(
              component.find("input-opportunity-amount1"),
              "disp_none"
            );
            $A.util.removeClass(
              component.find("input-opportunity-amount2"),
              "disp_none"
            );
            $A.util.removeClass(
              component.find("input-opportunity-date"),
              "disp_none"
            );
            $A.util.addClass(
              component.find("input-opportunity-blank"),
              "disp_none"
            );
                        $A.util.removeClass(component.find('input-opportunity-stage'), 'disp_none');
                        $A.util.removeClass(component.find('input-opportunity-amount1'), 'disp_none');
                        $A.util.removeClass(component.find('input-opportunity-amount2'), 'disp_none');
                        $A.util.removeClass(component.find('input-opportunity-date'), 'disp_none');
                        $A.util.addClass(component.find('input-opportunity-blank'), 'disp_none');
          }

          component.set("v.login", false);
        } else {
          this.error("selectOpportunityByIdAndHospitalLinkId failed.");
          component.set("v.login", false);
                    component.set('v.login',false);
                }
                else{
                    this.error('selectOpportunityByIdAndHospitalLinkId failed.');
                    component.set('v.login',false);
        }
      });
      $A.enqueueAction(action);
@@ -2040,64 +1640,46 @@
  },

  productcategoryChange1: function (component, event, helper) {
    var product_category_id = component.find("select_Product1").get("v.value");
    var pcId1 = component.find("select_Product2").get("v.value");
    var pcId2 = component.find("select_Product3").get("v.value");
    var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
    var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
    var p0bool =
      product_category_id != "" &&
      product_category_id != null &&
      product_category_id != undefined;
    if (
      (p1bool && p0bool && product_category_id == pcId1) ||
      (p2bool && p0bool && product_category_id == pcId2)
    ) {
      this.warning("不能选择同样的产品区分");
      component.find("select_Product1").set("v.value", "");
        var product_category_id = component.find('select_Product1').get('v.value');
        var pcId1 = component.find('select_Product2').get('v.value');
        var pcId2 = component.find('select_Product3').get('v.value');
        var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
        var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
            this.warning('不能选择同样的产品区分');
            component.find('select_Product1').set('v.value','');
    }
  },
  productcategoryChange2: function (component, event, helper) {
    var product_category_id = component.find("select_Product2").get("v.value");
    var pcId1 = component.find("select_Product1").get("v.value");
    var pcId2 = component.find("select_Product3").get("v.value");
    var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
    var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
    var p0bool =
      product_category_id != "" &&
      product_category_id != null &&
      product_category_id != undefined;
    if (
      (p1bool && p0bool && product_category_id == pcId1) ||
      (p2bool && p0bool && product_category_id == pcId2)
    ) {
      this.warning("不能选择同样的产品区分");
      component.find("select_Product2").set("v.value", "");
        var product_category_id = component.find('select_Product2').get('v.value');
        var pcId1 = component.find('select_Product1').get('v.value');
        var pcId2 = component.find('select_Product3').get('v.value');
        var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
        var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
            this.warning('不能选择同样的产品区分');
            component.find('select_Product2').set('v.value','');
    }
  },
  productcategoryChange3: function (component, event, helper) {
    var product_category_id = component.find("select_Product3").get("v.value");
    var pcId1 = component.find("select_Product1").get("v.value");
    var pcId2 = component.find("select_Product2").get("v.value");
    var p1bool = pcId1 != "" && pcId1 != null && pcId1 != undefined;
    var p2bool = pcId2 != "" && pcId2 != null && pcId2 != undefined;
    var p0bool =
      product_category_id != "" &&
      product_category_id != null &&
      product_category_id != undefined;
    if (
      (p1bool && p0bool && product_category_id == pcId1) ||
      (p2bool && p0bool && product_category_id == pcId2)
    ) {
      this.warning("不能选择同样的产品区分");
      component.find("select_Product3").set("v.value", "");
        var product_category_id = component.find('select_Product3').get('v.value');
        var pcId1 = component.find('select_Product1').get('v.value');
        var pcId2 = component.find('select_Product2').get('v.value');
        var p1bool = pcId1 != '' && pcId1 != null && pcId1 != undefined;
        var p2bool = pcId2 != '' && pcId2 != null && pcId2 != undefined;
        var p0bool = product_category_id != '' && product_category_id != null && product_category_id != undefined;
        if ((p1bool && p0bool && product_category_id == pcId1) || (p2bool && p0bool && product_category_id == pcId2)) {
            this.warning('不能选择同样的产品区分');
            component.find('select_Product3').set('v.value','');
    }
  },

  conv_selected: function (obj) {
    for (var i = 0; i < obj.length; i++) {
      if (obj[i].selected) {
        if (obj[i].selected == "true") {
                if (obj[i].selected == 'true') {
          obj[i].selected = true;
        } else {
          obj[i].selected = false;
@@ -2109,7 +1691,7 @@
  },

  set_selected: function (component, aura_id_name, value) {
    var select_tmp = component.find(aura_id_name).get("v.options");
        var select_tmp = component.find(aura_id_name).get('v.options');
    if (select_tmp) {
      for (var i = 0; i < select_tmp.length; i++) {
        if (select_tmp[i].value == value) {
@@ -2118,7 +1700,7 @@
          select_tmp[i].selected = false;
        }
      }
      component.find(aura_id_name).set("v.options", select_tmp);
            component.find(aura_id_name).set('v.options', select_tmp);
      return true;
    } else {
      return false;
@@ -2128,10 +1710,10 @@
  success: function (message) {
    var toastEvent = $A.get("e.force:showToast");
    toastEvent.setParams({
      title: "成功!",
      message: message,
      type: "success",
      duration: "5000"
            "title" : "成功!",
            "message" : message,
            "type" : "success",
            "duration" : "5000"
    });
    toastEvent.fire();
  },
@@ -2139,10 +1721,10 @@
  warning: function (message) {
    var toastEvent = $A.get("e.force:showToast");
    toastEvent.setParams({
      title: "警告!",
      message: message,
      type: "warning",
      duration: "10000"
            "title": "警告!",
            "message": message,
            "type":"warning",
            "duration" : "10000"
    });
    toastEvent.fire();
  },
@@ -2152,18 +1734,18 @@
    var toastEvent = $A.get("e.force:showToast");

    toastEvent.setParams({
      title: "错误!",
      message: message,
      type: "error",
      duration: "sticky"
            "title": "错误!",
            "message": message,
            "type":"error",
            "duration" : "sticky"
    });
    toastEvent.fire();
  },

  createCon: function (component, event, helper) {
    var modal_newAC = component.find("modal_newAC");
    $A.util.removeClass(modal_newAC, "disp_none");
    component.set("v.truthy", true);
        var modal_newAC = component.find('modal_newAC')
        $A.util.removeClass(modal_newAC, 'disp_none');
        component.set('v.truthy', true);
    // var modal_newAC = component.find('modal_newAC')
    // $A.util.removeClass(modal_newAC, 'disp_none');
  },
@@ -2192,87 +1774,77 @@
  // vivek end æ·»åŠ éªŒè¯

  hideCmp: function (component, event, helper) {
    var div1 = component.find("report");
    var div2 = component.find("report_list");
    $A.util.addClass(div1, "disp_none");
    $A.util.addClass(div2, "disp_none");
        var div1 = component.find('report')
        var div2 = component.find('report_list')
        $A.util.addClass(div1, 'disp_none');
        $A.util.addClass(div2, 'disp_none');
  },

  handleSuccess: function (component, event, helper) {
    var insertId = event.getParams().response.Id;
    var displayValue = event.getParams().response.fields.Name.value;
    event.setParams({});
    component.set("v.truthy", false);
    var modal_newAC = component.find("modal_newAC");
    $A.util.addClass(modal_newAC, "disp_none");
    this.success(".客户人员已创建。");
        component.set('v.truthy', false);
        var modal_newAC = component.find('modal_newAC')
        $A.util.addClass(modal_newAC, 'disp_none');
        this.success('.客户人员已创建。');
    this.set_doctor_list(component);
  },

  createCancel: function (component, event, helper) {
    component.set("v.truthy", false);
    var modal_newAC = component.find("modal_newAC");
    $A.util.addClass(modal_newAC, "disp_none");
        component.set('v.truthy', false);
        var modal_newAC = component.find('modal_newAC')
        $A.util.addClass(modal_newAC, 'disp_none');
  },
  setOpportunity_cfilter: function (component) {
    debugger;
    var hosId = component.get("v.hospitalId");
    var Department_Cateogy__c = component
      .find("select_department")
      .get("v.value");
    var opportunity_cfilter = "";
    if (hosId != "" && hosId != null) {
      opportunity_cfilter =
        " Agency_Hospital__r.Hospital__c=" + "'" + hosId + "'";
        debugger
        var hosId = component.get('v.hospitalId');
        var Department_Cateogy__c = component.find('select_department').get('v.value');
        var opportunity_cfilter = '';
        if (hosId != '' && hosId != null) {
            opportunity_cfilter = ' Agency_Hospital__r.Hospital__c=' + '\'' + hosId + '\'';
    }
    if (Department_Cateogy__c != "" && Department_Cateogy__c != null) {
      if (opportunity_cfilter != "" && opportunity_cfilter != null) {
        opportunity_cfilter += " AND ";
        if (Department_Cateogy__c != '' && Department_Cateogy__c != null) {
            if (opportunity_cfilter != '' && opportunity_cfilter != null) {
                opportunity_cfilter += ' AND ';
      }
      opportunity_cfilter +=
        "Department_Cateogy__c=" + "'" + Department_Cateogy__c + "'";
            opportunity_cfilter += 'Department_Cateogy__c=' + '\'' + Department_Cateogy__c + '\'';
    }
    component.set("v.opportunity_cfilter", opportunity_cfilter);
    component.set("v.data.Opportunity__c", null);
        component.set('v.opportunity_cfilter', opportunity_cfilter);
        component.set('v.data.Opportunity__c', null);
  },
  readFile: function (component, helper, file) {
    if (!file) return;
    // console.log('file'+file.name);
    if (!file.name.match(/\.(csv||CSV)$/)) {
      return alert("only support csv files");
            return alert('only support csv files');
    } else {
            
      reader = new FileReader();
      reader.onerror = function errorHandler(evt) {
        switch (evt.target.error.code) {
          case evt.target.error.NOT_FOUND_ERR:
            alert("File Not Found!");
                        alert('File Not Found!');
            break;
          case evt.target.error.NOT_READABLE_ERR:
            alert("File is not readable");
                        alert('File is not readable');
            break;
          case evt.target.error.ABORT_ERR:
            break; // noop
          default:
            alert("An error occurred reading this file.");
        }
                        alert('An error occurred reading this file.');
      };
            }
      //reader.onprogress = updateProgress;
      reader.onabort = function (e) {
        alert("File read cancelled");
                alert('File read cancelled');
      };
      reader.onloadstart = function (e) {
        var output =
          '<ui type="disc"><li><strong>' +
          file.name +
          "</strong> (" +
          file.type +
          ")- " +
          file.size +
          "bytes, last modified: " +
          file.lastModifiedDate.toLocaleDateString() +
          "</li></ui>";
                
                var output = '<ui type=\"disc\"><li><strong>'+file.name +'</strong> ('+file.type+')- '+file.size+'bytes, last modified: '+file.lastModifiedDate.toLocaleDateString()+'</li></ui>';
        component.set("v.filename", file.name);
        component.set("v.TargetFileName", output);
               
      };
      reader.onload = function (e) {
        var data = e.target.result;
@@ -2281,32 +1853,35 @@
        // console.log("file data"+encodeURI(JSON.stringify(data),"utf-8"));
        var allTextLines = data.split(/\r\n|\n/);
        var dataRows = allTextLines.length - 1;
        var headers = allTextLines[0].split(",");
                var headers = allTextLines[0].split(',');

        // console.log("Rows length::"+dataRows);

              
        var numOfRows = component.get("v.NumOfRecords");
        if (dataRows > numOfRows + 1 || dataRows == 1 || dataRows == 0) {
                   
          alert("File Rows between 1 to " + numOfRows + " .");
          component.set("v.showMain", true);
        } else {
                    
                } 
                else{
          var lines = [];
          var filecontentdata;
          var content =
            '<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
          content += '<thead><tr class="slds-text-title--caps">';
          content += '<th scope="col">' + "行号" + "</th>";
                    var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
                    content += "<thead><tr class=\"slds-text-title--caps\">";
                    content += '<th scope=\"col"\>'+'行号'+'</th>';
          for (i = 0; i < headers.length; i++) {
            content += '<th scope="col">' + headers[i] + "</th>";
                        content += '<th scope=\"col"\>'+headers[i]+'</th>';
          }
          content += "</tr></thead>";
          for (var i = 1; i < allTextLines.length; i++) {
            filecontentdata = allTextLines[i].split(",");
            if (filecontentdata[0] != "") {
                        filecontentdata = allTextLines[i].split(',');
                        if(filecontentdata[0]!=''){
              content += "<tr>";
              content += "<td>" + i + "</td>";
              for (var j = 0; j < filecontentdata.length; j++) {
                content += "<td>" + filecontentdata[j] + "</td>";
                                content +='<td>'+filecontentdata[j]+'</td>';
              }
              content += "</tr>";
            }
@@ -2316,57 +1891,56 @@
          component.set("v.TableContent", content);
          component.set("v.showMain", false);
        }
      };
      reader.readAsText(file, "gb2312");
            }
            reader.readAsText(file,'gb2312');
            
    }
    var reader = new FileReader();
    reader.onloadend = function () {};
        reader.onloadend = function() {
         
        };
    reader.readAsDataURL(file);
  },

  saveRecords: function (component, event, helper) {
    component.set("v.login", true);
        debugger
        component.set('v.login',true);
    //fy å¯¼å…¥ 20220424 start
    var action1 = component.get("c.processDataAWSId");
    action1.setParams({
      fileData: component.get("v.fileContentData")
            fileData : component.get("v.fileContentData"),
    });
        debugger
    action1.setCallback(this, function (response) {
      console.log("response = " + JSON.stringify(response));
            console.log('response = '  + JSON.stringify(response));
      var state = response.getState();
      if (state === "SUCCESS") {
        var ress = response.getReturnValue();
        console.log("ress = " + JSON.stringify(ress));
                console.log('ress = '  + JSON.stringify(ress));
        if (ress) {
          var valur = ress.split("error1");
                    var valur =ress.split('error1');
          if (valur.length <= 1) {
            var res = JSON.parse(response.getReturnValue());
            console.log("res = " + JSON.stringify(res));
                        console.log('res = '  + JSON.stringify(res));
            var dataArr = new Array();
            var dataMap = new Map();
            res.forEach((item) => {
                        res.forEach(item => {
              if (item.AWS_Data_Id__c) {
                dataArr.push(item.AWS_Data_Id__c);
                //dataMap.set(item.AWS_Data_Id__c,item.Name_Encrypted__c);
                dataMap.set(item.AWS_Data_Id__c, item.AWS_Data_Id__c); //zhj æ–°æ–¹æ¡ˆæ”¹é€  2022-12-21
              }
            });
            debugger;
            let obj = Object.create(null);
            obj["dataIds"] = dataArr;
                        obj['dataIds'] = dataArr;
            var payload = JSON.stringify(obj);
            this.search_contact_url(
              component,
              "Agency_Contact__c",
              (result) => {
                        console.log('payload zhj = ' + JSON.stringify(payload));
                        
                        this.search_contact_url(component, 'Agency_Contact__c', (result)=>{
                var token = result.token;
                var searchUrl = result.searchUrl;
                this.search_core(
                  token,
                  searchUrl,
                  payload,
                  (result) => {
                    if (result.status == "0") {
                            this.search_core(token,searchUrl,payload,(result)=>{
                                if(result.status == '0'){
                      if (result.object != null && result.object.length != 0) {
                        // var resultjson = JSON.stringify(result.object);
                        // if(resultjson){
@@ -2375,32 +1949,25 @@
                        //     component.set('v.login',true);
                        //     this.ImportMethod(component,resultjson);
                        // }
                        component.set("v.login", true);
                        this.saveRecordsEditFile(
                          component,
                          dataMap,
                          result.object,
                          helper
                        );
                                        component.set('v.login',true);
                                        this.saveRecordsEditFile(component,dataMap,result.object,helper);
                      } else {
                        this.error("AWS search status5 ");
                        component.set("v.login", false);
                                        this.error('AWS æŸ¥è¯¢æ•°æ®ä¸ºç©º ' );
                                        component.set('v.login',false);
                      }
                    } else {
                      this.error("AWS search status6 : " + result.status);
                      component.set("v.login", false);
                                    this.error('AWS search status6 : ' + result.status);
                                    component.set('v.login',false);
                    }
                  },
                  component
                );
                            },component);
                //     var resultjson =null;
                // this.ImportMethod(component,resultjson);
              }
            );
                            
                        });
            // var resultjson =null;
            // this.ImportMethod(component,resultjson);
          } else {
            this.error(valur[1] + "\n" + "请修改后重新上传");
                        this.error(valur[1]+'\n'+"请修改后重新上传");
          }
        }
      }
@@ -2462,147 +2029,230 @@
    //     }
    // });
    // $A.enqueueAction(action);
  },
  ImportMethod: function (component, fileStr) {

    },isNumber: function(str) {
        return /^\d+$/.test(str);
    },ImportMethod : function(component,fileStr){
        debugger
    var actionss = component.get("c.processData");
    var selectDate = component.find("select_date").get("v.value");
    var fieldsList = ["Name", "Phone", "AccountNumber"]; //Please write your code dynamic
         var selectDate = component.find('select_date').get('v.value');
        var fieldsList=['Name','Phone','AccountNumber']; //Please write your code dynamic 
    var sss = component.get("v.fileContentData");
    actionss.setParams({
      // fileData : component.get("v.fileContentData"),
      fileData: fileStr,
      // selectDateselectDate :component.find('select_date').get('v.value'),
      sobjectName: "Account", //Any object
            sobjectName:'Account', //Any object
      fields: fieldsList
      // Agency_ContactListjson:resultjson
    });
    actionss.setCallback(this, function (response) {
      console.log("002");
                console.log('002');
      var state = response.getState();
      if (state === "SUCCESS") {
        var res = response.getReturnValue();
        var res1 = "";
                    var res1 = '';
        console.log("[[[[[[" + res);
        if (res != "success") {
          var ress = res.split("=");
                    if(res != 'success'){
                        var ress = res.split('=');
          console.log(ress);
                        let errorDatas = [];
                        let errorDataRow = [];
                        debugger
          for (var i = 0; i < ress.length; i++) {
            res1 += ress[i].substr(7) + "\n";
                            res1 += ress[i].substr(7)+'\n';
                            if (ress[i] != '') {
                                let errorData = {}
                                if(!this.isNumber(ress[i].substr(7).substring(1, 2))){
                                    continue
          }
          // $('.forceToastManager').css('white-space', 'pre-wrap');
                                let index = errorDataRow.indexOf(ress[i].substr(7).substring(1, 2));
                                if (index == -1) {
                                    errorData.errorRow = ress[i].substr(7).substring(1, 2);
                                    errorDataRow.push(errorData.errorRow);
                                    errorData.errorInfo = ress[i].substr(7).substring(5).replace('=','');
                                    errorDatas.push(errorData);
                                } else {
                                    errorDatas[index].errorInfo += '; ' + ress[i].substr(7).substring(5);
                                }
                            }
                        }
                        var fileContentData = component.get("v.fileContentData").split('\n');
                        let errorColumns = [
                            { label: '错误行', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
                            { label: '错误信息', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
                        ];
                        for (var i = 0; i < fileContentData[0].split(',').length; i++) {
                            errorColumns.push({
                                label: fileContentData[0].split(',')[i], 
                                fieldName: 'field' + i, 
                                type: 'text', 
                                hideDefaultActions: true, 
                                wrapText: true,
                                initialWidth: 120
                            });
                        }

                        for (var i = 0; i < errorDatas.length; i++) {
                            let data = fileContentData[errorDatas[i].errorRow];
                            console.log('data = ' + JSON.stringify(data));
                            if(data){
                                for (var j = 0; j < data.split(',').length; j++) {
                                    let label = 'field' + j;
                                    errorDatas[i][label] = data.split(',')[j];
                                }
                            }
                        }
                        component.set('v.errorColumns', errorColumns);
                        component.set('v.errorData', errorDatas);
                        component.set("v.showErrorInfo", true);
          console.log("==" + res1);
          this.error(res1 + "请修改后重新上传");
          component.set("v.login", false);
                        component.set('v.login',false);
        } else {
          component.set("v.showMain", true);
          this.success("导入成功");
          // alert('saved successfully');
          component.set("v.login", false);
                        component.set('v.login',false);
        }
      } else if (state === "INCOMPLETE") {
                    
                }
                else if (state === "INCOMPLETE") {
        // do something
        component.set("v.login", false);
      } else if (state === "ERROR") {
                    component.set('v.login',false);
                }
                else if (state === "ERROR") {
        var errors = response.getError();
        if (errors) {
          if (errors[0] && errors[0].message) {
            console.log("Error message: " + errors[0].message);
            component.set("v.login", false);
                            console.log("Error message: " + 
                                    errors[0].message);
                            component.set('v.login',false);
          }
        } else {
          console.log("Unknown error");
          component.set("v.login", false);
                        component.set('v.login',false);
        }
      }
    });
    $A.enqueueAction(actionss);
  },
  saveRecordsEditFile: function (component, dataMap, searchData, helper) {
    },saveRecordsEditFile : function(component,dataMap,searchData,helper){
    var searchDataMap = new Map();
    for (var i = 0; i < searchData.length; i++) {
      var sd = searchData[i];
      if (sd.name) searchDataMap.set(sd.name.replace(" ", ""), sd.dataId);
         if(sd.name)
         searchDataMap.set(sd.name.replace(' ',''),sd.dataId);
    }
    console.log("searchDataMap=" + searchDataMap);
    var error = "";
         console.log('searchDataMap='+searchDataMap);
         var error = '';
    var fileData = component.get("v.fileContentData");
    var files = fileData.split("\n");
         var files = fileData.split('\n');

    var fileStr = files[0];
    fileStr += "\n";
         fileStr += '\n';

    for (var i = 1; i < files.length - 1; i++) {
      var filelist = files[i].split(",");
         var filelist = files[i].split(',');
      var fileName = filelist[4];

      if (searchDataMap.get(fileName.replace(" ", ""))) {
        var nameDataId = searchDataMap.get(fileName.replace(" ", ""));
         if (searchDataMap.get(fileName.replace(' ',''))) {
                 var nameDataId = searchDataMap.get(fileName.replace(' ',''));
        if (dataMap.get(nameDataId)) {
          filelist[4] = dataMap.get(nameDataId); //zhj æ–°æ–¹æ¡ˆæ”¹é€  filelist[4]不再存的nameEncrpt 2022-12-21
        } else {
          error += "error1 ç¬¬" + i + "行数据拜访人SF不存在";
          error += "=";
                     error += 'error1 ç¬¬'+i+'行数据拜访人SF不存在';
                     error += '=';
        }
      } else {
        error += "error1 ç¬¬" + i + "行数据拜访人AWS不存在";
        error += "=";
                 error += 'error1 ç¬¬'+i+'行数据拜访人AWS不存在';
                 error += '=';
      }
      fileStr += filelist.toString();
      fileStr += "\n";
             fileStr += '\n';
    }

    if (error != "") {
        if (error != '') {
            console.log('zhj error = ' + error);
            let errorArray = error.split('error1');
            let errorDatas = [];
            let errorDataRow = [];
            debugger
            console.log('errorArray = ' + JSON.stringify(errorArray))
            for (var i in errorArray) {
                if (errorArray[i] != '') {
                    let errorData = {}
                    if(!this.isNumber(errorArray[i].trim().substring(1, 2))){
                        continue
                    }
                    let index = errorDataRow.indexOf(errorArray[i].trim().substring(1, 2));
                    if (index == -1) {
                        errorData.errorRow = errorArray[i].trim().substring(1, 2);
                        errorDataRow.push(errorData.errorRow);
                        errorData.errorInfo = errorArray[i].trim().substring(5,errorArray[i].trim().length).replace('=','');
                        errorDatas.push(errorData);
                    } else {
                        errorDatas[index].errorInfo += '; ' + errorArray[i].trim().substring(5,errorArray[i].trim().length);
                    }
                }
            }
            var fileContentData = component.get("v.fileContentData").split('\n');
            let errorColumns = [
                { label: '错误行', fieldName: 'errorRow', type: 'text', hideDefaultActions: true, initialWidth: 100 },
                { label: '错误信息', fieldName: 'errorInfo', type: 'text', hideDefaultActions: true, initialWidth: 300, wrapText: true }
            ];
            for (var i = 0; i < fileContentData[0].split(',').length; i++) {
                errorColumns.push({
                    label: fileContentData[0].split(',')[i], 
                    fieldName: 'field' + i, 
                    type: 'text', 
                    hideDefaultActions: true, 
                    wrapText: true,
                    initialWidth: 120
                });
            }

            for (var i = 0; i < errorDatas.length; i++) {
                let data = fileContentData[errorDatas[i].errorRow];
                console.log('data = ' + JSON.stringify(data));
                for (var j = 0; j < data.split(',').length; j++) {
                    let label = 'field' + j;
                    errorDatas[i][label] = data.split(',')[j];
                }
            }
            console.log('errorDatas =' + JSON.stringify(errorDatas))
            component.set('v.errorColumns', errorColumns);
            component.set('v.errorData', errorDatas);
            component.set("v.showErrorInfo", true);



            console.log('error = ' + error);
            component.set('v.errorMessage', error);

      this.error(error);
      console.log("error=" + error);
      component.set("v.login", false);
            console.log('error='+error);
            component.set('v.login',false);
      return;
    }

    console.log("fileStr=" + fileStr);
         console.log('fileStr='+fileStr);
    $A.getCallback(function () {
      debugger;
             debugger
      helper.ImportMethod(component, fileStr);
    })();

  },
  convertArrayOfObjectsToCSV: function (component, objectRecords) {
    var csvStringResult, counter, keys, columnDivider, lineDivider, thkeys;
    if (objectRecords == null || !objectRecords.length) {
      return null;
    }
    columnDivider = ",";
    lineDivider = "\n";
        columnDivider = ',';
        lineDivider =  '\n';
    //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start ,'SupportNeeds__c'  ,'支援需求'
    keys = [
      "Submit_date__c",
      "Person_In_Charge2__c",
      "Report_Date__c",
      "Agency_Hospital__c",
      "Department_Cateogy__c",
      "doctor2__c",
      "visitor_title__c",
      "Product_Category1__c",
      "Product_Category2__c",
      "Product_Category3__c",
      "Purpose_Type__c",
      "Result__c",
      "SupportNeeds__c"
    ];
    thkeys = [
      "周",
      "担当",
      "活动日",
      "医院",
      "科室",
      "拜访人",
      "职位",
      "产品区分1",
      "产品区分2",
      "产品区分3",
      "活动区分",
      "结果",
      "支援需求"
    ];
    csvStringResult = "";
        keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
        thkeys = ['周','担当','活动日','医院','科室','拜访人','职位','产品区分1','产品区分2','产品区分3','活动区分','结果','支援需求']
        csvStringResult = '';
    csvStringResult += thkeys.join(columnDivider);
    csvStringResult += lineDivider;
    console.log("进入导出helper");
@@ -2614,33 +2264,30 @@
          csvStringResult += columnDivider;
        }
        if (typeof objectRecords[i][skey] === "undefined") {
          csvStringResult += '"' + "" + '"';
                    csvStringResult += '"'+''+'"';
          continue;
        }
        if (skey == "Person_In_Charge2__c") {
          csvStringResult +=
            '"' + objectRecords[i].Person_In_Charge2__r.Name + '"';
        } else if (skey == "Agency_Hospital__c") {
          csvStringResult +=
            '"' + objectRecords[i].Agency_Hospital__r.Name + '"';
        } else if (skey == "doctor2__c") {
                if(skey == 'Person_In_Charge2__c'){
                    csvStringResult += '"'+ objectRecords[i].Person_In_Charge2__r.Name+'"';
                }else if(skey == 'Agency_Hospital__c'){
                    csvStringResult += '"'+ objectRecords[i].Agency_Hospital__r.Name+'"';
                }else if(skey == 'doctor2__c'){
          csvStringResult += '"' + objectRecords[i].doctor2__r.Name + '"';
        } else if (skey == "Product_Category1__c") {
          csvStringResult +=
            '"' + objectRecords[i].Product_Category1__r.Name + '"';
        } else if (skey == "Product_Category2__c") {
          csvStringResult +=
            '"' + objectRecords[i].Product_Category2__r.Name + '"';
        } else if (skey == "Product_Category3__c") {
          csvStringResult +=
            '"' + objectRecords[i].Product_Category3__r.Name + '"';
        } else if (skey == "SupportNeeds__c") {
          //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
                }else if(skey == 'Product_Category1__c'){
                    csvStringResult += '"'+ objectRecords[i].Product_Category1__r.Name+'"';
                }else if(skey == 'Product_Category2__c'){
                    csvStringResult += '"'+ objectRecords[i].Product_Category2__r.Name+'"';
                }else if(skey == 'Product_Category3__c'){
                    csvStringResult += '"'+ objectRecords[i].Product_Category3__r.Name+'"';
                }
                else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
          csvStringResult += '"' + objectRecords[i].SupportNeeds__c + '"';
        } else {
                }
                else{
          csvStringResult += '"' + objectRecords[i][skey] + '"';
        }
        counter++;
             
      } // inner for loop close
      console.log("导出循环结束");
      csvStringResult += lineDivider;
@@ -2650,130 +2297,89 @@
    return csvStringResult;
  },
  showExportDate: function (component, objectRecords) {
    console.log("进入showexceportdate" + objectRecords); //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start  ,'SupportNeeds__c' ,'支援需求'
    var keys = [
      "Submit_date__c",
      "Person_In_Charge2__c",
      "Report_Date__c",
      "Agency_Hospital__c",
      "Department_Cateogy__c",
      "doctor2__c",
      "visitor_title__c",
      "Product_Category1__c",
      "Product_Category2__c",
      "Product_Category3__c",
      "Purpose_Type__c",
      "Result__c",
      "SupportNeeds__c"
    ];
    var headers = [
      "周",
      "担当",
      "活动日",
      "医院",
      "科室",
      "拜访人",
      "职位",
      "产品区分1",
      "产品区分2",
      "产品区分3",
      "活动区分",
      "结果",
      "支援需求"
    ];
    var content =
      '<table class="table slds-table slds-table--bordered slds-table--cell-buffer">';
    content += '<thead><tr class="slds-text-title--caps">';
        console.log('进入showexceportdate'+objectRecords);//SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start  ,'SupportNeeds__c' ,'支援需求'
        var keys = ['Submit_date__c','Person_In_Charge2__c','Report_Date__c','Agency_Hospital__c','Department_Cateogy__c','doctor2__c','visitor_title__c','Product_Category1__c','Product_Category2__c','Product_Category3__c','Purpose_Type__c','Result__c','SupportNeeds__c'];
        var headers = ['周','担当','活动日','医院','科室','拜访人','职位','产品区分1','产品区分2','产品区分3','活动区分','结果','支援需求']
        var content = "<table class=\"table slds-table slds-table--bordered slds-table--cell-buffer\">";
        content += "<thead><tr class=\"slds-text-title--caps\">";
    for (i = 0; i < headers.length; i++) {
      content += '<th scope="col">' + headers[i] + "</th>";
            content += '<th scope=\"col"\>'+headers[i]+'</th>';
    }
    content += "</tr></thead>";
    for (var i = 0; i < objectRecords.length; i++) {
      console.log("for" + content);
      content += "<tr>";
            console.log('for'+content);
            content += '<tr>';
      // content += '<td>'+(i+1)+'</td>';
      for (var sTempkey in keys) {
        console.log("for1" + sTempkey);
                console.log('for1'+sTempkey);
        var skey = keys[sTempkey];
        if (typeof objectRecords[i][skey] === "undefined") {
          content += "<td>" + "" + "</td>";
                    content += '<td>'+''+'</td>';
          continue;
        }
        console.log("for2" + objectRecords[i].Person_In_Charge2__r.Name);
        if (skey == "Person_In_Charge2__c") {
          content +=
            "<td>" + objectRecords[i].Person_In_Charge2__r.Name + "</td>";
        } else if (skey == "Agency_Hospital__c") {
          content +=
            "<td>" + objectRecords[i].Agency_Hospital__r.Name + "</td>";
        } else if (skey == "doctor2__c") {
          content += "<td>" + objectRecords[i].doctor2__r.Name + "</td>";
        } else if (skey == "Product_Category1__c") {
          content +=
            "<td>" + objectRecords[i].Product_Category1__r.Name + "</td>";
        } else if (skey == "Product_Category2__c") {
          content +=
            "<td>" + objectRecords[i].Product_Category2__r.Name + "</td>";
        } else if (skey == "Product_Category3__c") {
          content +=
            "<td>" + objectRecords[i].Product_Category3__r.Name + "</td>";
        } else if (skey == "SupportNeeds__c") {
          //SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
          content += "<td>" + objectRecords[i].SupportNeeds__c + "</td>";
        } else {
          content += "<td>" + objectRecords[i][skey] + "</td>";
                console.log('for2'+objectRecords[i].Person_In_Charge2__r.Name);
                if(skey == 'Person_In_Charge2__c'){
                    content += '<td>'+ objectRecords[i].Person_In_Charge2__r.Name+'</td>';
                }else if(skey == 'Agency_Hospital__c'){
                    content += '<td>'+ objectRecords[i].Agency_Hospital__r.Name+'</td>';
                }else if(skey == 'doctor2__c'){
                    content += '<td>'+ objectRecords[i].doctor2__r.Name+'</td>';
                }else if(skey == 'Product_Category1__c'){
                    content += '<td>'+ objectRecords[i].Product_Category1__r.Name+'</td>';
                }else if(skey == 'Product_Category2__c'){
                    content += '<td>'+ objectRecords[i].Product_Category2__r.Name+'</td>';
                }else if(skey == 'Product_Category3__c'){
                    content += '<td>'+ objectRecords[i].Product_Category3__r.Name+'</td>';
                }
                else if(skey == 'SupportNeeds__c'){//SWAG-CBX68C fy ã€å§”托】DAMS系统周报模块内容需求增加 start
                    content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
                }
                else{
                    content += '<td>'+ objectRecords[i][skey]+'</td>';
        }
      } // inner for loop close
      content += "</tr>";
            content += '</tr>'
    } // outer main for loop close
    content += "</table>";
        content += '</table>';
    console.log("helper循环结束" + content);
    component.set("v.TableContent2", content);
    component.set("v.showMain", false);
  },

  select_repores_date: function (component, event, helper) {
    component.set("v.login", true);
    var reportsdate1 = component.find("input-report-date1").get("v.value");
    var reportsdate2 = component.find("input-report-date2").get("v.value");
    console.log(
      "输入的开始日期" + reportsdate1 + "输入的结束日期" + reportsdate2
    );
        component.set('v.login',true);
        var reportsdate1 = component.find('input-report-date1').get('v.value');
        var reportsdate2 = component.find('input-report-date2').get('v.value');
        console.log('输入的开始日期'+reportsdate1+'输入的结束日期'+reportsdate2);
    var action = component.get("c.getReportsByDate");
    console.log("输入的开始日期1");
        console.log('输入的开始日期1');
    action.setParams({
      date1: reportsdate1,
      date2: reportsdate2
    });
    console.log("输入的开始日期2");
        console.log('输入的开始日期2');
    action.setCallback(this, function (response) {
      var state = response.getState();
      if (state === "SUCCESS") {
                
        var res = response.getReturnValue();
        console.log("输入的开始日期3" + res);
        component.set("v.login", false);
                console.log('输入的开始日期3'+res);
                component.set('v.login',false);

        // PI æ”¹é€  By Bright 20220328
        if (true) {
          let awsids = [];
          for (let ri in res) {
            if (
              res[ri] &&
              res[ri].doctor2__r &&
              res[ri].doctor2__r.AWS_Data_Id__c
            ) {
                        if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c){
              awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
            }
          }
          if (awsids.length > 0) {
            let awsurl = component.get("v.awsurl");
                        let awsurl = component.get('v.awsurl');

            AWSService.search(
              awsurl.searchUrl,
              {
                        AWSService.search(awsurl.searchUrl,{
                dataIds: awsids
              },
              function (data) {
                        }, function(data){
                if (data && data.object && data.object.length) {
                  let m = {};
                  for (let di in data.object) {
@@ -2783,74 +2389,67 @@
                  }

                  for (let ri in res) {
                    if (
                      res[ri] &&
                      res[ri].doctor2__r &&
                      res[ri].doctor2__r.AWS_Data_Id__c &&
                      m.hasOwnProperty(res[ri].doctor2__r.AWS_Data_Id__c)
                    ) {
                      res[ri].doctor2__r.Name =
                        m[res[ri].doctor2__r.AWS_Data_Id__c].name;
                      res[ri].visitor_title__c =
                        m[res[ri].doctor2__r.AWS_Data_Id__c].doctorDivision1;
                                    if(res[ri] && res[ri].doctor2__r && res[ri].doctor2__r.AWS_Data_Id__c && m.hasOwnProperty(res[ri].doctor2__r.AWS_Data_Id__c)){
                                        res[ri].doctor2__r.Name = m[res[ri].doctor2__r.AWS_Data_Id__c].name;
                                        res[ri].visitor_title__c = m[res[ri].doctor2__r.AWS_Data_Id__c].doctorDivision1;
                                        
                    }
                  }
                }
                helper.showExportDate(component, res);

                component.set("v.login", false);
              },
              awsurl.token
            );
                            component.set('v.login', false);
                        }, awsurl.token);
          } else {
            helper.showExportDate(component, res);
          }
        }

        component.set("v.reports_date", res);

                component.set('v.reports_date', res);
                
      } else {
        alert("导出失败,请检查活动日");
        component.set("v.login", false);
                alert('导出失败,请检查活动日');
                component.set('v.login',false);
      }
    });
    $A.enqueueAction(action);

  },

  showImport: function (component) {
    // console.log('进入');
    // component.find('file').click();
    var modalimport = component.find("modal_import");
    var modalimportbg = component.find("modal_importbg");
    $A.util.removeClass(modalimport, "disp_none");
    $A.util.removeClass(modalimportbg, "disp_none");
        var modalimport = component.find('modal_import');
        var modalimportbg = component.find('modal_importbg');
        $A.util.removeClass(modalimport, 'disp_none');
        $A.util.removeClass(modalimportbg,'disp_none');
  },

  showExport: function (component) {
    var modalimport = component.find("modal_export");
    var modalimportbg = component.find("modal_exportbg");
    $A.util.removeClass(modalimport, "disp_none");
    $A.util.removeClass(modalimportbg, "disp_none");
        var modalimport = component.find('modal_export');
        var modalimportbg = component.find('modal_exportbg');
        $A.util.removeClass(modalimport, 'disp_none');
        $A.util.removeClass(modalimportbg,'disp_none');
  },

  close_import: function (component) {
    var modalimport = component.find("modal_import");
    var modalimportbg = component.find("modal_importbg");
    $A.util.addClass(modalimport, "disp_none");
    $A.util.addClass(modalimportbg, "disp_none");
        var modalimport = component.find('modal_import');
        var modalimportbg = component.find('modal_importbg');
        $A.util.addClass(modalimport, 'disp_none');
        $A.util.addClass(modalimportbg,'disp_none');
  },

  close_export: function (component) {
    var modalimport = component.find("modal_export");
    var modalimportbg = component.find("modal_exportbg");
    $A.util.addClass(modalimport, "disp_none");
    $A.util.addClass(modalimportbg, "disp_none");
        var modalimport = component.find('modal_export');
        var modalimportbg = component.find('modal_exportbg');
        $A.util.addClass(modalimport, 'disp_none');
        $A.util.addClass(modalimportbg,'disp_none');
  },

  //zhj MEBG新方案改造 2022-11-29 start
  CallBackAction: function (component, action_name, para, callback) {
    var action = component.get(
      "c." + action_name.trimStart().replace("c.", "")
    );
        var action = component.get("c." + action_name.trimStart().replace("c.",""));
    if (para) {
      action.setParams(para);
    }
@@ -2861,8 +2460,73 @@
    }

    $A.enqueueAction(action);
  }
    },
  //zhj MEBG新方案改造 2022-11-29 end

    //zhj å¯¼å‡ºé”™è¯¯ä¿¡æ¯ 2023-05-16 start
    exportErrorInfoHelper: function (component) {
        var errorData = component.get('v.errorData');
        var errorColumns = component.get('v.errorColumns');

        var datas = [];
        let errorColumnsArray = [];
        for(var i in errorColumns){
            errorColumnsArray.push(errorColumns[i].label);
        }
        datas.push(errorColumnsArray);
        //datas.push(errorColumns);

        for (var i in errorData) {
            let data = [];
            data.push(errorData[i].errorRow)
            data.push(errorData[i].errorInfo)
            for(var j = 0 ; j < Object.keys(errorData[i]).length - 2 ; j++){
                data.push(errorData[i]['field' + j])
            }
            datas.push(data);
        }

        console.log('datas = ' + JSON.stringify(datas));
        var csv = this.convertToCSV(component, datas);
        console.log('csv = ' + JSON.stringify(csv))
        this.downloadCSV(component, csv);
    },

    convertToCSV: function (component, data) {
        console.log('enter convertToCSV')
        console.log('data = ' + data);
        var csv = '';
        for (var i = 0; i < data.length; i++) {
            var row = data[i];
            console.log('row = ' + JSON.stringify(row));
            for (var j = 0; j < row.length; j++) {
                var val = '';
                val = row[j] === null ? '' : row[j].toString();
                console.log('val = ' + val);
                if (val.indexOf(',') !== -1 || val.indexOf('"') !== -1 || val.indexOf('\n') !== -1) {
                    //val = '"' + val.replace(/"/g,'""') + '"';
                }
                if (j > 0) {
                    csv += ',';
                }
                csv += val;
            }
            csv += '\n';
        }
        return csv;
    },

    downloadCSV: function (component, csv) {
        var link = document.createElement('a');
        // è®¾ç½®å­—符集和文件头
        var bom = "\uFEFF";
        link.href = 'data:text/csv;charset=utf-8,' + encodeURIComponent(bom + csv);
        link.download = 'data.csv';
        document.body.appendChild(link);
        link.click();
        document.body.removeChild(link);
    },
    //zhj å¯¼å‡ºé”™è¯¯ä¿¡æ¯ 2023-05-16 end

  // searchAgencyContact : function(res) {
  //     var agencyContacts = [];
@@ -2898,4 +2562,4 @@
  //     var data = this.search(searchUrl,data,token);
  //     return data;searchUrl,requestSearchPayload,token
  // },
});
})

 force-app/main/default/classes/ArriveGoodsController.cls

Diff too large

 force-app/main/default/classes/Batch_FixAttachmentToFiles.cls

New file
@@ -0,0 +1,57 @@
global without sharing class Batch_FixAttachmentToFiles implements Database.Batchable<sObject>{
    // Id batchJobId = Database.executeBatch(new Batch_FixAttachmentToFiles(Datetime.newInstance(2023, 5, 20, 8, 0, 0),'Consumable_order__c'),2000);
    private Datetime endDate = null;
    private String objectApiName = null;
    public Batch_FixAttachmentToFiles(Datetime setTime,String objectType) {
        endDate = setTime;
        objectApiName = objectType;
    }

    global Database.QueryLocator start(Database.BatchableContext BC) {
        String queryObject = 'SELECT Id FROM ' + objectApiName + ' WHERE CreatedDate >=:endDate' + ' order by CreatedDate desc';
        System.debug('queryObject:' + queryObject);
        return Database.getQueryLocator(queryObject);//取指定Object下面的Id或者处理全部
    }

    global void execute(Database.BatchableContext BC, List<sObject> scope) {
        Set<Id> setId = new Set<Id>();
        for(sObject sc: scope){
            setId.add(sc.Id);
        }
        List<ContentVersion> insertContents = new List<ContentVersion>();
        Map<string,id> nameParentMaps = new Map<string,id>();
        for (Attachment att : [select Id,Name ,OwnerId,ParentId, Body, CreatedById from Attachment where ParentId in: setId Order by Name desc]) {
            nameParentMaps.put(att.name, att.ParentId);   
            ContentVersion cVersion = new ContentVersion();
            cVersion.ContentLocation = 'S';     //S-Document is in Salesforce. E-Document is outside of Salesforce. L-Document is on a Social Netork.
            cVersion.PathOnClient = att.Name;   //File name with extention
            cVersion.Origin = 'C';              //C-Content Origin. H-Chatter Origin.   
            cVersion.Title = att.Name;          //Name of the file
            cVersion.VersionData = att.Body;    //File content
            insertContents.add(cVersion);                            
        }
        if(insertContents.isEmpty()){
            return;
        }
        Insert insertContents;
        set<Id> contentIds = new set<Id>();
        for(ContentVersion cv : insertContents){
            contentIds.add(cv.id);
        }
        List<ContentVersion> conDocuments = [SELECT ContentDocumentId, Title FROM ContentVersion WHERE Id in: contentIds];
        List<ContentDocumentLink> insertDocLinks = new List<ContentDocumentLink>();  
        for(ContentVersion cv : conDocuments){
            ContentDocumentLink cDocLink = new ContentDocumentLink();
            cDocLink.ContentDocumentId = cv.ContentDocumentId;          //Add ContentDocumentId
            cDocLink.LinkedEntityId = nameParentMaps.get(cv.Title);     //Add attachment parentId
            cDocLink.ShareType = 'V';                                   //V - Viewer permission. C - Collaborator permission. I - Inferred permission.
            cDocLink.Visibility = 'AllUsers';
            insertDocLinks.add(cDocLink);
        }
        Insert insertDocLinks;
    }

    global void finish(Database.BatchableContext BC) {

    }
}

 force-app/main/default/classes/Batch_FixAttachmentToFiles.cls-meta.xml

New file
@@ -0,0 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<ApexClass xmlns="http://soap.sforce.com/2006/04/metadata">
    <apiVersion>57.0</apiVersion>
    <status>Active</status>
</ApexClass>

 force-app/main/default/classes/LexArriveGoodsController.cls

@@ -1,14 +1,12 @@
public without sharing class LexArriveGoodsController {
    
  //初始化
  @AuraEnabled
  public static Results init(String arrType, String eSetId) {
    Results results = new Results();
    results.isNoteStay = LexUtility.getIsNoteStay();
    try {
      ArriveGoodsController arrController = new ArriveGoodsController(
        eSetId,
        arrType
      );
            ArriveGoodsController arrController = new ArriveGoodsController(eSetId, arrType);
      arrController.isLwc = true;
      arrController.init();
      results.arrGoodCon = JSON.serialize(arrController);
@@ -29,20 +27,14 @@
    Results results = new Results();
    try {
      System.debug('arrControllerStr:' + arrControllerStr);
      ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
        arrControllerStr,
        ArriveGoodsController.class
      );
            ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
      arrController.barcode = barcode;
      arrController.returnError = null;
      arrController.warningList = new List<String>();
      arrController.errorList = new List<String>();
      arrController.SearchPro();
      results.arrGoodCon = JSON.serialize(arrController);
      if (
        arrController.returnError != null &&
        arrController.returnError != ''
      ) {
            if(arrController.returnError != null && arrController.returnError != ''){
        results.result = 'Fail';
        results.errorMsgList = arrController.errorList;
        results.warningMsgList = arrController.warningList;
@@ -52,30 +44,17 @@
        results.saveFLGbln = arrController.saveFLGbln;
        results.returnFLGbln = arrController.ReturnFLGbln;
        results.detailsSummary = changeType1(arrController.detailsSummary);
        results.consumableorderdetailsRecords = changeType1(
          arrController.ConsumableorderdetailsRecords
        );
        results.showGoodsofReturnList = changeType1(
          arrController.ShowGoodsofReturnList
        );
        results.consumableInventory = changeType1(
          arrController.consumableInventory
        );
        results.consumableorderdetailsRecordserror = changeType1(
          arrController.ConsumableorderdetailsRecordserror
        );
                results.consumableorderdetailsRecords = changeType1(arrController.ConsumableorderdetailsRecords);
                results.showGoodsofReturnList = changeType1(arrController.ShowGoodsofReturnList);
                results.consumableInventory = changeType1(arrController.consumableInventory);
                results.consumableorderdetailsRecordserror = changeType1(arrController.ConsumableorderdetailsRecordserror);
        results.errorMsgList = arrController.errorList;
        results.warningMsgList = arrController.warningList;
        results.result = 'Success';
      }
    } catch (Exception e) {
      results.result = 'Fail';
      results.errorMsg =
        e.getLineNumber() +
        '---' +
        e.getMessage() +
        '---' +
        e.getStackTraceString();
            results.errorMsg = e.getLineNumber() + '---' + e.getMessage() + '---' + e.getStackTraceString();
    }
    return results;
  }
@@ -85,19 +64,13 @@
  public static Results arriveGoodsConfim(String arrControllerStr) {
    Results results = new Results();
    try {
      ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
        arrControllerStr,
        ArriveGoodsController.class
      );
            ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
      arrController.returnError = null;
      arrController.warningList = new List<String>();
      arrController.errorList = new List<String>();
      Pagereference page = arrController.ArriveGoodsConfim();
      results.arrGoodCon = JSON.serialize(arrController);
      if (
        arrController.returnError != null &&
        arrController.returnError != ''
      ) {
            if(arrController.returnError != null && arrController.returnError != ''){
        results.result = 'Fail';
        results.errorMsgList = arrController.errorList;
        results.warningMsgList = arrController.warningList;
@@ -119,30 +92,19 @@

  //登录返品
  @AuraEnabled
  public static Results updateGoodsOfReturn(
    String arrControllerStr,
    String showGoodsofReturnListStr
  ) {
    public static Results updateGoodsOfReturn(String arrControllerStr, String showGoodsofReturnListStr) {
    Results results = new Results();
    try {
      List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
        showGoodsofReturnListStr,
        List<ConsumableorderdetailsInfo>.class
      );
      ArriveGoodsController arrController = (ArriveGoodsController) JSON.deserialize(
        arrControllerStr,
        ArriveGoodsController.class
      );
            List<ConsumableorderdetailsInfo> showGoodsofReturnList = (List<ConsumableorderdetailsInfo>)JSON.deserialize(showGoodsofReturnListStr, List<ConsumableorderdetailsInfo>.class);
            ArriveGoodsController arrController = (ArriveGoodsController)JSON.deserialize(arrControllerStr, ArriveGoodsController.class);
      arrController.ShowGoodsofReturnList = changeType2(showGoodsofReturnList);
      arrController.returnError = null;
      arrController.warningList = new List<String>();
      arrController.errorList = new List<String>();
            StaticParameter.ConsumableOrderTrigger = true; //Add by Li Jun for bypass ConsumableOrderTrigger 20230616
      Pagereference page = arrController.UpdateGoodsOfReturn();
      results.arrGoodCon = JSON.serialize(arrController);
      if (
        arrController.returnError != null &&
        arrController.returnError != ''
      ) {
            if(arrController.returnError != null && arrController.returnError != ''){
        results.result = 'Fail';
        results.errorMsgList = arrController.errorList;
        results.warningMsgList = arrController.warningList;
@@ -165,9 +127,7 @@
    return results;
  }

  public static List<ConsumableorderdetailsInfo> changeType1(
    List<ArriveGoodsController.ConsumableorderdetailsInfo> conList
  ) {
    public static List<ConsumableorderdetailsInfo> changeType1(List<ArriveGoodsController.ConsumableorderdetailsInfo> conList){
    List<ConsumableorderdetailsInfo> conList1 = new List<ConsumableorderdetailsInfo>();
    if (conList != null) {
      for (ArriveGoodsController.ConsumableorderdetailsInfo con : conList) {
@@ -193,9 +153,7 @@
    return conList1;
  }

  public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(
    List<ConsumableorderdetailsInfo> conList
  ) {
    public static List<ArriveGoodsController.ConsumableorderdetailsInfo> changeType2(List<ConsumableorderdetailsInfo> conList){
    List<ArriveGoodsController.ConsumableorderdetailsInfo> conList1 = new List<ArriveGoodsController.ConsumableorderdetailsInfo>();
    if (conList != null) {
      for (ConsumableorderdetailsInfo con : conList) {
@@ -287,67 +245,9 @@
    public String ReportProductExpirationDate { get; set; }

    public ConsumableorderdetailsInfo() {

    }

    public ConsumableorderdetailsInfo(
      Consumable_order_details2__c e,
      string str
    ) {
      esd = e;
      Prod = e.Consumable_Product__r;
      oldConsumableCount = e.name;
      ErrorReason = str;
      intMark = 1;
      if (e.Report_Product_Expiration__c != null) {
        ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
      }
    }
    public ConsumableorderdetailsInfo(Consumable_order_details2__c e) {
      canEdit = false;
      if (e.Box_Piece__c == '盒') {
        e.Rrturn_count__c = 1;
        canEdit = true;
      }
      esd = e;
      Prod = e.Consumable_Product__r;
      oldConsumableCount = e.name;
      if (e.Report_Product_Expiration__c != null) {
        ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
      }
    }

    public ConsumableorderdetailsInfo(Product2__c e, List<String> barinfoL) {
      esd = new Consumable_order_details2__c();
      ProductName = e.Name__c;
      Prod = e;
      barCodeNo = barinfoL[0];
      if (String.isNotBlank(barinfoL[1])) {
        sterilizationlimitDate = Date.valueOf(barinfoL[1]);
      }
      serialNoorLotNo = barinfoL[2];
      tracingCodeNo = barinfoL[3];
      ReturnReason = '';
    }

    public ConsumableorderdetailsInfo(
      Consumable_order_details2__c e,
      List<String> barinfoL
    ) {
      esd = e;
      Prod = e.Consumable_Product__r;
      barCodeNo = barinfoL[0];
      if (String.isNotBlank(barinfoL[1])) {
        sterilizationlimitDate = Date.valueOf(barinfoL[1]);
      }
      serialNoorLotNo = barinfoL[2];
      tracingCodeNo = barinfoL[3];
      if (e.Report_Product_Expiration__c != null) {
        ReportProductExpirationDate = e.Report_Product_Expiration__c.format();
      }
    }
    public ConsumableorderdetailsInfo(Product2__c e) {
      Prod = e;
    }
    // æŽ’序
    public Integer compareTo(Object compareTo) {
      return null;

 force-app/main/default/classes/LexArriveGoodsController.cls-meta.xml

 force-app/main/default/classes/LexArriveGoodsMainController.cls

@@ -32,18 +32,6 @@
        Results results = new Results();
        results.isNoteStay = LexUtility.getIsNoteStay();
        try {
            List<String> idList  = new List<String>();
            idList.add('a2K10000002zHyDEAU');
            idList.add('a2K10000002zIJEEA2');
            idList.add('a2K10000002zK9rEAE');
            idList.add('a2K10000004AKGBEA4');
            idList.add('a2K10000004ALqeEAG');
            idList.add('a2K10000004AMmrEAG');
            idList.add('a2K10000004ANvDEAW');
            idList.add('a2K10000004AOVxEAO');
            idList.add('a2K10000004AOJZEA4');
            idList.add('a2K10000004AOLuEAO');
            idList.add('a2K10000004AOLfEAO');
            // coc = new Consumable_order__c();
            String userId = UserInfo.getUserId();
            List<user> Useracc = New List<user>();

 force-app/main/default/classes/LexArriveGsDetailsController.cls

@@ -84,8 +84,9 @@

    //出库
    @AuraEnabled
    public static Results proSale(String cocStr, Decimal orderallcountParm, Integer consumableorderdetailsCountParm) {
    public static Results proSale(String cocStr, Decimal orderallcountParm, Integer consumableorderdetailsCountParm, String eSetIdStr) {
        Results results = new Results();
        eSetId = eSetIdStr;
        try {
            orderallcount = orderallcountParm;
            consumableorderdetailsCount = consumableorderdetailsCountParm;

 force-app/main/default/classes/LexConInvoicedetailsController.cls

@@ -13,16 +13,11 @@
  //发票单ID
  private static String invoiceId { get; set; }
  //出库单明细1，画面显示使用
  public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records {
    get;
    set;
  }
    public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records { get; set; }
  //明细数量
  public static Integer invoiceOrderRecoedsCount {
    get {
      return consumableorderdetails1Records == null
        ? 0
        : consumableorderdetails1Records.size();
            return consumableorderdetails1Records == null ? 0 : consumableorderdetails1Records.size();
    }
  }

@@ -39,20 +34,10 @@
    sumPrice = 0;
    coc = new Consumable_order__c();
    //出库单信息
    coc = [
      SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c
      FROM Consumable_order__c
      WHERE Id = :orderId
    ];
        coc = [SELECT Id, Name, Outbound_Date__c, Order_ForDealerText__c, Dealer_Info__c FROM Consumable_order__c WHERE Id = :orderId];
    //发票信息
    invoicecode = [
      SELECT
        Id,
        Name,
        ShipmentAccount__c,
        Order_ForCustomerText__c,
        Order_ForDealerText__c,
        Dealer_Info__c
            SELECT Id, Name, ShipmentAccount__c, Order_ForCustomerText__c, Order_ForDealerText__c, Dealer_Info__c
      FROM Consumable_order__c
      WHERE Id = :invoiceId
    ];
@@ -79,15 +64,10 @@
        Invoice_Unit__c,
        Invoicedet1_OD_link__c
      FROM Consumable_Orderdetails__c
      WHERE
        Consumable_order__c = :invoiceId
        AND Invoicedet1_OD_link__c = :orderId
            WHERE Consumable_order__c = :invoiceId AND Invoicedet1_OD_link__c = :orderId
    ];
    for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
      invoiceorderdet1CountMap.put(
        invoiceorderdetails1[i].Asset_Model_No__c,
        invoiceorderdetails1[i]
      );
            invoiceorderdet1CountMap.put(invoiceorderdetails1[i].Asset_Model_No__c, invoiceorderdetails1[i]);
    }
    //出库单明细1，画面显示使用
    List<Consumable_Orderdetails__c> consumableorderdetails1 = [
@@ -122,49 +102,35 @@
      WHERE Consumable_order__c = :orderId
    ];
    for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
      consumableorderdetails1Records.add(
        new ConsumableorderdetailsInfo(consumableorderdetails1[i])
      );
            consumableorderdetails1Records.add(new ConsumableorderdetailsInfo(consumableorderdetails1[i]));
    }
    for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
      if (invoiceorderdet1CountMap.containsKey(ass.esd.Asset_Model_No__c)) {
        ass.check = true;
        if (
          invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
            .Invoice_Unit__c == null ||
          invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
            .Invoice_Unit__c == ''
                    invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c == null ||
                    invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c == ''
        ) {
          ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
        } else {
          ass.esd.Invoice_Unit__c = invoiceorderdet1CountMap.get(
              ass.esd.Asset_Model_No__c
            )
            .Invoice_Unit__c;
                    ass.esd.Invoice_Unit__c = invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoice_Unit__c;
        }
        if (
          invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
            .Invoiced_Count__c == null ||
          invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c)
            .Invoiced_Count__c == 0
                    invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c == null ||
                    invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c == 0
        ) {
          ass.invoiceCount = ass.esd.Invoiced_Count__c;
        } else {
          ass.invoiceCount = invoiceorderdet1CountMap.get(
              ass.esd.Asset_Model_No__c
            )
            .Invoiced_Count__c;
                    ass.invoiceCount = invoiceorderdet1CountMap.get(ass.esd.Asset_Model_No__c).Invoiced_Count__c;
        }

        if (ass.esd.Box_Piece__c == '盒' && ass.esd.Invoice_Unit__c == '个') {
          ass.esd.Invoice_Unitprice__c =
            ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
                    ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
        } else {
          ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
        }
        Decimal invoiceAllprice = 0.00;
        invoiceAllprice = (ass.invoiceCount * ass.esd.Invoice_Unitprice__c)
          .setScale(2);
                invoiceAllprice = (ass.invoiceCount * ass.esd.Invoice_Unitprice__c).setScale(2);
        ass.invoiceAllprice = invoiceAllprice;
      } else {
        ass.invoiceCount = ass.esd.InvoiceProNot_count__c;
@@ -182,28 +148,15 @@
  }

  @AuraEnabled
  public static ResponseBodyLWC save(
    String consumableorderdetails1RecordsLwc,
    String invoiceIdLwc,
    String orderIdLwc
  ) {
    system.debug(
      'consumableorderdetails1RecordsLwc:' + consumableorderdetails1RecordsLwc
    );
    public static ResponseBodyLWC save(String consumableorderdetails1RecordsLwc,String invoiceIdLwc,String orderIdLwc) {
    ResponseBodyLWC res = new ResponseBodyLWC();
    Map<String, object> data = new Map<String, object>();
    res.entity = data;

    consumableorderdetails1Records = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
      consumableorderdetails1RecordsLwc,
      List<ConsumableorderdetailsInfo>.class
    );

        consumableorderdetails1Records= (List<ConsumableorderdetailsInfo>)JSON.deserialize(consumableorderdetails1RecordsLwc, List<ConsumableorderdetailsInfo>.class);
    invoiceId = invoiceIdLwc;
    orderId = orderIdLwc;
    System.debug(
      'consumableorderdetails1Records = ' + consumableorderdetails1Records
    );
        System.debug('consumableorderdetails1Records = ' + consumableorderdetails1Records);
    System.debug('invoiceId = ' + invoiceId);
    System.debug('orderId = ' + orderId);

@@ -248,15 +201,11 @@
          Box_Piece__c,
          Invoicedet1_OD_link__c
        FROM Consumable_Orderdetails__c
        WHERE
          Consumable_order__c = :invoiceId
          AND Invoicedet1_OD_link__c = :orderId
          AND Asset_Model_No__c IN :consumableorderList
                WHERE Consumable_order__c = :invoiceId AND Invoicedet1_OD_link__c = :orderId AND Asset_Model_No__c IN :consumableorderList
      ];
      for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
        invoiceordet1Map.put(
          invoiceorderdetails1[i].Invoicedet1_OD_link__c +
          invoiceorderdetails1[i].Asset_Model_No__c,
                    invoiceorderdetails1[i].Invoicedet1_OD_link__c + invoiceorderdetails1[i].Asset_Model_No__c,
          invoiceorderdetails1[i]
        );
      }
@@ -294,30 +243,16 @@
            return new ResponseBodyLWC('Error', 500, '请输入发票数量！', '');
          }
          if (ass.esd.Box_Piece__c == '盒' && ass.esd.Invoice_Unit__c == '个') {
            if (
              ass.invoiceCount >
              (ass.esd.InvoiceProNot_count__c * ass.Packing_list_manual)
                .setScale(0)
            ) {
                        if (ass.invoiceCount > (ass.esd.InvoiceProNot_count__c * ass.Packing_list_manual).setScale(0)) {
              // ass.esd.InvoiceProNot_count__c.addError('发票数量不能超过还没发票数量！');
              // return null;
              return new ResponseBodyLWC(
                'Error',
                500,
                '发票数量不能超过还没发票数量！',
                ''
              );
                            return new ResponseBodyLWC('Error', 500, '发票数量不能超过还没发票数量！', '');
            }
          } else {
            if (ass.invoiceCount > ass.esd.InvoiceProNot_count__c) {
              // ass.esd.InvoiceProNot_count__c.addError('发票数量不能超过还没发票数量！');
              // return null;
              return new ResponseBodyLWC(
                'Error',
                500,
                '发票数量不能超过还没发票数量！',
                ''
              );
                            return new ResponseBodyLWC('Error', 500, '发票数量不能超过还没发票数量！', '');
            }
          }

@@ -330,60 +265,26 @@
          }
          //}

          if (
            invoiceordet1Map.containsKey(
              ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
            )
          ) {
            invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
              .Shipment_Count__c = ass.invoiceCount;
            invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
              .Invoiced_Count__c = ass.invoiceCount;
                    if (invoiceordet1Map.containsKey(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)) {
                        invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Shipment_Count__c = ass.invoiceCount;
                        invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Invoiced_Count__c = ass.invoiceCount;
            //invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c = invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Delivery_List_RMB__c * ass.invoiceCount;
            invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
                        invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)
              .Invoice_Unit__c = ass.esd.Invoice_Unit__c;
            invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
              .Box_Piece__c = ass.esd.Box_Piece__c;
            if (
              ass.esd.Box_Piece__c == '盒' &&
              ass.esd.Invoice_Unit__c == '个'
            ) {
              invoiceordet1Map.get(
                    ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
                  )
                  .InvoicedProCost_RMB__c =
                (ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual) *
                ass.invoiceCount;
              invoiceordet1Map.get(
                    ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
                  )
                  .Invoice_Unitprice__c =
                        invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Box_Piece__c = ass.esd.Box_Piece__c;
                        if (ass.esd.Box_Piece__c == '盒' && ass.esd.Invoice_Unit__c == '个') {
                            invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c =
                                (ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual) * ass.invoiceCount;
                            invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).Invoice_Unitprice__c =
                ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
            } else {
              invoiceordet1Map.get(
                    ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
                  )
                  .InvoicedProCost_RMB__c =
                            invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c).InvoicedProCost_RMB__c =
                ass.esd.Delivery_List_RMB__c * ass.invoiceCount;
              invoiceordet1Map.get(
                  ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
                )
                            invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)
                .Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
            }

            invoiceorderUpList1.add(
              invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
            );
                        invoiceorderUpList1.add(invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c));
            invoiceRecordscon++;
          } else {
            String str = string.valueOf(invoiceRecordscon);
@@ -396,22 +297,15 @@
            invoiceInsert1.Name =
              invoicecode.Name +
              '-' +
              ass.esd.Name.substring(
                ass.esd.Name.length() - 7,
                ass.esd.Name.length()
              );
                            ass.esd.Name.substring(ass.esd.Name.length() - 7, ass.esd.Name.length());
            invoiceInsert1.Shipment_Count__c = ass.invoiceCount;
            invoiceInsert1.Consumable_Product__c = ass.esd.Consumable_Product__c;
            invoiceInsert1.Intra_Trade_List_RMB__c = ass.esd.Intra_Trade_List_RMB__c;
            invoiceInsert1.Delivery_List_RMB__c = ass.esd.Delivery_List_RMB__c;
            invoiceInsert1.Dealer_Custom_Price__c = ass.esd.Dealer_Custom_Price__c;
            invoiceInsert1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
            if (
              ass.esd.Box_Piece__c == '盒' &&
              ass.esd.Invoice_Unit__c == '个'
            ) {
              invoiceInsert1.Invoice_Unitprice__c =
                ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
                        if (ass.esd.Box_Piece__c == '盒' && ass.esd.Invoice_Unit__c == '个') {
                            invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c / ass.Packing_list_manual;
            } else {
              invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
            }
@@ -423,24 +317,15 @@
            invoiceInsert1.Invoiced_Count__c = ass.invoiceCount;
            if (ass.esd.InvoicedProCost_RMB__c == null)
              ass.esd.InvoicedProCost_RMB__c = 0;
            invoiceInsert1.InvoicedProCost_RMB__c =
              ass.invoiceCount * invoiceInsert1.Invoice_Unitprice__c;
                        invoiceInsert1.InvoicedProCost_RMB__c = ass.invoiceCount * invoiceInsert1.Invoice_Unitprice__c;
            invoiceInsert1.Consumable_order__c = invoiceId;
            invoiceInsert1.Invoicedet1_OD_link__c = orderId;
            invoiceRecordscon++;
            invoiceorderList1.add(invoiceInsert1);
          }
        } else {
          if (
            invoiceordet1Map.containsKey(
              ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
            )
          ) {
            invoiceorderDeList1.add(
              invoiceordet1Map.get(
                ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c
              )
            );
                    if (invoiceordet1Map.containsKey(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c)) {
                        invoiceorderDeList1.add(invoiceordet1Map.get(ass.esd.Consumable_order__c + ass.esd.Asset_Model_No__c));
          }
        }
      }
@@ -458,12 +343,7 @@
      ApexPages.addmessages(e);
      // Database.rollback(sp);
      // return null;
      return new ResponseBodyLWC(
        'Error',
        500,
        e.getMessage() + ' ' + e.getLineNumber(),
        ''
      );
            return new ResponseBodyLWC('Error', 500, e.getMessage() + ' ' + e.getLineNumber(), '');
    }
    res.status = 'Success';
    res.code = 200;

 force-app/main/default/classes/LexConsumableAccountController.cls

@@ -244,20 +244,29 @@
            AggregateResult[] arList = null;

            System.debug('fiscalYear = ' + fiscalYear);
            System.debug('thisYear = ' + thisYear);
            System.debug('lastYear = ' + lastYear);

            if (fiscalYear == 'thisYear') {
                AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(thisDatetime, nextDatetime);
                if(saleAmountList[0].get('saleAmount') != null){
                topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                }
                arList = LexConsumableAccountSOQL.getAccountBySales(thisDatetime, nextDatetime);
            } else if (fiscalYear == 'lastYear') {
                AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, thisDatetime2);
                if(saleAmountList[0].get('saleAmount') != null){
                topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                }
                arList = LexConsumableAccountSOQL.getAccountBySales(lastDatetime, thisDatetime2);
            } else {
                AggregateResult[] saleAmountList = LexConsumableAccountSOQL.getAccountTotalSales(lastDatetime, nextDatetime);
                if(saleAmountList[0].get('saleAmount') != null){
                topInfo.saleAmount = Decimal.valueOf(String.valueOf(saleAmountList[0].get('saleAmount')));
                System.debug('topInfo.saleAmount = ' + topInfo.saleAmount);
                }
                arList = LexConsumableAccountSOQL.getAccountBySales(lastDatetime, nextDatetime);
            }
            //查询客户信息（名称，省，县）

 force-app/main/default/classes/LexConsumableController.cls

@@ -1651,6 +1651,7 @@
        OSHFLG = OSHFLGStr;
        coc = (Consumable_order__c)JSON.deserialize(cocStr, Consumable_order__c.class);
        contactDealer = (List<String>)JSON.deserialize(contactDealerStr, List<String>.class);
        System.debug('consumableorderdetailsRecordsviewStr:'+consumableorderdetailsRecordsviewStr);
        consumableorderdetailsRecordsview = (List<ConsumableorderdetailsInfo>)JSON.deserialize(consumableorderdetailsRecordsviewStr, List<ConsumableorderdetailsInfo>.class);
        if(coc.Offers_Price__c != null){
            String offerStr = String.valueOf(coc.Offers_Price__c);
@@ -2018,13 +2019,19 @@

    //删除附件
    @AuraEnabled
    public static Results deleteAtt(String contentVersionId){
    public static Results deleteAtt(String contentVersionId, String cocId){
        Results results = new Results();
        try {
            List<ContentVersion> cvInfo = [SELECT Id FROM ContentVersion WHERE FirstPublishLocationId = :cocId];
            ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
            String contentDocumentId = conVersion.ContentDocumentId;
            ContentDocument conDocument =  [SELECT Id FROM ContentDocument where Id = :contentDocumentId];
            delete conDocument;
            if(cvInfo.size() <= 1){
                Consumable_order__c c = [SELECT Id FROM Consumable_order__c WHERE Id =:cocId];
                c.Consumable_pdf_insert_day__c =null;
                update c;
            }
            results.result = 'Success';
        } catch (Exception e) {
            results.result = 'Fail';
@@ -2056,7 +2063,7 @@
        }
    }

    class ConsumableorderdetailsInfo implements Comparable {
    public class ConsumableorderdetailsInfo implements Comparable {
        @AuraEnabled
        public Boolean check { get; set; }
        @AuraEnabled

 force-app/main/default/classes/LexConsumableGoodsInfo.cls

@@ -21,19 +21,10 @@
                String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
                List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
                //20200916 ljh update start
                if(Test.isRunningTest()){
                    if(type !=null && type.equals('all')){
                        conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                    }else{
                        conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                    }
                    
                }else{
                    if(type !=null && type.equals('all')){
                        conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                    }else{
                        conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                    }
                }
                for(Consumable_order__c conorder : conorderlist){
                    String temp = (String)conorder.Id;
@@ -42,11 +33,8 @@
                System.debug('ANY o'+orderId);
            }
            List<Consumable_Orderdetails__c> conOrderList1 = new List<Consumable_Orderdetails__c>();
            if(Test.isRunningTest()){
                conOrderList1 = [SELECT Asset_Model_No__c ,Consumable_count__c FROM Consumable_Orderdetails__c];
            }else{

                conOrderList1 = [SELECT Asset_Model_No__c ,Consumable_count__c FROM Consumable_Orderdetails__c WHERE Consumable_order__c =:orderId];
            }
            
            Map<String,Decimal> allConOrderMap = new Map<String,Decimal>();
            for(Consumable_Orderdetails__c con : conOrderList1){
@@ -123,21 +111,11 @@
            String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
            List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
            //20200916 ljh update start
            if(Test.isRunningTest()){
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
                
            }else{
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
            }
            //20200916 ljh update end
            // List<Consumable_order__c> conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -151,9 +129,6 @@
            }
            System.debug('ANY o'+orderId);
            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
            if(Test.isRunningTest()){
                conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
            }else{
                //20200916 ljh update start
                //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                if(type !=null && type.equals('all')){
@@ -162,7 +137,6 @@
                    conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = true AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                }
                //20200916 ljh update end  
            }
            // List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
            Map<String,String> srtMap = new Map<String,String>();
            for(Consumable_order_details2__c con : conList){
@@ -227,21 +201,11 @@
            String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
            List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
            //20200916 ljh update start
            if(Test.isRunningTest()){
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation  and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
                
            }else{
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
            }
            //20200916 ljh update end
            // List<Consumable_order__c> conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -255,9 +219,6 @@
            }
            System.debug('ANY o'+orderId);
            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
            if(Test.isRunningTest()){
                conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
            }else{
                //20200916 ljh update start
                //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                if(type !=null && type.equals('all')){
@@ -266,7 +227,6 @@
                    conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                }
                //20200916 ljh update end   
            }
            // List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
            Map<String,String> srtMap = new Map<String,String>();
            for(Consumable_order_details2__c con : conList){
@@ -396,21 +356,11 @@
            String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
            List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
            //20200916 ljh update start
            if(Test.isRunningTest()){
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
                
            }else{
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
            }
            //20200916 ljh update end
            // List<Consumable_order__c> conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and Delivery_detail_count__c > 0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
@@ -424,9 +374,6 @@
            }
            System.debug('ANY o'+orderId);
            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
            if(Test.isRunningTest()){
                conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
            }else{
                //20200916 ljh update start
                //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE  Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                if(type !=null && type.equals('all')){
@@ -435,7 +382,6 @@
                    conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE  Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                }
                //20200916 ljh update end    
            }
            // List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
            Map<String,String> srtMap = new Map<String,String>();
            for(Consumable_order_details2__c con : conList){
@@ -534,21 +480,11 @@
            String rtTypeDelivery = System.Label.RT_ConOrder_Delivery;
            List<Consumable_order__c> conorderlist = new List<Consumable_order__c>();
            //20200916 ljh update start
            if(Test.isRunningTest()){
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c >= 0 or Delivery_detail_count__c >=0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation  and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >=0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
                
            }else{
                //conorderlist  = [select id,name,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation];
                if(type !=null && type.equals('all')){
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and (OrderNumber_notarrive__c > 0 or Delivery_detail_count__c >0)  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }else{
                    conorderlist  = [select id,Owner.Name from Consumable_order__c where Order_type__c = '订单' and  recordtypeid = :rtTypeDelivery and Dealer_Info__c = :accountid and  Delivery_detail_count__c >0  and Order_ProType__c = :userPro_Type and Order_Owner_WorkLocal__c = :userWorklocation and showFalseNotshowTrue__c = false];
                }
            }
            system.debug('==============>conorderlist'+conorderlist);
            system.debug('==============>conorderlist'+conorderlist.size());
@@ -564,9 +500,6 @@
            }
            System.debug('ANY o'+orderId);
            List<Consumable_order_details2__c> conList = new List<Consumable_order_details2__c>();
            if(Test.isRunningTest()){
                conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c ];
            }else{
                //20200916 ljh update start
                //conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
                if(type !=null && type.equals('all')){
@@ -579,7 +512,6 @@
                    system.debug('notallconList==========='+conList.size());
                }
                //20200916 ljh update end   
            }
            // List<Consumable_order_details2__c> conList = [SELECT id,Bar_Code__c FROM Consumable_order_details2__c WHERE Dealer_Arrive__c = false AND Consumable_order_minor__c = :orderId AND Deliver_date__c < :orderdate AND recordtypeid = :System.Label.RT_ConOrderDetail2_Delivery];
            Map<String,String> srtMap = new Map<String,String>();
            for(Consumable_order_details2__c con : conList){

 force-app/main/default/classes/LexInventoryViewController.cls

@@ -32,7 +32,7 @@
    // };

    public static String[] proLimitAndDate = new List<String>{};
    private static Map<String, Date> productkucun = new Map<String, Date>();
    public static Map<String, Date> productkucun = new Map<String, Date>();
    public static List<SelectOption> categoryOptionList { get; set; }
    @AuraEnabled
    public static Map<String, String> categoryOptionMap { get; set; }
@@ -49,7 +49,7 @@
    public static String category1 { get; set; }
    public static Boolean editAble { get; set; }
    // ç»é”€å•†åœ¨åº“产品ID
    public static List<String> orderDetZaikuList = new List<String>();
    public static List<String> orderDetZaikuList{set;get;}
    // äº§å“ ID
    public static String ESetId { get; set; }
    public static String idCheck { get; set; }
@@ -69,6 +69,7 @@
    // add by rentx 2021-3-10

    public LexInventoryViewController() {
        orderDetZaikuList = new List<String>();
        consumableorderdetailsRecords = new List<ConsumableorderdetailsInfo>();
        consumableorderdetailsRecordsview = new List<List<ConsumableorderdetailsInfo>>();
        editAble = false;
@@ -407,9 +408,11 @@
        data.put('consumableorderdetailsRecords', consumableorderdetailsRecords);
        data.put('hasHos', hasHos);
        data.put('productLimtAndDate',proLimitAndDate);
        data.put('productkucun',productkucun);
        res.status = 'Success';
        res.code = 200;
        System.debug('res = ' + res);
        System.debug('productkucun = ' + productkucun);
        return res;
    }
    @AuraEnabled
@@ -528,15 +531,19 @@
        Integer pageSizeLWC,
        Integer pageTokenLWC,
        String sortFieldLWC,
        String sortOrderLWC
        String sortOrderLWC,
        Map<String, Date> productkucunLWC
    ) {
        try {
            System.debug('orderDetZaikuListLWC===>'+orderDetZaikuListLWC);
            System.debug('productkucun===>'+productkucun);
            pageSize = pageSizeLWC;
            pageToken = pageTokenLWC;
            sortField = sortFieldLWC;
            sortOrder = sortOrderLWC;
            productkucun =  new Map<String, Date>();
            orderDetZaikuList = new List<String>();
            productkucun = productkucunLWC;

            orderDetZaikuList = orderDetZaikuListLWC;
            sqlagencyProType = '%' + agencyProType + '%';
@@ -1051,6 +1058,7 @@
    }

    // Data Bean
    @TestVisible
    class ConsumableorderdetailsInfo implements Comparable {
        @AuraEnabled
        public Consumable_order_details2__c esd { get; set; }

 force-app/main/default/classes/LexOverdueStockController.cls

@@ -147,11 +147,12 @@
            }
            // return;
            System.debug('overduePageRecords = ' + overduePageRecords);
        System.debug('overdueList = ' + overdueList);
        data.put('overduePageRecords',JSON.serialize(overduePageRecords));
        data.put('codPageRecords',JSON.serialize(codPageRecords));
        data.put('iSinventory',iSinventory);
        data.put('overdueList',overdueList);
        res.status = 'Success';
        res.status = 'Success1';
        res.code = 200;
        // res.msg = '请输入BarCode号';
        System.debug('res = ' + res);
@@ -233,7 +234,7 @@
        StaticParameter.EscapeConsumableOrderDetail2Trigger = true;
        if(!iSinventory){
            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'请先点【BarCode录入】'));
            return new ResponseBodyLWC('Error',500, '请先录入BarCode', '');
            return new ResponseBodyLWC('Error',500, '请先点击获取明细', '');
            // return null;
        }
        integer Lo = 0;

 force-app/main/default/classes/LexSummonsCreatController.cls

@@ -245,11 +245,11 @@

    // ç”»é¢åˆå§‹åŒ–
    @AuraEnabled
    public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC) {
        // try {
    public static ResponseBodyLWC init(String ESetidJs, String statusEdit, Integer pageSizeLWC, Integer pageTokenLWC,String arriveorderLWC) {
        try {
        firstInit(ESetidJs);
        statusEdit = statusEdit;
        arriveorder = '';
            arriveorder = arriveorderLWC;
        HospitalName = '';
        provinceOpts = new List<SelectOption>();
        provinceOptsMap = new Map<String, String>();
@@ -1393,9 +1393,9 @@
        res.code = 200;
        System.debug('res = ' + res);
        return res;
        // } catch (Exception e) {
        //     return new ResponseBodyLWC('Error',500, e.getMessage(), '');
        // }
        } catch (Exception e) {
            return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
        }
    }

    @AuraEnabled
@@ -1698,6 +1698,7 @@
        data.put('paginatedAccounts', paginatedAccounts);
        data.put('pageRecords', pageRecordsTemp);
        data.put('SearchDone', SearchDone);
        data.put('hasHosPro', hasHosPro);
        res.status = 'Success';
        res.code = 200;
        System.debug('res = ' + res);
@@ -2177,22 +2178,19 @@
            for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
                if (ass.check == true) {
                    if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入正确的出货单价 (元)');
                        // return null;
                        return new ResponseBodyLWC('Error', 500, '请输入正确的出货单价 (元)', '');
                    }
                    if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '医院试用') {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入出货单价 (元)');
                        // return null;
                        return new ResponseBodyLWC('Error', 500, '请输入正确的出货单价 (元)', '');
                    }
                    if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '医院试用') {
                        return new ResponseBodyLWC('Error', 500, '请输入出货单价 (元)', '');
                    }
                    if (
                        ass.orderdetails1.Delivery_List_RMB__c == 0 &&
                        (coc.SummonsForDirction__c == '销售给二级经销商' ||
                        coc.SummonsForDirction__c == '直接销售给医院')
                    ) {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入出货单价 (元)');
                        // return null;
                        return new ResponseBodyLWC('Error', 500, '请输入出货单价 (元)', '');
                    }
                    if (ass.orderdetails1.Shipment_Count__c == null || ass.orderdetails1.Shipment_Count__c == 0) {
@@ -2340,14 +2338,10 @@
            for (ConsumableorderdetailsInfoLwc ass : pageRecordsLwc) {
                if (ass.check == true) {
                    if (ass.orderdetails1.Delivery_List_RMB__c < 0) {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入正确的出货单价 (元)');
                        // return null;
                        return new ResponseBodyLWC('Error', 500, '请输入正确的出货单价 (元)', '');
                    }
                    Consumable_orderdetails__c InsAfterDel = new Consumable_orderdetails__c();
                    if (ass.orderdetails1.Delivery_List_RMB__c == null && coc.SummonsForDirction__c != '医院试用') {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入出货单价 (元)');
                        // return null;
                    if ((ass.orderdetails1.Delivery_List_RMB__c == null || ass.orderdetails1.Delivery_List_RMB__c == 0) && coc.SummonsForDirction__c != '医院试用') {
                        return new ResponseBodyLWC('Error', 500, '请输入出货单价 (元)', '');
                    }
                    if (
@@ -2355,8 +2349,6 @@
                        (coc.SummonsForDirction__c == '销售给二级经销商' ||
                        coc.SummonsForDirction__c == '直接销售给医院')
                    ) {
                        // ass.orderdetails1.Delivery_List_RMB__c.addError('请输入出货单价 (元)');
                        // return null;
                        return new ResponseBodyLWC('Error', 500, '请输入出货单价 (元)', '');
                    }
                    if (ass.orderdetails1.Box_Piece__c == null || ass.orderdetails1.Box_Piece__c == '') {
@@ -2695,6 +2687,20 @@
        return res;
    }

    //删除附件
    @AuraEnabled
    public static ResponseBodyLWC deleteAtt(String contentVersionId){
        try {
            ContentVersion conVersion = [SELECT ContentDocumentId FROM ContentVersion WHERE Id = :contentVersionId];
            String contentDocumentId = conVersion.ContentDocumentId;
            ContentDocument conDocument =  [SELECT Id FROM ContentDocument where Id = :contentDocumentId];
            delete conDocument;
            return new ResponseBodyLWC('Success',200,'','');
        } catch (Exception e) {
            return new ResponseBodyLWC('Error',500, e.getMessage() + e.getLineNumber(), '');
        }
    }

    //跳转出货/销售
    @AuraEnabled
    public static ResponseBodyLWC GoodsDelivery(

 force-app/main/default/classes/LexUpAccountProLimit.cls

@@ -24,6 +24,7 @@
        system.debug('userPro_Type' + userPro_Type);
        String checkResoultstr =  checkResoult(productLimit);
        system.debug('checkResoultstr====>'+checkResoultstr);
        system.debug('accountId'+accountId);
        if(String.isNotBlank(checkResoultstr)){
            return new ResponseBodyLWC('Error',500,''+checkResoultstr+'', '');
            // return checkResoultstr;
@@ -44,14 +45,15 @@
        ];
        if(null == acc || acc.size() == 0) {
            // return '没有经销商：' + accountId + '的数据。';
            return new ResponseBodyLWC('Error',500,'没有经销商：' + accountId + '的数据', '');
            return new ResponseBodyLWC('Error',500,'没有经销商：' + accountId + '的数据。', '');
        }
        //proidList = acc[0].view_product__c.split(',');
        //--------UpdateStart-----XHL--------------20180929-------------
        String sql = '';
        List<Product2__c> roduct2List = [SELECT Asset_Model_No__c
      
        List<Product2__c> roduct2List = [SELECT Asset_Model_No__c,Estimation_Entry_Possibility__c
                                          FROM Product2__c  
                                          WHERE Product_Type__c like :userPro_Typestr limit 10000];//Add Limit by Li Jun 20230601, need to remove limit later
        WHERE Product_Type__c like :userPro_Typestr and Estimation_Entry_Possibility__c = '○'];//Add  by WangXueqin 20230605
        //ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR,'roduct2List:'+ roduct2List));
        //sql = 'SELECT Asset_Model_No__c '
        //    + ' FROM Product2__c '
@@ -81,7 +83,7 @@
        for(Integer i = 0; i < pro_List.size(); i++){
            if(!productMap.containsKey(pro_List[i])){
                // return '经销商没有 ' + pro_List[i] + ' çš„产品上限设定权限，或产品不存在！';
                return new ResponseBodyLWC('Error',500,'经销商没有 ' + pro_List[i] + ' çš„产品上限设定权限，或产品不存在', '');
                return new ResponseBodyLWC('Error',500,'经销商没有 ' + pro_List[i] + ' çš„产品上限设定权限，或产品不存在！', '');
            }
        }
        String  productLimitDa = '';
@@ -134,7 +136,7 @@
            }
        }
        if(asstModelNoCount.size() > 0){
            return '产品：' + asstModelNoCount + '的数据重复';
            return '产品：' + asstModelNoCount + '的数据重复。';
            // return new ResponseBodyLWC('Error',500,'产品：' + asstModelNoCount + '的数据重复。', '');
        }else{
            return '';

 force-app/main/default/experiences/Consumable1.site-meta.xml

 force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json

@@ -1,37 +1,33 @@
{
  "definitionName": "prm:branding-prm-merged",
  "id": "57ae3440-8896-4020-a05b-a780ddaf46f0",
  "id" : "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
  "label": "Partner Central",
  "type": "brandingSet",
  "values": {
    "ActionColor": "rgb(10, 129, 223)",
    "BorderColor": "rgb(212, 212, 212)",
    "CardBackgroundColor": "rgba(244, 244, 244, 0)",
    "CompanyLogo": "/file-asset/servlet1?v=1&height=300&width=300",
    "BorderColor" : "#D4D4D4",
    "CardBackgroundColor" : "rgba(255, 255, 255, 0)",
    "CompanyLogo" : "/file-asset/OlympusCommunityLogo?v=1&height=300&width=300",
    "DetailTextColor": "rgb(51, 51, 51)",
    "ErrorFontColor": "rgb(224, 75, 32)",
    "HeaderBackgroundColor": "rgb(255, 255, 255)",
    "HeaderFonts": "sans-serif",
    "ErrorFontColor" : "#ff9e9e",
    "HeaderBackgroundColor" : "#FFFFFF",
    "HeaderFonts" : "Salesforce Sans",
    "LinkColor": "rgb(37, 116, 169)",
    "LoginBackgroundColor": "rgb(216, 233, 229)",
    "LoginBackgroundImage": "/file-asset/LEXCommunityLogin?v=1",
    "LoginButtonBorderColor": "#5d392e",
    "LoginButtonColor": "#202834",
    "LoginButtonHoverBorderColor": "#4f748b",
    "LoginButtonHoverColor": "#89644c",
    "LoginBackgroundColor" : "#F4F4F4",
    "LoginBackgroundImage" : "/file-asset/OlympusCommunityLoginBG?v=1",
    "NavigationMenuColor": "rgb(8, 16, 132)",
    "NavigationMenuTextColor": "rgb(255, 255, 255)",
    "OverlayTextColor": "rgb(255, 255, 255)",
    "PageBackgroundColor": "rgb(255, 255, 255)",
    "NavigationMenuTextColor" : "#FFFFFF",
    "OverlayTextColor" : "#FFFFFF",
    "PageBackgroundColor" : "#FFFFFF",
    "PrimaryFont": "sans-serif",
    "TextColor": "rgb(51, 51, 51)",
    "TextColor" : "#222222",
    "TextTransformStyle": "none",
    "_ActionColorDarker": "#0865ae",
    "_ActionColorTrans": "rgba(10, 129, 223, 0.9)",
    "_BackgroundColor1": "rgb(235, 235, 235)",
    "_BackgroundColor2": "rgb(194, 194, 194)",
    "_BackgroundColor3": "rgb(133, 133, 133)",
    "_DxpPageBackgroundColor": "rgb(255, 255, 255)",
    "_DxpPageBackgroundColor" : "#FFFFFF",
    "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
    "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
    "_HeaderTextColor": "rgba(34,34,34,.8)",
@@ -46,14 +42,14 @@
    "_NeutralForegroundColor1": "#000",
    "_NeutralForegroundColor2": "#000",
    "_NeutralForegroundColor3": "#fff",
    "_OverlayTextColorShadow": "#000",
    "_OverlayTextColorShadow" : "#000000",
    "_PrimaryAccentColor1": "rgb(8, 106, 184)",
    "_PrimaryAccentColor2": "rgb(5, 61, 106)",
    "_PrimaryAccentColor3": "rgb(0, 0, 0)",
    "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
    "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
    "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
    "_TextColor1": "rgb(31, 31, 31)",
    "_TextColor1" : "rgb(14, 14, 14)",
    "_TextColor2": "rgb(0, 0, 0)",
    "_TextColor3": "rgb(0, 0, 0)"
  }

 force-app/main/default/experiences/Consumable1/config/consumableϵͳ.json

@@ -1,11 +1,11 @@
{
  "forgotPasswordRouteId": "696dc6cc-2e29-4d91-8947-826d95506b8b",
  "forgotPasswordRouteId" : "543c3ca6-a340-46d3-a25b-82ce3864cf02",
  "isAvailableToGuests": false,
  "isFilteredComponentsView": false,
  "isProgressiveRenderingEnabled": false,
  "loginAppPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "mainAppPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "loginAppPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "mainAppPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "preferredDomain": "none",
  "selfRegistrationRouteId": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
  "selfRegistrationRouteId" : "2d8061dd-a482-4608-8514-113389805fc4",
  "type": "site"
}

 force-app/main/default/experiences/Consumable1/config/languages.json

@@ -1,6 +1,6 @@
{
  "defaultCode": "zh_CN",
  "defaultLabel": "中文（简体） (CN)",
  "id": "50b82dc6-9079-40b8-aa74-c83564656d96",
  "id" : "574943f7-c68f-4a1b-9b77-b2154af650ab",
  "type": "languageContainer"
}

 force-app/main/default/experiences/Consumable1/config/loginAppPage.json

@@ -1,6 +1,6 @@
{
  "cmsSettings": {},
  "id": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "label": "login",
  "templateName": "Login Template",
  "type": "appPage"

 force-app/main/default/experiences/Consumable1/config/mainAppPage.json

@@ -1,8 +1,8 @@
{
  "cmsSettings": {},
  "currentThemeId": "0c81955a-9ad5-4639-a11d-03665e570a65",
  "headMarkup": "<script>\n    var homeWindowLocation = '/consumable/s/';\n    window.onload = function() {\n        console.log('URL' +window.location.pathname);\n        if(homeWindowLocation ==window.location.pathname ){\n            console.log('refresh dashboard');\n            setTimeout(\n                function() {\n                    let refreshButtonElement = document.getElementsByTagName('iframe')[0].contentWindow.document.getElementsByTagName('button')[0];\n                    console.log('Refresh:'+refreshButtonElement);\n                    refreshButtonElement.click();\n                }, 10000);\n        }\n\t};\n\t\n</script>",
  "id": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "currentThemeId" : "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
  "headMarkup" : "<script>\n    var homeWindowLocation = '/consumable/s/';\n    window.onload = function() {\n        console.log('URL' +window.location.pathname);\n        if(homeWindowLocation ==window.location.pathname ){\n            console.log('refresh dashboard');\n            setTimeout(\n                function() {\n                    let refreshButtonElement = document.getElementsByTagName('iframe')[0].contentWindow.document.getElementsByTagName('button')[0];\n                    console.log('Refresh:'+refreshButtonElement);\n                    refreshButtonElement.click();\n                }, 10000);\n        }\n       \n\t};\n\t\n</script>",
  "id" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "isRelaxedCSPLevel": true,
  "label": "main",
  "templateName": "PRM Community Template",

 force-app/main/default/experiences/Consumable1/routes/accountManagement.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "fd91a176-37cc-4c72-887d-8a32f8472825",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "4160137e-e9a7-47f3-8f55-2a7a6f94dacb",
  "activeViewId" : "198e4bed-7a3a-4a56-a15a-d354e55d5624",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "a5aefe6e-da20-437c-8ff9-ef31a22b8d4a",
  "label": "Account Management",
  "routeType": "account-management",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/cIC¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/cICévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/campaignList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "4908488d-d41c-4c3d-9f3e-c885a408863c",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "6b80aa5c-e10f-4760-82e4-c07fd6939d02",
  "activeViewId" : "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "cccb42f4-95dd-426f-a700-cbe4c839764c",
  "label": "Campaign List",
  "routeType": "list-701",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/caseDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "b17204f0-44a2-4866-abaf-23f750a97ddd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "f4887cf8-32fc-4d06-ab40-bbe055a26662",
  "activeViewId" : "3b1b2646-af41-43d3-a519-528aa49f45f4",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "4601c961-03a6-4646-9c14-5db8084e379a",
  "label": "Case Detail",
  "routeType": "detail-500",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/checkPassword.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id": "9c99cfbb-0aad-460f-9399-ef4943f6e535",
  "activeViewId" : "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "id" : "86273d15-52e6-4761-b84b-fd899e3def47",
  "label": "Check Password",
  "routeType": "check-password",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/contactSupport.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "8620c8eb-dd82-44a2-9c87-5fe5a029d55c",
  "activeViewId" : "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "1237083a-e1c5-44da-a3c1-cb1d6c3f762b",
  "label": "Contact Support",
  "pageAccess": "UseParent",
  "routeType": "contactsupport",

 force-app/main/default/experiences/Consumable1/routes/createRecord.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "a2259a30-2003-47b7-83a9-466f3e4d0aaf",
  "activeViewId" : "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "ea1db874-7a52-4702-afc8-f7d4b8dbae5c",
  "label": "Create Record",
  "routeType": "createrecord",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "47937364-e71b-469a-b996-317032189c45",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "c5c8d6ff-ac51-41b6-8508-a408ce244a7d",
  "activeViewId" : "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "7f941e81-8998-459a-a76b-93f5807e3db7",
  "label": "Dashboard Detail",
  "routeType": "detail-01Z",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/dashboardList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "b59c266b-a1ad-47f9-bf26-a8295147505c",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "677a2606-2502-4451-8e5e-9a903153d902",
  "activeViewId" : "f10a3529-b77e-4ebc-9b99-281160c97c7f",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "57493307-536a-4ebe-84db-00112d5e0e8d",
  "label": "Dashboard List",
  "routeType": "list-01Z",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/error.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "48f1f5ec-b27a-4874-83fa-15e857b27699",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "83bad28f-5c2c-4e3e-999c-5173c3d188dc",
  "activeViewId" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "2d27ac00-e60f-444a-8627-23c58e43d9ad",
  "label": "Error",
  "pageAccess": "UseParent",
  "routeType": "error",

 force-app/main/default/experiences/Consumable1/routes/feedDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "fefd7f80-945b-489b-8a4e-615884934641",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "e7141d9b-41ac-4475-918a-40364d069e55",
  "activeViewId" : "eb28719b-06b5-4397-bf8d-667ec408ca46",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "cfc32bfb-64dc-442c-9c4a-ed8a75b0b9cc",
  "label": "Feed Detail",
  "routeType": "feeditem-generic",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/fileDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "4b6624be-47a1-4c1c-932e-ba1661e492d2",
  "activeViewId" : "2322115a-ac65-4862-9104-912d42fca69a",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "b99c3313-97ee-4e8e-88e7-3156a4d86e82",
  "label": "File Detail",
  "routeType": "detail-069",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/fileList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "582cdc1b-b836-41bf-bc54-91e86a17b0aa",
  "activeViewId" : "193807a6-e99f-4075-9811-62dda5b13d43",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "b891df7c-7ecf-4a9c-92d4-8bb6107eb215",
  "label": "File List",
  "routeType": "list-069",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/flow.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "17c9c45c-4c81-49d0-985e-d6281d899320",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "366aef61-f77b-463e-9e3b-b64525248f29",
  "activeViewId" : "4aa9507c-1470-43b3-8000-390325f6bd7d",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "c8358de2-e646-44de-b2da-2424e96bea67",
  "label": "Flow",
  "pageAccess": "UseParent",
  "routeType": "flow",

 force-app/main/default/experiences/Consumable1/routes/forgotPassword.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id": "696dc6cc-2e29-4d91-8947-826d95506b8b",
  "activeViewId" : "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "id" : "543c3ca6-a340-46d3-a25b-82ce3864cf02",
  "label": "Forgot Password",
  "routeType": "forgot-password",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/groupDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "d65c3c39-9762-4205-b78a-8111168012f2",
  "activeViewId" : "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "ddfb3b5d-5ba5-4152-8103-754658eba70b",
  "label": "Group Detail",
  "routeType": "detail-0F9",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/groupList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "87a9b140-31e2-4c28-9fa4-82135022e59d",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "68d9196c-9eac-4f7c-b1ae-ad2eb703855c",
  "activeViewId" : "949c0ee3-6484-4ed7-a44f-aa417cec1835",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "34a31fa2-0d70-4d03-a4bd-d962306cb8e4",
  "label": "Group List",
  "routeType": "list-0F9",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/home.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "939c3a99-21d2-46b8-82dd-6713bce11e9c",
  "activeViewId" : "0b3166bc-2eec-43fa-8adf-532f629e9392",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "8e6532c1-df5e-4843-af7f-e01178398907",
  "label": "Home",
  "pageAccess": "UseParent",
  "routeType": "home",

 force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json

@@ -1,8 +1,8 @@
{
  "activeViewId": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "72138bd6-1956-4337-8eb3-3135b8091773",
  "label": "lexAgencyInfo",
  "activeViewId" : "376ad65a-00b6-4198-aa04-19a6360969bc",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "5e5ad0fe-6812-4fd0-9c56-bfce5822bf96",
  "label" : "LexAgencyInfo",
  "pageAccess": "UseParent",
  "routeType": "custom-lexagencyinfo",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "faabccd4-5e3b-4646-b626-6a85b751c910",
  "activeViewId" : "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "cbb28431-553a-49de-8f9d-0d297c0dd897",
  "label": "LexArriveGoods",
  "pageAccess": "UseParent",
  "routeType": "custom-lexarrivegoods",

 force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "8e439ddc-a758-4cba-a5f8-c3295fc7349a",
  "activeViewId" : "f46aba62-01c3-4a20-93c6-f9b2362717e6",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "372e3324-9c48-41ca-8e6d-4b349f076f65",
  "label": "LexArriveGoodsMain",
  "pageAccess": "UseParent",
  "routeType": "custom-lexarrivegoodsmain",

 force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "e067f74a-448c-4b0e-aeb3-e0fc8d4bd724",
  "activeViewId" : "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "c7a297cc-a883-4507-b04c-965b15d7d470",
  "label": "LexArriveGsDetails",
  "pageAccess": "UseParent",
  "routeType": "custom-lexarrivegsdetails",

 force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json

@@ -1,8 +1,8 @@
{
  "activeViewId": "b7569df4-3d59-4e39-9916-b444d62da530",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "9022f6fd-bd92-40a7-a7a8-11276aa04bda",
  "label": "lexCancelRemoveBox",
  "activeViewId" : "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "3289956a-758b-4222-898c-604d006a99fe",
  "label" : "LexCancelRemoveBox",
  "pageAccess": "UseParent",
  "routeType": "custom-lexcancelremovebox",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "a7d054c5-781a-4e86-8137-3d65615fd049",
  "activeViewId" : "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "40788493-ac31-4a30-b873-956597a23a37",
  "label": "LexConInvoiceView",
  "pageAccess": "UseParent",
  "routeType": "custom-lexconinvoiceview",

 force-app/main/default/experiences/Consumable1/routes/lexConsumable.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "92ab763f-0891-4b15-b0c9-6c769b8a00a1",
  "activeViewId" : "756785e1-4fb5-4ab3-b38a-58ea679a4361",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "0460cf80-25a2-4785-acb9-587a66def46e",
  "label": "LexConsumable",
  "pageAccess": "UseParent",
  "routeType": "custom-lexconsumable",

 force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "f724180a-789f-4a5f-909f-a3b6926cff21",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "790c190b-8bf4-4211-a8fb-172af3538e9f",
  "activeViewId" : "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "7db2303f-7e83-4c85-a7ad-12fa6672974b",
  "label": "LexConsumableAccount",
  "pageAccess": "UseParent",
  "routeType": "custom-lexconsumableaccount",

 force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "0b5b4633-9d43-4758-a5a1-7f3048846a66",
  "activeViewId" : "5d615179-dd62-4481-a874-de16a69d7374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "82091f6c-517f-4ee0-8ad2-8958cf953804",
  "label": "LexConsumableAccountInfoPrint",
  "pageAccess": "UseParent",
  "routeType": "custom-lexconsumableaccountinfoprint",

 force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "6335d5ad-ddd3-4fc4-b256-dd3fc662034f",
  "activeViewId" : "0c6f8778-bba4-4726-97f6-b639cce7c99e",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "17e0e204-7337-4cc3-8ae8-386f15253878",
  "label": "LexConsumableOrderManage",
  "pageAccess": "UseParent",
  "routeType": "custom-lexconsumableordermanage",

 force-app/main/default/experiences/Consumable1/routes/lexInventory.json

@@ -1,10 +1,10 @@
{
  "activeViewId": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "347e4abc-85c2-477d-ae7a-0ac5bfc0728f",
  "label": "lexInventory",
  "activeViewId" : "5a24538d-0a99-40a3-a6a1-4496d0333a05",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "465ce810-60bc-45a4-92f4-8148664ee531",
  "label" : "LexInventory",
  "pageAccess": "UseParent",
  "routeType": "custom-lex-inventory",
  "routeType" : "custom-lexinventory",
  "type": "route",
  "urlPrefix": "lexinventory"
}

 force-app/main/default/experiences/Consumable1/routes/lexInventoryView.json

 force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "2b760536-1491-4c8d-b0e3-f9972354708d",
  "activeViewId" : "e8224149-f1b9-4c44-8839-4d9737739c72",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "839786f7-032b-4c35-b6b3-7e5ad0de3ac3",
  "label": "LexOutboundorderImport",
  "pageAccess": "UseParent",
  "routeType": "custom-lexoutboundorderimport",

 force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "73006608-6ed7-459c-b9bc-14c6c16476f4",
  "activeViewId" : "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "2c0812bd-c08f-4e4a-980f-360b54f841c4",
  "label": "LexOverdueStock",
  "pageAccess": "UseParent",
  "routeType": "custom-lexoverduestock",

 force-app/main/default/experiences/Consumable1/routes/lexProductLimitEdit.json

 force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "06d0bb54-97e9-4556-a6ee-5e9c7e34633a",
  "activeViewId" : "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "f7bab43e-2170-4980-9b2c-126154272cb0",
  "label": "LexRemoveBox",
  "pageAccess": "UseParent",
  "routeType": "custom-lexremovebox",

 force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "62628d80-2d75-4a25-aeaf-a0ce85407a6b",
  "activeViewId" : "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "28c40941-a2fa-4f30-a790-936542b1cf84",
  "label": "LexSaleAndDelivery",
  "pageAccess": "UseParent",
  "routeType": "custom-lexsaleanddelivery",

 force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "4021ee9a-4769-4dac-af20-5099288bae35",
  "activeViewId" : "c2e9c913-ab1c-4b38-899b-136fb95066fb",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "94af1a52-11ac-4e16-8f30-f6fe250ccd1e",
  "label": "LexSummonsCreat",
  "pageAccess": "UseParent",
  "routeType": "custom-lexsummonscreat",

 force-app/main/default/experiences/Consumable1/routes/lexTopPage.json

@@ -1,8 +1,8 @@
{
  "activeViewId": "bda75bd7-499d-4d41-ad47-2d49173854dd",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "146bed7f-b8f1-4016-8a31-035874516b5d",
  "label": "lexTopPage",
  "activeViewId" : "09c93676-a531-4ba7-8708-cc47f8458c90",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "855eeb08-6e57-404b-a5f6-072349535002",
  "label" : "LexTopPage",
  "pageAccess": "UseParent",
  "routeType": "custom-lextoppage",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/login.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id": "bc26e928-8b62-4f80-9355-ef5553737e13",
  "activeViewId" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "id" : "c7457673-c277-4525-81e4-00da62b21ee0",
  "label": "Login",
  "routeType": "login-home",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/loginError.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id": "6b34ae60-30a7-46c8-8e80-657fa96816b1",
  "activeViewId" : "ba40442c-80fc-411f-8c02-9cfce2ab1372",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "id" : "b0404c8e-8a84-4ed9-800b-93e742025cef",
  "label": "Login Error",
  "routeType": "login-error",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "51554054-4eaf-44f6-96bd-b90145e6e078",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "f9897b41-4fb8-433e-8895-82e47d6aa298",
  "activeViewId" : "b253bc1d-fe4a-4156-91f4-88f4725a3616",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "3e75febe-ff75-4d4f-841d-28dc994a1da1",
  "label": "MDF and Coop",
  "routeType": "mdf",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/messages.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "3929da47-f3e6-42a7-ad00-269ea899171d",
  "activeViewId" : "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "93d1b5dd-fc4b-464f-b034-2321557eb837",
  "label": "Messages",
  "routeType": "messages",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/myAccount.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "25eab78c-263e-4a55-8bff-ad852efc15c9",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "ddfd00c8-3c1c-463c-a5d6-78a97c47b79f",
  "activeViewId" : "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "42a42c86-6517-4e0e-a630-be5ab221baf1",
  "label": "My Account",
  "routeType": "my-account",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/questionDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "d4ed7ed0-3745-461e-acd3-32108749ab93",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "a91ac3c9-aca5-4723-ae43-bc9c7f231015",
  "activeViewId" : "c29033d4-ea89-4311-9a8f-9b1cee010f96",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "d4e8748f-c126-4d7f-a4e8-43e4314bf361",
  "label": "Question Detail",
  "routeType": "feeditem",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "b076cb5b-405f-4199-b9be-7429234ce226",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "56d102f8-5197-4dca-a1d3-fec183274f67",
  "activeViewId" : "be244254-9e8f-46bd-83e0-a6cdb3780540",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "12cc102d-f664-49b7-8b25-c78d7939a8ed",
  "label": "Quip Docs Related List",
  "pageAccess": "UseParent",
  "routeType": "extrelated-quip",

 force-app/main/default/experiences/Consumable1/routes/recordDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "c8075095-c3fd-4d07-8079-0eb063287ad7",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "de9cd95e-59e4-4622-8f8d-8fdb3768da70",
  "activeViewId" : "d30889c1-09fc-407a-8d9d-155b305cce6f",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "63bae7d4-3412-48c3-9503-126a63811892",
  "label": "Record Detail",
  "routeType": "detail",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/recordList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "568148b6-8356-45bb-a31e-e8c320ff9726",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "4bb09a90-41cc-4630-a450-d8545941e231",
  "activeViewId" : "f14a9999-9077-4660-a62f-b9df05228f6c",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "b63deca7-c984-4812-9b2a-f757908981a0",
  "label": "Record List",
  "pageAccess": "UseParent",
  "routeType": "list",

 force-app/main/default/experiences/Consumable1/routes/register.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "id": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
  "activeViewId" : "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "id" : "2d8061dd-a482-4608-8514-113389805fc4",
  "label": "Register",
  "routeType": "self-register",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "172db5bf-c37b-4cee-853b-212bf73517d7",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "0bcea7b6-93f9-47b9-a354-7c6ecc13b22f",
  "activeViewId" : "2a182209-2527-4335-b672-176196ee6a0d",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "821d09c9-7732-4bb0-a002-f8fc3e825a20",
  "label": "Related Record List",
  "pageAccess": "UseParent",
  "routeType": "relatedlist",

 force-app/main/default/experiences/Consumable1/routes/reportBuilder.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "4cbb98c3-d712-4d7f-9516-d497244b5d7b",
  "activeViewId" : "059d5f4a-e616-4540-be96-a34b294fb2a4",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "20b2eb69-8eea-41f6-bef2-3a3e66f4ac0f",
  "label": "Report Builder",
  "routeType": "createreport",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/reportDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "a3d550e0-17da-410b-9046-20710587176d",
  "activeViewId" : "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "fbba1bbe-83b3-4711-ab64-131ca5bf8e4e",
  "label": "Report Detail",
  "routeType": "detail-00O",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/reportList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "f71c1609-6433-4cf0-8846-695e50897517",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "0334744b-2e69-4b21-bca0-46da443d17a2",
  "activeViewId" : "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "2f63d133-547c-46d3-ba43-4badc59db592",
  "label": "Report List",
  "routeType": "list-00O",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/resources.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "2feda9aa-a785-4e98-9448-352e28d95b34",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "d3935a4f-b947-4b06-aaa7-a435e32b0d8f",
  "activeViewId" : "dc215254-3731-423c-ba11-3d87746598e8",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "84243d63-bbfd-4642-8fc2-923d714ca322",
  "label": "Resources",
  "pageAccess": "UseParent",
  "routeType": "files",

 force-app/main/default/experiences/Consumable1/routes/search.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "99b69c91-c8d8-42fe-91af-6f71e4612910",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "0bc852e1-bd84-4ab4-a37a-a680a15378e6",
  "activeViewId" : "74aeae6d-8d40-433e-8168-45175ee356a6",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "a891eb3e-9e90-410a-9016-65f1ad0dc887",
  "label": "Search",
  "pageAccess": "UseParent",
  "routeType": "global-search",

 force-app/main/default/experiences/Consumable1/routes/streamDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "6d5ad4ec-9290-4748-81ac-d75e71699bbb",
  "activeViewId" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "363f8c18-dff6-46a3-91c7-f574cc32b412",
  "label": "Stream Detail",
  "routeType": "detail-0Fq",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/streamList.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "6ef6f17a-0dda-4824-8310-e283e961890f",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "328d83cb-799e-47d6-af05-0f3b2cd704e4",
  "activeViewId" : "e1275716-f06a-4a27-a667-19c49eefb083",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "fa6fe95d-1642-4d25-8690-9b9a1504e9a0",
  "label": "Stream List",
  "routeType": "list-0Fq",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/topicCatalog.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "710677ce-88c2-4a7c-83bd-2e1a6ccce33f",
  "activeViewId" : "3912430c-3c10-4bf3-bf37-5a619a596491",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "ecc9aeb9-aacd-4c2a-ab2e-e2e1befce726",
  "label": "Topic Catalog",
  "pageAccess": "UseParent",
  "routeType": "topic-catalog",

 force-app/main/default/experiences/Consumable1/routes/topicDetail.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "8f8238dc-8f81-4994-9933-b4dcb285776e",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "77f8e584-3870-49e2-86c8-08389b371d5f",
  "activeViewId" : "060ff5da-04b3-49de-8fb8-03decd8c188c",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "8a6adaa6-3a66-4924-aae5-ea1120239b86",
  "label": "Topic Detail",
  "routeType": "topic",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/userProfile.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "2245cd19-8057-487b-8284-d7f20c56e1f7",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "a6b8fa86-82fc-41af-ad13-7bd0f38d383e",
  "activeViewId" : "b3764d11-d26d-4554-8747-e7f30fb722bd",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "a611aa58-e18f-4242-882d-e91bc8977624",
  "label": "User Profile",
  "routeType": "detail-005",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/userSettings.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "7b23fd34-333f-4950-8543-98bea72908f6",
  "activeViewId" : "8225f2be-2536-4868-afe9-ed11e1c1eb15",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "cf47d325-829c-4ce7-a2b3-2440777f63c4",
  "label": "User Settings",
  "routeType": "usersettings",
  "type": "route",

 force-app/main/default/experiences/Consumable1/routes/ÒDZí°åévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/ѧ»á?ÅàѵԔ¼š.json

 force-app/main/default/experiences/Consumable1/routes/ѧ»á?ÅàѵévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/С×éévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/±¨±íévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/ÎļþévßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/Á÷évßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/ÏûºÄÆ·¶©µ¥Áбí.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "c331401c-5c71-4d88-9350-c5e8a79202c5",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "0bc8b231-a663-4b31-8bc2-7b3e5e625d81",
  "activeViewId" : "293921b6-1a37-49a3-a225-be2f3471a41c",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "9d3bd2d5-0b87-4b44-adad-6044a25d08aa",
  "label": "消耗品订单 åˆ—表",
  "objectApiName": "Consumable_order__c",
  "routeType": "list-a2K",

 force-app/main/default/experiences/Consumable1/routes/ÏûºÄÆ·¶©µ¥Ïà¹ØÁбí.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "3dd9b830-a644-429b-8b1c-e2770454179a",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "1c5bbf6d-ddab-45f3-a882-a7bac3128a9f",
  "activeViewId" : "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "34031253-cc77-4f4e-8baf-c77ca2b9cc2a",
  "label": "消耗品订单 ç›¸å…³åˆ—表",
  "objectApiName": "Consumable_order__c",
  "routeType": "relatedlist-a2K",

 force-app/main/default/experiences/Consumable1/routes/ÏûºÄÆ·¶©µ¥ÏêϸÐÅÏ¢.json

@@ -1,7 +1,7 @@
{
  "activeViewId": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "id": "7283136d-99d5-4982-bb41-02e2ebc00e5a",
  "activeViewId" : "edf32642-ece4-4435-94c9-82eb6b8f67a9",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "id" : "e7af9c90-036b-4cee-921f-06d6ef72f826",
  "label": "消耗品订单 è¯¦ç»†ä¿¡æ¯",
  "objectApiName": "Consumable_order__c",
  "routeType": "detail-a2K",

 force-app/main/default/experiences/Consumable1/routes/Óû§¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/routes/Óû§évßB¥ê¥¹¥È.json

 force-app/main/default/experiences/Consumable1/themes/partnerCentral.json

@@ -1,41 +1,35 @@
{
  "activeBrandingSetId": "57ae3440-8896-4020-a05b-a780ddaf46f0",
  "customCSS": ".siteforcePrmBody .cHeader .cBrandingLogo{\n    width: 140px !important;\n    height: 40px !important;\n}\n\n.siteforcePrmBody .comm-navigation{\n    min-height:48px !important;\n}\n\n.siteforcePrmBody .comm-navigation .comm-navigation__item a, .siteforcePrmBody .comm-navigation .comm-navigation__item button{\n    font-size:20px;\n}\n\ncAltToggleNav slds-icon_x-small{\n    display:none;\n}\n\n.salesforceIdentityLoginBody2 .cCenterPanel{\n    left:200px;\n    top:-30px;\n    min-width:320px !important;\n}\n.salesforceIdentityLoginForm2 .inputBox{\n     min-width:180px !important;\n}\n\n.siteforcePrmBody .cHeader .forceSearchInputDesktop input, .siteforcePrmBody .cHeader .forceSearchInputDesktop input::placeholder{\n    font-size:14px !important;\n}",
  "activeBrandingSetId" : "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
  "customCSS" : ".siteforcePrmBody .cHeader .cBrandingLogo{\n    width: 140px !important;\n    height: 40px !important;\n    pointer-events:none;\n}\n\n.siteforcePrmBody .comm-navigation{\n    min-height:48px !important;\n}\n\n.siteforcePrmBody .comm-navigation .comm-navigation__item a, .siteforcePrmBody .comm-navigation .comm-navigation__item button{\n    font-size:20px;\n}\n\ncAltToggleNav slds-icon_x-small{\n    display:none;\n}\n\n.salesforceIdentityLoginBody2 .cCenterPanel{\n    left:200px;\n    top:-30px;\n    min-width:320px !important;\n}\n.salesforceIdentityLoginForm2 .inputBox{\n     min-width:180px !important;\n}\n\n.siteforcePrmBody .cHeader .forceSearchInputDesktop input, .siteforcePrmBody .cHeader .forceSearchInputDesktop input::placeholder{\n    font-size:14px !important;\n}\n.slds-button_icon-more{\n    display:none;\n}\na.slds-button{\n    display:none;\n}\n\n.forcePageBlockItemView .slds-form-element .slds-button_icon {\n    display: none;\n}\n.siteforcePrmBody .forceCommunityRecordDetail .forceRecordLayout .forcePageBlockSectionView .full.forcePageBlockItemView{\n    pointer-events:none\n}\n\n.slds-nav-vertical__title{\n    display:none;\n}\n.slds-nav-vertical__title:first-of-type {\n    display: block;\n}\n.slds-nav-vertical .slds-nav-vertical__section.navItems.entityItems:nth-child(3){\n    display: none!important;\n}",
  "developerName": "prm",
  "id": "0c81955a-9ad5-4639-a11d-03665e570a65",
  "id" : "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
  "label": "Partner Central",
  "layouts": {
    "Inner": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
    "Login": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
    "ServiceNotAvailable": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97"
    "Inner" : "27b0f619-7930-4846-b53d-3eb904a52e9e",
    "Login" : "d5b47306-6295-4d2d-a5d9-cb373be9c125",
    "ServiceNotAvailable" : "1ed3aeb9-9205-4229-bfb0-71096321a26b"
  },
  "type": "theme",
  "views": [
    {
  "views" : [ {
      "componentAttributes": {},
      "componentName": "salesforceIdentity:loginBody2",
      "id": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
    "id" : "d5b47306-6295-4d2d-a5d9-cb373be9c125",
      "label": "Login",
      "regions": [
        {
          "id": "a91c3512-ae18-4751-bcf0-80e8cd355d9b",
    "regions" : [ {
      "id" : "74f03049-e17f-419d-b642-3406729e5ffe",
          "regionName": "header",
          "type": "region"
        },
        {
          "id": "b788957d-6263-4d64-8491-97ea0a5187a4",
    }, {
      "id" : "0744fcb0-7421-49a4-8a25-eef41dc46740",
          "regionName": "content",
          "type": "region"
        },
        {
          "id": "ba3b541d-6631-437f-a979-432ff99fdd30",
    }, {
      "id" : "74aa9402-e6be-4155-9d62-225d117a1754",
          "regionName": "footer",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    },
    {
  }, {
      "componentAttributes": {
        "IsDefaultHeaderHidden": false,
        "IsDefaultHeaderPositionFixed": true,
@@ -45,103 +39,89 @@
        "isPageWidthFixed": true
      },
      "componentName": "siteforce:prmBody",
      "id": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
    "id" : "27b0f619-7930-4846-b53d-3eb904a52e9e",
      "label": "Default",
      "regions": [
        {
          "id": "c5802569-2598-48b8-9441-b4c8f976a16c",
    "regions" : [ {
      "id" : "16bdf3ff-1315-4546-88a6-de32558d62ab",
          "regionName": "customHeader",
          "type": "region"
        },
        {
          "components": [
            {
    }, {
      "components" : [ {
              "componentAttributes": {
                "maxAutoCompleteResults": 5,
                "searchLabel": "搜索",
                "searchObjects": [
                  {
                    "isPublic": true,
                    "name": "Agency_Report_Header__c"
                  },
                  {
          "searchLabel" : "搜索...",
          "searchObjects" : [ {
                    "isPublic": true,
                    "name": "Consumable_order__c"
                  }
                ]
          }, {
            "isPublic" : true,
            "name" : "Consumable_order_details2__c"
          }, {
            "isPublic" : true,
            "name" : "ContentDocument"
          } ]
              },
              "componentName": "forceCommunity:globalSearchInput",
              "id": "3c8dc360-c5d6-41fd-b1b0-8caec0d2377b",
        "id" : "8675f0f3-1f0a-4d4b-a1e5-f49da3a754d6",
              "renditionMap": {},
              "type": "component"
            }
          ],
          "id": "f6021099-2f13-462d-a2a5-3c8cd07eb5ad",
      } ],
      "id" : "7af0cf8c-92cf-45b1-a808-2c4edea02007",
          "regionName": "search",
          "type": "region"
        },
        {
          "components": [
            {
    }, {
      "components" : [ {
              "componentAttributes": {
                "accountManagementLabel": "Account Management",
                "communityBuilderLabel": "Experience Builder",
                "communitySetupLabel": "Salesforce Setup",
          "communitySetupLabel" : "设置",
                "contactSupportLabel": "Contact Support",
                "filterName": "MyCases",
                "homeLabel": "Home",
          "homeLabel" : "主页",
                "includeContactSupport": false,
                "includeMessages": false,
                "loginLabel": "Login",
                "logoutLabel": "Logout",
                "myAccountLabel": "My Account",
                "showAccountManagement": true,
          "loginLabel" : "登录",
          "logoutLabel" : "退出",
          "myAccountLabel" : "我的客户",
          "showAccountManagement" : false,
                "showUserSettings": false,
                "userSettingsLabel": "My Settings",
                "viewProfileLabel": "My Profile"
          "viewProfileLabel" : "个人信息"
              },
              "componentName": "selfService:userProfileMenu",
              "id": "c241566b-9bf8-43a6-a068-c176ff75109e",
        "id" : "e9f75e24-e895-4c54-83c3-936329504b74",
              "renditionMap": {},
              "type": "component"
            }
          ],
          "id": "6a60ad26-0295-4a78-ab90-28fcd2c0531e",
      } ],
      "id" : "1f8acbb0-d430-44e9-a27f-695c6176b837",
          "regionName": "profileMenu",
          "type": "region"
        },
        {
          "components": [
            {
    }, {
      "components" : [ {
              "componentAttributes": {
                "NavigationMenuEditorRefresh": "Default_Navigation3",
                "hideAppLauncher": true,
                "hideHomeText": false
              },
              "componentName": "forceCommunity:globalNavigation",
              "id": "932fd9d7-f187-457d-83af-d59077849505",
        "id" : "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
              "renditionMap": {},
              "type": "component"
            }
          ],
          "id": "7475eca5-ac9b-46dd-bda0-15fee73ff99a",
      } ],
      "id" : "ce986e45-573a-4449-821c-c1d048044cd6",
          "regionName": "navBar",
          "type": "region"
        },
        {
          "id": "f932ec44-4720-4579-b9bb-014a3c718815",
    }, {
      "id" : "d389ebfc-0fde-47e7-93c5-1181c3a80075",
          "regionName": "customRegion",
          "type": "region"
        },
        {
          "id": "0e9bcb14-01ed-4e78-b6a0-f04805ae5206",
    }, {
      "id" : "773b1fa0-0bcd-4b2e-81f7-a88ac559a6bf",
          "regionName": "footer",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    },
    {
  }, {
      "componentAttributes": {
        "fixedPageWidth": 1170,
        "headerBgColor": "rgba(0, 0, 0, 0)",
@@ -152,21 +132,17 @@
        "showHero": true
      },
      "componentName": "siteforce:themeLayoutStarter",
      "id": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97",
    "id" : "1ed3aeb9-9205-4229-bfb0-71096321a26b",
      "label": "ServiceNotAvailable",
      "regions": [
        {
          "id": "a4d1a1d0-2316-47b2-8a3a-2e1a6fa7c860",
    "regions" : [ {
      "id" : "a29c8ac1-de42-4098-910c-b4c76b635e54",
          "regionName": "themeHeader",
          "type": "region"
        },
        {
          "id": "649ab6db-a997-4384-970f-554fd7658ea8",
    }, {
      "id" : "a2b35d26-5d76-47c4-9dd0-cfff946cd7c7",
          "regionName": "themeFooter",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    }
  ]
  } ]
}

 force-app/main/default/experiences/Consumable1/variations/defaultCustomComponentPropertiesComponentProperties.json

@@ -1,6 +1,5 @@
{
  "componentVariants": [
    {
  "componentVariants" : [ {
      "id": "5a61b685-6f3e-4b96-979f-4aa7aa2ecc1f",
      "propertyOverrides": {
        "componentAttributes": {
@@ -9,8 +8,7 @@
      },
      "targetId": "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
      "type": "componentVariant"
    }
  ],
  } ],
  "developerName": "Default_CustomComponent_Properties_Component_Properties",
  "id": "5cd60da6-8927-4324-9ed5-e03ab9ab5da6",
  "type": "experienceVariation"

 force-app/main/default/experiences/Consumable1/views/accountManagement.json

@@ -1,39 +1,33 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "fd91a176-37cc-4c72-887d-8a32f8472825",
  "id" : "198e4bed-7a3a-4a56-a15a-d354e55d5624",
  "label": "Account Management",
  "regions": [
    {
      "id": "262d4441-fd9c-4127-9986-4c9ad8587eba",
  "regions" : [ {
    "id" : "202c6d5b-0e3e-4ee4-9327-bb9e056f5ccd",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b>             </h1>             "
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "3d0c495a-f911-45a0-9567-812a0743c581",
      "id" : "23086da8-7c2e-4db2-9d92-e2cb300415db",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "tabsetConfig": {
              "UUID": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
          "UUID" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
              "activeTab": "tab1",
              "tabs": [
                {
                  "UUID": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
          "tabs" : [ {
            "UUID" : "507fb429-2282-49b5-8878-f05f01f9861a",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "customTitle": "Members",
                        "parentRecordId": "{!CurrentUser.accountId}",
@@ -44,36 +38,29 @@
                        "showRowNumbers": "false"
                      },
                      "fqn": "forceCommunity:relatedList"
                    }
                  ],
            } ],
                  "tabKey": "tab1",
                  "tabName": "Members"
                },
                {
                  "UUID": "03536177-264d-43e3-8c3f-1214755f8b7b",
          }, {
            "UUID" : "c61e3f16-c77e-49f2-b596-d89451128362",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "recordId": "{!CurrentUser.accountId}"
                      },
                      "fqn": "forceCommunity:accountBrandRecord"
                    }
                  ],
            } ],
                  "tabKey": "tab2",
                  "tabName": "Branding"
                }
              ],
          } ],
              "useOverflowMenu": false
            }
          },
          "componentName": "forceCommunity:tabset",
          "id": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
          "regions": [
            {
              "components": [
                {
      "id" : "65ec293d-c556-4ebb-a718-1d2091eebe82",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "customTitle": "Members",
                    "parentRecordId": "{!CurrentUser.accountId}",
@@ -84,69 +71,58 @@
                    "showRowNumbers": false
                  },
                  "componentName": "forceCommunity:relatedList",
                  "id": "a9efd81a-d6fa-448b-93cf-280e7c6ef46c",
          "id" : "1054405a-fda1-450b-a9ec-67e9be3839fb",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
        } ],
        "id" : "507fb429-2282-49b5-8878-f05f01f9861a",
              "regionLabel": "Members",
              "regionName": "tab1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "recordId": "{!CurrentUser.accountId}"
                  },
                  "componentName": "forceCommunity:accountBrandRecord",
                  "id": "18ef9967-2369-484a-83db-f4c32494e9cc",
          "id" : "7b84436c-612b-4042-b9c4-411d9fbe0957",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "03536177-264d-43e3-8c3f-1214755f8b7b",
        } ],
        "id" : "c61e3f16-c77e-49f2-b596-d89451128362",
              "regionLabel": "Branding",
              "regionName": "tab2",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "994d71b3-70bd-4c11-a9a5-343ca297dc90",
    } ],
    "id" : "9d9976f8-dd44-4d6f-91c8-06440b957386",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "dd298082-15f8-418d-9f95-7384993b0791",
  }, {
    "id" : "3583c796-50b6-4943-86ba-e0f908a892d2",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Account Management"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "675eddaf-9bb9-4932-86dd-ee69780ecb3d",
      "id" : "e6b1c498-01fb-4b0d-b21f-55bfa86e605b",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0736aa4d-5574-41f3-8504-6e9ab73263f2",
    } ],
    "id" : "786a718c-93c1-484e-8839-716d2b615d06",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "account-management"

 force-app/main/default/experiences/Consumable1/views/cIC¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "708367ab-41a2-4633-a93a-1a54141f1f48",
  "label": "CIC ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "2c3dbc4b-bfd9-4394-af4f-e60cb9fdcb79",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "enableInlineEdit": true,
            "filterName": "{!filterId}",
@@ -34,18 +31,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "2e605af4-63d3-4eae-beb4-fd599953e389",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "04eec419-32b1-46b5-9099-b2d8ee3f3b9f",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-500"

 force-app/main/default/experiences/Consumable1/views/cICévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "23a3c897-7fcb-41da-8cff-7a8e8c2450a7",
  "label": "CIC é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "7800ff3e-33e5-4b19-bab9-8644728f37bf",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "a0fd5eb9-914a-4c35-b584-0ff858f8c09f",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "22efa46a-6f6e-4300-8b97-ab5a253c1410",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-500"

 force-app/main/default/experiences/Consumable1/views/campaignList.json

@@ -1,77 +1,63 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "4908488d-d41c-4c3d-9f3e-c885a408863c",
  "id" : "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
  "label": "Campaign List",
  "regions": [
    {
      "id": "60c2bc90-4421-459e-b1ba-a2107f339447",
  "regions" : [ {
    "id" : "8cd141df-47bb-44e7-88e8-d6cf2dcb60e0",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "tabsetConfig": {
              "UUID": "d016bcc8-d583-403f-98e1-b4cc52482162",
          "UUID" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
              "activeTab": "tab1",
              "tabs": [
                {
                  "UUID": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
          "tabs" : [ {
            "UUID" : "295af927-269e-4ae3-89c6-1065c44b9479",
                  "allowGuestUser": true,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "richTextValue": "                                  <p><br/></p>                                <p style=&quot;text-align:left;&quot;>                                     Use these campaigns to generate leads and grow your business                                 </p>                       "
                      },
                      "fqn": "forceCommunity:richTextInline"
                    },
                    {
            }, {
                      "attributes": {},
                      "fqn": "forceCommunity:campaignTileList"
                    }
                  ],
            } ],
                  "tabKey": "tab1",
                  "tabName": "Campaign Marketplace"
                },
                {
                  "UUID": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
          }, {
            "UUID" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
                  "allowGuestUser": true,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "filterName": "Recent",
                        "scope": "Campaign"
                      },
                      "fqn": "forceCommunity:objectHome"
                    }
                  ],
            } ],
                  "tabKey": "tab2",
                  "tabName": "All Campaigns"
                }
              ],
          } ],
              "useOverflowMenu": false
            }
          },
          "componentName": "forceCommunity:tabset",
          "id": "d016bcc8-d583-403f-98e1-b4cc52482162",
          "regions": [
            {
              "components": [
                {
      "id" : "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "richTextValue": "                                  <p><br/></p>                                <p style=&quot;text-align:left;&quot;>                                     Use these campaigns to generate leads and grow your business                                 </p>                       "
                  },
                  "componentName": "forceCommunity:richTextInline",
                  "id": "5d79ac34-0177-4289-b5a8-ca6411a73449",
          "id" : "ffe2df03-ba7f-4a7f-a8a2-c3e393c9cfaa",
                  "renditionMap": {},
                  "type": "component"
                },
                {
        }, {
                  "componentAttributes": {
                    "bodyField": "Description",
                    "categoryField": "__",
@@ -86,20 +72,17 @@
                    "titleField": "Name"
                  },
                  "componentName": "forceCommunity:campaignTileList",
                  "id": "6759af65-a1cb-4ed7-857d-7d1e8f5345aa",
          "id" : "b697c485-7d58-4403-a0ca-3ad0490ca174",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
        } ],
        "id" : "295af927-269e-4ae3-89c6-1065c44b9479",
              "regionLabel": "Campaign Marketplace",
              "regionName": "tab1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "enableInlineEdit": true,
                    "filterName": "Recent",
@@ -117,33 +100,28 @@
                    "showSearchBar": true
                  },
                  "componentName": "forceCommunity:objectHome",
                  "id": "b172d17f-5066-4094-8678-182496badab9",
          "id" : "468384df-73f0-459b-8b3b-99cb260ace82",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
        } ],
        "id" : "41da809c-e1f0-44f4-b742-c33cfecac7ff",
              "regionLabel": "All Campaigns",
              "regionName": "tab2",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "535cdff9-cb2b-4795-a86f-7ab08bee59c0",
    } ],
    "id" : "f05e4448-347d-4264-ba99-7d8afeb75c23",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "3c3ec81e-d8af-40ff-9335-930d66638643",
  }, {
    "id" : "7627cbac-8224-4c40-ac93-186f3a47f991",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-701"

 force-app/main/default/experiences/Consumable1/views/caseDetail.json

@@ -1,28 +1,24 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "b17204f0-44a2-4866-abaf-23f750a97ddd",
  "id" : "3b1b2646-af41-43d3-a519-528aa49f45f4",
  "label": "Case Detail",
  "regions": [
    {
      "id": "9c67d8f8-f7eb-4b96-a1a7-16b8062b3d57",
  "regions" : [ {
    "id" : "1eb1822e-40d4-40a9-8504-a3bc8ae79809",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "2c68dcfb-9f4e-4cac-b812-0ae412ff8733",
      "id" : "1602b68a-ea96-47ea-8132-0bba6301069a",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
@@ -36,40 +32,34 @@
            "timelineTabLabel": "Activity"
          },
          "componentName": "forceCommunity:recordHomeTabs",
          "id": "fd039f89-ba1f-4f3d-a270-52cbb83bb6e5",
      "id" : "eb5335d5-d3df-4512-91ae-50c5403ea737",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "744079bf-ab73-462e-a23f-4f17a7b40b13",
    } ],
    "id" : "40f59663-263d-41c7-94ea-345dca5b494e",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "c3923904-a96f-479d-94da-8529e773dada",
  }, {
    "id" : "c47a29f6-4120-46fd-9cfb-e9724d01b1e8",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "d7c9dd3f-bed9-4be6-877e-a0aa3309ab58",
      "id" : "f8cd34d0-3569-404e-ad02-b6abae393992",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6926117b-34c0-4fd7-b2c0-040443303e3e",
    } ],
    "id" : "28f1ae6f-7ab6-49c0-a8b1-4819fbedcae3",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-500"

 force-app/main/default/experiences/Consumable1/views/checkPassword.json

@@ -1,56 +1,57 @@
{
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
  "id" : "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
  "label": "Check Password",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">请检查您的邮箱</span></p>"
        "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">请输入您的邮箱</span></p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "e9066c74-c45a-4512-a11b-755b5f5629bc",
      "id" : "19245457-d13d-434e-9b0f-b0242a8ab8f4",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">检查与您的用户名关联的电子邮件帐户，以获取有关重置密码的说明。请记住查看您的垃圾邮件文件夹，自动邮件有时会在其中过滤。如果您仍然无法登录，请联系您的管理员。</span></p><p style=\"text-align: center;\"><br></p><p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_self\" style=\"font-size: 16px; color: rgb(255, 255, 255);\"><strong>返回登录</strong></a></p>"
        "richTextValue" : "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">检查与您的用户名关联的电子邮件帐户，以获取有关重置密码的说明。请记住查看您的垃圾邮件文件夹，自动邮件有时会在其中过滤。如果您仍然无法登录，请联系您的管理员</span></p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "87485c52-d378-475d-895e-caeb1bdd08ac",
      "id" : "402e03d5-588a-468f-9acf-adddef37b551",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "ee29b16c-6260-473d-b315-a8b3e70d218f",
    }, {
      "componentAttributes" : {
        "richTextValue" : "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_blank\" style=\"color: rgb(255, 255, 255);\"><strong>返回登录</strong></a></p>"
      },
      "componentName" : "forceCommunity:richTextInline",
      "id" : "4ad83c2b-e483-49d6-9721-2245ea3567bf",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "9985d44e-a0e1-4ea8-8392-69ecd11b717a",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Check Password"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "cee2921c-7188-455b-b121-8633b148aac3",
      "id" : "d9766929-20bd-4383-bb47-d081a8982254",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e3ffa5e5-e5e0-49ac-b32f-953d1c6c7084",
    } ],
    "id" : "cfc14d85-84ee-4928-9a0e-a5b204930def",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "check-password"

 force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json

@@ -1,155 +1,131 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
  "id" : "edf32642-ece4-4435-94c9-82eb6b8f67a9",
  "label": "ConsumableDetail_fix",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "c5216591-0210-4c09-a832-9b7a8c57c03f",
              "columns": [
                {
                  "UUID": "192f0791-c2cd-4d37-953e-3b145ecdf320",
          "UUID" : "2669d21c-e835-4689-a403-f77a18c9d715",
          "columns" : [ {
            "UUID" : "e9dbbc4b-efc6-4508-9533-9280eec53143",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 115
          },
          "componentName": "forceCommunity:section",
          "id": "c5216591-0210-4c09-a832-9b7a8c57c03f",
          "regions": [
            {
              "components": [
                {
      "id" : "2669d21c-e835-4689-a403-f77a18c9d715",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "recordId": "{!recordId}"
                  },
                  "componentName": "forceCommunity:recordHeadline",
                  "id": "6b924e95-ca67-4fab-87f2-d4d2286e13a7",
          "id" : "73412524-f13e-4a0f-b81b-94cc87c0440c",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "192f0791-c2cd-4d37-953e-3b145ecdf320",
        } ],
        "id" : "e9dbbc4b-efc6-4508-9533-9280eec53143",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "6ff941f3-4e49-4606-b575-e6c1111b189a",
              "columns": [
                {
                  "UUID": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
          "UUID" : "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
          "columns" : [ {
            "UUID" : "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "8",
                  "seedComponents": []
                },
                {
                  "UUID": "488034df-aeaa-4f35-a60f-f87855a1b359",
                  "columnKey": "9f7d9",
          }, {
            "UUID" : "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
            "columnKey" : "a2a96",
                  "columnName": "Column 2",
                  "columnWidth": "4",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "6ff941f3-4e49-4606-b575-e6c1111b189a",
          "regions": [
            {
              "components": [
                {
      "id" : "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "recordId": "{!recordId}"
                  },
                  "componentName": "forceCommunity:recordDetail",
                  "id": "e13b2d88-d293-4f5f-92c3-114708265abb",
          "id" : "8804e9ec-b2a3-41f4-b8be-6a0443bea1e7",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
        } ],
        "id" : "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "recordId": "{!recordId}",
                    "width": "MEDIUM"
                  },
                  "componentName": "forceCommunity:relatedRecords",
                  "id": "b85bf391-627a-4855-b35c-06ad17df77e7",
          "id" : "eda1b3f7-603a-4290-a4b4-0bdd5bfea4ec",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "488034df-aeaa-4f35-a60f-f87855a1b359",
        } ],
        "id" : "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
              "regionLabel": "Column 2",
              "regionName": "9f7d9",
        "regionName" : "a2a96",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0dbd3738-5308-4691-90ef-2ca7435f6c0d",
    } ],
    "id" : "e0d975de-d0c9-499e-9c79-15b3de367011",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "d53c3fbf-b313-4cc9-ac51-c415bdb3a8c7",
      "id" : "d1ccd1e3-344a-42e4-b66e-81c4ac575f87",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "7edf4894-febc-4588-b8ec-a1600a9a04d3",
    } ],
    "id" : "926e94d2-26ee-49b8-9085-abb739f639ee",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-a2K"

 force-app/main/default/experiences/Consumable1/views/contactSupport.json

@@ -1,18 +1,15 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsTwoCol66Layout",
  "dataProviders": [],
  "id": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
  "id" : "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
  "label": "Contact Support",
  "regions": [
    {
      "id": "3fac5382-70c4-4d82-9a05-196fbcfce6ce",
  "regions" : [ {
    "id" : "4ad609eb-6693-4846-a08e-e4fa961e9991",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "allowAttachments": true,
            "attachmentLabel": "Upload File",
@@ -38,19 +35,16 @@
            "requestSummaryText": "Case summary"
          },
          "componentName": "forceCommunity:contactSupportForm",
          "id": "6ccb7e63-0255-4dd9-995a-4d52b12e4311",
      "id" : "31e9512a-f8de-4d46-8f19-5c2afaf7b18b",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "ef1eb48b-62cf-4b6b-bb30-a9783f410efb",
    } ],
    "id" : "d2619a80-c4a9-449f-8dd4-4305e7c1e81c",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "askConfirmationQuestion": true,
            "confirmationMessageLabel": "Got it!",
@@ -66,40 +60,34 @@
            "topicId": ""
          },
          "componentName": "forceCommunity:caseDeflection",
          "id": "f2a0a519-1464-4325-a800-2ec01165be89",
      "id" : "647280c4-1a9d-4551-a0fd-1323f11625af",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6dc7c8e1-bb5d-48b0-ba00-fa97b9cfeced",
    } ],
    "id" : "3c86f83b-c2fa-41ed-bef6-f6d97c96253c",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "c2e93eba-7820-4af2-bd14-a67cca438b33",
  }, {
    "id" : "bacb957e-44f3-481a-aa70-7b45c0c9ba1e",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Contact Support"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "dc9640dc-b460-4a6b-a845-7e753a94d360",
      "id" : "d0de04cd-88a3-4905-a36c-bbf4e97b7707",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d377d055-e453-4ad9-a2ab-572a3e788983",
    } ],
    "id" : "0b6a520d-0f34-4411-a3c9-c360b06d30fa",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "contactsupport"

 force-app/main/default/experiences/Consumable1/views/createRecord.json

@@ -1,26 +1,33 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
  "id" : "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
  "label": "Create Record",
  "regions": [
    {
      "id": "0ef64b23-8a56-4d87-9984-219633feaf24",
  "regions" : [ {
    "id" : "951aa7a1-efc5-4041-8929-3d980fe6f9b7",
      "regionName": "header",
      "type": "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "actionApiName" : "{!actionApiName}",
        "isMicrobatch" : false
    },
    {
      "id": "33abd4a1-c8d6-4b2b-8df7-3ef0b829a56c",
      "componentName" : "forceCommunity:createRecordForm",
      "id" : "21c870a6-c4cb-476f-8dde-6906530b418e",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "7f501f3e-1f42-4cf8-925e-d0e654c13ff3",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "63eee37e-e8ea-4cae-b2a7-81328a5fefab",
  }, {
    "id" : "23111281-f438-4296-b47a-773feea9a17e",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "createrecord"

 force-app/main/default/experiences/Consumable1/views/dashboardDetail.json

@@ -1,57 +1,48 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "47937364-e71b-469a-b996-317032189c45",
  "id" : "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
  "label": "Dashboard Detail",
  "regions": [
    {
      "id": "646d2c85-c6e9-4db7-8a6f-3c118c0c5ee8",
  "regions" : [ {
    "id" : "cf059051-9545-478c-a076-e7ff4543d95f",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "height": "1065",
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:dashboard",
          "id": "d0f9abce-c4ac-4e23-a574-19da9a5024c3",
      "id" : "a3426236-d100-4c2a-9655-6d6e3930b6df",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e91e78ff-ac70-4d20-8301-fb1e76dedb9b",
    } ],
    "id" : "38ddc7db-4ed1-42e3-9ee6-ef8459588b7f",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "b1e7a1e2-39aa-47b7-a37d-75824027907a",
  }, {
    "id" : "d8f6f3ba-bac7-47a6-aa9c-12121409f9f2",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "6d83a6d3-edaf-4f22-ac0c-92d6b220fd30",
      "id" : "d12ac0ed-4451-4546-bb3f-07f3465b5d33",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "558015ea-19cc-4c77-aba2-c53f3cc764d9",
    } ],
    "id" : "f48d58f3-43e0-47a0-ab8b-61f57ce68b15",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-01Z"

 force-app/main/default/experiences/Consumable1/views/dashboardList.json

@@ -1,36 +1,30 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "b59c266b-a1ad-47f9-bf26-a8295147505c",
  "id" : "f10a3529-b77e-4ebc-9b99-281160c97c7f",
  "label": "Dashboard List",
  "regions": [
    {
      "id": "33cc3069-d9f2-464b-9053-91112d7480d4",
  "regions" : [ {
    "id" : "aace5538-56aa-4a21-bb35-9a40c211bcb0",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceCommunity:dashboardList",
          "id": "760458df-b4cc-46a5-beac-b21fde008f88",
      "id" : "1b31f86d-98da-4daf-b754-b394d38a581a",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e38cff0d-f391-468b-a4cc-cf69b7eeabff",
    } ],
    "id" : "45be9d35-4310-4df5-a2ce-56f3a70c91cb",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "1045796b-cf40-4b2b-867e-ce02ce0a02dc",
  }, {
    "id" : "54a7dd8d-3042-44ce-834f-6a590085586d",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-01Z"

 force-app/main/default/experiences/Consumable1/views/error.json

@@ -1,56 +1,47 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "48f1f5ec-b27a-4874-83fa-15e857b27699",
  "id" : "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
  "label": "Error",
  "regions": [
    {
      "id": "01af81bd-4eb5-4add-bd2a-5af47ca64f31",
  "regions" : [ {
    "id" : "04daa4a0-4d2d-46f9-bc70-f4ef28375c2d",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": " <div class='slds-grid slds-grid--vertical slds-align--absolute-center slds-container--large'>   <div class='slds-align-middle slds-m-bottom--xx-large slds-m-top--xx-large' alt='Page not available'>      <img src='/sfsites/c/img/community/slds/messaging/illustration-page-not-found.png' class='slds-p-horizontal--large'/>   </div>   <h4 class='slds-text-align--center slds-text-heading--large slds-text-color--weak slds-m-bottom--small'>Page not available</h4>    <p class='slds-text-align--center slds-text-heading--medium slds-text-color--weak'>Maybe the page was deleted, the URL is incorrect, or something else went wrong. If you know the page exists but you still can’t get to it, please ask the community administrator for help.</p>  </div>"
          },
          "componentName": "forceCommunity:htmlBlock",
          "id": "24077521-3224-4633-840d-25c26a493f1d",
      "id" : "8f1aad62-6fd8-4a0a-bf73-603d03724841",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "748f88b6-3627-4078-9abe-c618059a8613",
    } ],
    "id" : "a801a07b-dbc3-4650-9e01-934eabb7a789",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "25077bd2-d3e5-440d-aa48-322dd23c2177",
  }, {
    "id" : "e59b2192-4edb-4144-8f08-755e9e111518",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Error"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "5ba201e2-05bb-479d-b173-7efc99ae56c5",
      "id" : "f322e8e2-b32f-471c-a992-fdb40e009539",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d8d0e969-4c0d-4f6f-aa06-be29638f5fa3",
    } ],
    "id" : "ac65174b-2219-479b-8ca4-6f679e28f7d4",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "error"

 force-app/main/default/experiences/Consumable1/views/feedDetail.json

@@ -1,38 +1,32 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "fefd7f80-945b-489b-8a4e-615884934641",
  "id" : "eb28719b-06b5-4397-bf8d-667ec408ca46",
  "label": "Feed Detail",
  "regions": [
    {
      "id": "b3c377f9-ebc1-4ae5-8c28-f78f8bc9cdca",
  "regions" : [ {
    "id" : "6a9400e1-ad64-47ea-829f-6ce793c4ad02",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "id": "{!recordId}"
          },
          "componentName": "forceCommunity:feedItemDetail",
          "id": "41ed8fa1-1f73-4385-a28f-faa0ecd561e3",
      "id" : "59f29841-0c8d-40d7-83ba-c590f2214d4e",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "2bf7238a-fe13-4617-8f6b-cd74a8ee0780",
    } ],
    "id" : "d66f961b-0bba-4472-9a69-13676f89b28e",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "ba025857-7cad-4cea-9780-b8b86e89a9bf",
  }, {
    "id" : "04b45900-4d8a-4452-86c8-ca0c8b030bd5",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "feeditem-generic"

 force-app/main/default/experiences/Consumable1/views/fileDetail.json

@@ -1,36 +1,30 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
  "id" : "2322115a-ac65-4862-9104-912d42fca69a",
  "label": "File Detail",
  "regions": [
    {
      "id": "f14be551-933a-4a05-944a-68e824e2f1f5",
  "regions" : [ {
    "id" : "d076ed42-1664-4b15-96ee-70c0eb0707ef",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceCommunity:fileDetailPage",
          "id": "122674c6-a847-4043-ae63-b059b3963a61",
      "id" : "1782e7b6-53ac-4493-bffe-00fe18a9a42f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "c1598287-4d0a-4195-8935-e6bd18495b19",
    } ],
    "id" : "89a0e125-284e-4240-bf7a-52e32979cf3e",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "2c5abc89-16a5-4df8-a4c8-e3bc22a258dd",
  }, {
    "id" : "efd311f4-16ab-4cf8-9d82-bdeda1722dfb",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-069"

 force-app/main/default/experiences/Consumable1/views/fileList.json

@@ -1,38 +1,32 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
  "id" : "193807a6-e99f-4075-9811-62dda5b13d43",
  "label": "File List",
  "regions": [
    {
      "id": "86a4e739-1949-4199-9687-9d9e5a0e8b7b",
  "regions" : [ {
    "id" : "af6a54e4-65cf-4412-831e-3d55625076ae",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "pageSize": 25
          },
          "componentName": "forceCommunity:filesList",
          "id": "8d8b9ad4-91c1-44c2-b566-b5ddec17c62d",
      "id" : "11e918ad-fc08-4907-8d8c-5aaddd9a92e8",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0ceef01d-d0aa-44fa-87e6-a36a92fe73ce",
    } ],
    "id" : "4a7c43a0-6939-4ea5-b8a4-b69789506c76",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "91694ac3-024d-4480-b8f2-b82180070fd1",
  }, {
    "id" : "f720b89f-67f7-40d3-9eb0-f56d0fc7d379",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-069"

 force-app/main/default/experiences/Consumable1/views/flow.json

@@ -1,36 +1,33 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "17c9c45c-4c81-49d0-985e-d6281d899320",
  "id" : "4aa9507c-1470-43b3-8000-390325f6bd7d",
  "label": "Flow",
  "regions": [
    {
      "id": "bf7ef746-6791-4aa9-a096-0038d427dee1",
  "regions" : [ {
    "id" : "4d7e2fae-45a7-4b69-9005-de342f942f38",
      "regionName": "header",
      "type": "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "flowArguments" : "",
        "flowName" : "{!flowName}"
    },
    {
      "components": [
        {
          "componentAttributes": {},
          "componentName": "c:RetrospectiveWeeklyReport",
          "id": "fadeafaa-5cf8-497e-8561-cb2c463012c0",
      "componentName" : "forceCommunity:flowCommunity",
      "id" : "45d0d38f-558e-4351-99c6-e14557f11731",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "1e71465d-b903-4a32-b4bc-21003f85b882",
    } ],
    "id" : "96c3caa0-6524-4903-8de2-aad59a4c6e03",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "496f34a6-ba4c-4796-8afd-00fed3cb7882",
  }, {
    "id" : "6ac44c78-d53b-4560-bbff-73d0b87baa93",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "flow"

 force-app/main/default/experiences/Consumable1/views/forgotPassword.json

@@ -1,78 +1,68 @@
{
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
  "id" : "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
  "label": "Forgot Password",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">重置密码</span></p>"
        "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">重置密码</span></p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "78431e15-96d3-47e5-90a4-060c0580d9f1",
      "id" : "2b141c57-9556-45f3-9e15-90ac1419a02f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">请输入您的用户名</span></p>"
        "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 16px; color: rgb(255, 255, 255);\">请输入您的用户名</span></p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "391e2f6e-25ba-4d60-8429-fa83c865f188",
      "id" : "203ce0df-48b9-4b50-85af-ba98cff2599e",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "checkEmailUrl": "./CheckPasswordResetEmail",
            "submitButtonLabel": "重置密码",
            "usernameLabel": "用户名"
          },
          "componentName": "salesforceIdentity:forgotPassword2",
          "id": "ef09e7c2-8849-4559-a007-267530809bdb",
      "id" : "9afeb3da-d8a0-41df-8b00-4ca493eda07b",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<p style=\"text-align: center;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_self\" style=\"color: rgb(255, 255, 255); font-size: 16px;\">取消</a></p>"
        "richTextValue" : "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">取消</span></p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "79792fe3-b6d6-41d1-aeb6-912471e1b013",
      "id" : "ac7cc923-2a73-45a7-a124-b94477b33e34",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "53a5629c-91b2-4f5b-91ef-76d991ec923a",
    } ],
    "id" : "e9992f81-cb4b-4485-a34c-4a7db847cad9",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Forgot Password"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "a506de7f-74b7-47e4-84d0-8579f8925ebb",
      "id" : "973d922a-76bf-4c04-91b9-f10851baf1c3",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "842b093a-48db-4342-b4f9-d7953055c798",
    } ],
    "id" : "47d9db7d-c4bd-478e-9a55-3d796c30b606",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "forgot-password"

 force-app/main/default/experiences/Consumable1/views/groupDetail.json

@@ -1,18 +1,15 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
  "id" : "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
  "label": "Group Detail",
  "regions": [
    {
      "id": "330444b1-bbd6-493f-8e30-9c7d914f351e",
  "regions" : [ {
    "id" : "060923b0-77f7-42e7-b254-d75fc65bc96b",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "engagementManagersOnly": false,
@@ -22,40 +19,34 @@
            "relatedTabLabel": "Related"
          },
          "componentName": "forceCommunity:groupRecordHomeTabs",
          "id": "04f2c0f0-ba9f-4aba-87c9-fc060e93e50c",
      "id" : "c30496d8-d218-46e9-895f-fa9ef9e054e2",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "fd783466-f338-443f-b168-79fdb31885b4",
    } ],
    "id" : "9c183d6e-53c2-4b3a-a3db-5c3657024407",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "8dd0118d-278b-4e47-a977-f67e4e0fe115",
  }, {
    "id" : "ac91d64b-2f65-4f8a-ab26-d6ec7656960d",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "ae88a178-5983-43d9-87ba-7613de4d54ec",
      "id" : "fdab4c93-fa91-4bc1-9c74-e99e5a54315c",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "cabd2974-2029-44be-b37f-b7fd95ebb879",
    } ],
    "id" : "162e1f76-59b0-40b1-98fd-e38e325cce5e",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-0F9"

 force-app/main/default/experiences/Consumable1/views/groupList.json

@@ -1,46 +1,39 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "87a9b140-31e2-4c28-9fa4-82135022e59d",
  "id" : "949c0ee3-6484-4ed7-a44f-aa417cec1835",
  "label": "Group List",
  "regions": [
    {
      "id": "89649989-257d-4c62-ac2d-cfb067a7dab9",
  "regions" : [ {
    "id" : "9a5c8668-57b0-4ed9-b08f-7db30276d775",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Group List</b>             </h1>             "
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "0c8f9c88-77cb-432b-aad6-bfb98bb54388",
      "id" : "cbff4378-dadd-486b-b610-0c737fcc355a",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {},
          "componentName": "forceCommunity:groupObjectHome",
          "id": "0856cb72-ce49-46cb-b936-e908c1096841",
      "id" : "c5348791-4e5f-4115-bc57-297af7a3560b",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "b21ee870-d315-48be-93c1-d4d79e5f1b53",
    } ],
    "id" : "e9583cc1-1d2d-49a3-bab1-4e826e4cce53",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "08886110-b15a-4ff9-9de1-3a1f81708cb5",
  }, {
    "id" : "cc1ad297-48af-47cf-b66f-373b81e275f1",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-0F9"

 force-app/main/default/experiences/Consumable1/views/home.json

@@ -1,102 +1,84 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsTwoCol84Layout",
  "dataProviders": [],
  "id": "060f3385-936a-41da-8086-58f66522aeea",
  "id" : "d47db83f-301d-4624-a8db-4474a6a30bd9",
  "label": "Home",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 28px; color: #1e2443;\">Welcome!</b>             </h1>             <p style=\"text-align: center;\">                 <span style=\"font-size: 20px;\">Work on leads, register deals, and track progress with analytics.</span>             </p>        "
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "757bc2a8-8fc2-4080-8a6c-79cd5c948d16",
      "id" : "19cbd1e7-a45d-47b4-bdad-385c5562b1b8",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "8f13358a-c852-482b-ac84-0aa6ead20c98",
    } ],
    "id" : "10ac200f-b20b-4ad8-8f0d-040c3a4ba494",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<img src='/sfsites/c/img/community/prm/prm-default-banner.png'          alt='Banner image for Partner Central template' style='width:100%;'/>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "c0931ab3-1d66-4aba-8bdf-76d43261d6da",
      "id" : "f55d8364-8d18-4c91-b733-ef2e9fbeead2",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "tabsetConfig": {
              "UUID": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
          "UUID" : "77ed0454-75bd-4886-bc4b-6e90cc656e73",
              "activeTab": "tab1",
              "tabs": [
                {
                  "UUID": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
          "tabs" : [ {
            "UUID" : "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
                  "allowGuestUser": true,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {},
                      "fqn": "forceCommunity:dashboard"
                    }
                  ],
            } ],
                  "tabKey": "tab1",
                  "tabName": "Business Summary"
                },
                {
                  "UUID": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
          }, {
            "UUID" : "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
                  "allowGuestUser": true,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "type": "Home"
                      },
                      "fqn": "forceCommunity:forceCommunityFeed"
                    }
                  ],
            } ],
                  "tabKey": "tab2",
                  "tabName": "News & Updates"
                }
              ],
          } ],
              "useOverflowMenu": false
            }
          },
          "componentName": "forceCommunity:tabset",
          "id": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
          "regions": [
            {
              "components": [
                {
      "id" : "77ed0454-75bd-4886-bc4b-6e90cc656e73",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "height": "485",
                    "recordId": "01Z100000013zqGEAQ"
            "recordId" : "01Z10000001cpWqEAI"
                  },
                  "componentName": "forceCommunity:dashboard",
                  "id": "d4f4c8c7-e1cc-43e0-bdf7-a91c8f3f7d77",
          "id" : "8a7ab317-f6e5-4781-8734-86cf083bef93",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
        } ],
        "id" : "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
              "regionLabel": "Business Summary",
              "regionName": "tab1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "canChangeSorting": true,
                    "defaultFilter": "",
@@ -108,58 +90,47 @@
                    "type": "Home"
                  },
                  "componentName": "forceCommunity:forceCommunityFeed",
                  "id": "89169035-2123-484c-a320-aa12d136b737",
          "id" : "0965c626-6474-43f8-8064-7f2a06272adc",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
        } ],
        "id" : "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
              "regionLabel": "News & Updates",
              "regionName": "tab2",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d0a93f84-0c8e-4330-91fa-ae3a171ac07c",
    } ],
    "id" : "8642333f-fe8d-4b21-8526-34a61169f1dc",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "actions": [
              {
        "actions" : [ {
                "isPublic": true,
                "name": "NewLead"
              },
              {
        }, {
                "isPublic": true,
                "name": "NewOpportunity"
              },
              {
        }, {
                "isPublic": true,
                "name": "NewTask"
              },
              {
        }, {
                "isPublic": true,
                "name": "NewCase"
              }
            ],
        } ],
            "label": "Quick Create"
          },
          "componentName": "forceCommunity:createRecordButton",
          "id": "a794a745-990f-481b-9cf2-5cdd5eec12e6",
      "id" : "bd29d6d1-7296-4e0f-b89b-6670b88e8415",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "listViewIdForNavigation": "FOLLOW",
            "navigateToListView": true,
@@ -168,12 +139,11 @@
            "title": "Lead Inbox"
          },
          "componentName": "forceCommunity:leadInbox",
          "id": "cc30815c-4721-411d-94ad-af5c53d4af0d",
      "id" : "330e6363-913a-4cc3-a7bc-042c71d21073",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "enableInlineEdit": true,
            "filterName": "MyOpportunities",
@@ -191,12 +161,11 @@
            "showSearchBar": true
          },
          "componentName": "forceCommunity:objectHome",
          "id": "ec72b889-1cee-4d5a-a9a6-87f43359b3b5",
      "id" : "b1ba9dd2-888a-4d31-9d43-863a18ae7a92",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "enableInlineEdit": true,
            "filterName": "OPEN",
@@ -214,40 +183,34 @@
            "showSearchBar": true
          },
          "componentName": "forceCommunity:objectHome",
          "id": "7653914f-b749-49f2-a483-6b268b59369f",
      "id" : "94bf80cd-edef-47dd-b710-bbcbeab44d75",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e39b35aa-8bd4-4a48-b7e7-dc1e2505aaeb",
    } ],
    "id" : "78ad9488-9cad-453f-9ee1-053f31dd7d83",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "864fe56c-bda6-4c9a-8869-8025ac329f4a",
  }, {
    "id" : "5640820f-3232-4372-8fbb-2ab9bf9b9979",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "b403e241-261c-4abc-a01c-4960c5b43ea3",
      "id" : "0dfbf9f2-6bd0-4150-b2a2-29107b376fef",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0110900c-6b38-40f9-a6fb-16fe86ceaabe",
    } ],
    "id" : "9b4f717e-09a8-44bd-8e53-d8e807d0d800",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "home"

 force-app/main/default/experiences/Consumable1/views/homeFlexible.json

@@ -1,101 +1,86 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
  "id" : "0b3166bc-2eec-43fa-8adf-532f629e9392",
  "label": "Home_Flexible",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
              "columns": [
                {
                  "UUID": "b6706b54-3422-40d2-a719-0162d2a20aa5",
          "UUID" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
          "columns" : [ {
            "UUID" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
          "regions": [
            {
              "components": [
                {
      "id" : "8ae08b67-88c4-492b-98a8-924b20bb1544",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; color: rgb(0, 71, 178);\">欢迎登录消耗品追溯系统</span></p>"
            "richTextValue" : "<p style=\"text-align: center;\"><span style=\"font-size: 48px; font-family: sans-serif; color: rgb(0, 71, 178);\">欢迎登录消耗品追溯系统</span></p>"
                  },
                  "componentName": "forceCommunity:richTextInline",
                  "id": "a970dbc1-3bd6-4786-9358-4d23aefe0476",
          "id" : "d14e9b8c-a3d9-40cb-8ad0-5161fe285a74",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                },
                {
        }, {
                  "componentAttributes": {},
                  "componentName": "c:lexLicenceReminder",
                  "id": "5f083ad9-6878-4cea-9c61-ab8a1c17593b",
          "id" : "e0232bc3-f6c4-4671-b26e-160b3d73a0a4",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                },
                {
        }, {
                  "componentAttributes": {
                    "height": "800",
                    "recordId": "01Z0l000000cnvqEAA"
            "recordId" : "01Z6D000000EyGYUA0"
                  },
                  "componentName": "forceCommunity:dashboard",
                  "id": "345cf353-5531-484c-a94c-a120ecb854e5",
          "id" : "e0024c07-3f6e-4822-9079-47ad41f4c3a8",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "b6706b54-3422-40d2-a719-0162d2a20aa5",
        } ],
        "id" : "10b668a2-336e-4764-b5b8-303f9939b7e3",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "52b2abe8-346e-43db-b1ca-9254d387e8db",
    } ],
    "id" : "1bac6fb4-0163-4896-8cd7-85b1f34df29f",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "2762cc02-0105-42d7-9e2e-08ed9a61c1ca",
      "id" : "84e91754-c40d-4c64-a0e4-9bfae8320536",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "f04df81d-a2d5-4a8b-b937-e0c26399e6b2",
    } ],
    "id" : "1c72742c-4f76-41b6-b8f2-7582c4245d05",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "home"

 force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
  "label": "lexAgencyInfo",
  "regions": [
    {
      "components": [
        {
  "id" : "376ad65a-00b6-4198-aa04-19a6360969bc",
  "label" : "LexAgencyInfo",
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
              "columns": [
                {
                  "UUID": "55056592-e02c-455e-b831-5f29ba25ae8b",
          "UUID" : "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
          "columns" : [ {
            "UUID" : "2db9074f-7efa-4fc1-aef6-e94f4af43def",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
          "regions": [
            {
              "components": [
                {
      "id" : "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexAgencyInfo",
                  "id": "6324c43f-2751-4e38-bf86-5a8d7d2df87d",
          "id" : "7762e10b-5ce6-4594-ac4e-648a78b6c9b2",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "55056592-e02c-455e-b831-5f29ba25ae8b",
        } ],
        "id" : "2db9074f-7efa-4fc1-aef6-e94f4af43def",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d0b67e99-b73f-4016-b342-44b5bd5004de",
    } ],
    "id" : "2f459a20-131e-4548-ab46-f9920697d1d7",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "经销商信息 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "dea6c82c-c9c5-41cc-960b-f7be4c8540ff",
      "id" : "2bacf8a5-3038-42e9-b2e0-3fee8cc95ea3",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "74d33395-e564-480d-9df2-5ca9d246845d",
    } ],
    "id" : "ce682a09-6e95-438e-9f22-d2fb11703354",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexagencyinfo"

 force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
  "id" : "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
  "label": "LexArriveGoods",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "888145dd-72c9-4e26-a813-21c7346e0e39",
              "columns": [
                {
                  "UUID": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
          "UUID" : "8aedf101-f8cf-43c7-bb42-da69a742aa74",
          "columns" : [ {
            "UUID" : "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "888145dd-72c9-4e26-a813-21c7346e0e39",
          "regions": [
            {
              "components": [
                {
      "id" : "8aedf101-f8cf-43c7-bb42-da69a742aa74",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexArriveGoods",
                  "id": "3483355f-5db7-43e9-9501-a0868434e472",
          "id" : "76c84633-d7e3-48e5-bea6-6b9bd9d53b84",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
        } ],
        "id" : "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "a09b4773-f3c4-45c1-9d61-7a08c3e9b1b2",
    } ],
    "id" : "54f6208b-cf85-4f6d-ab18-a932c63b5761",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "入库/返品 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "3363f170-a3c6-42c2-8615-cb89c4665710",
      "id" : "930825d9-d67b-4d95-8ebf-1b16db181e7c",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "03bed34c-102a-4081-9ffa-5a71d359716b",
    } ],
    "id" : "7fbb47ad-d923-4a89-ae79-922b35d71571",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexarrivegoods"

 force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
  "id" : "f46aba62-01c3-4a20-93c6-f9b2362717e6",
  "label": "LexArriveGoodsMain",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "196f0047-adf4-4653-b3b1-502f0132ac63",
              "columns": [
                {
                  "UUID": "8d475e45-01bc-4767-849a-8386d433285d",
          "UUID" : "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
          "columns" : [ {
            "UUID" : "d25ba467-5924-40aa-bcdd-e1ac8643be08",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "196f0047-adf4-4653-b3b1-502f0132ac63",
          "regions": [
            {
              "components": [
                {
      "id" : "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexArriveGoodsMain",
                  "id": "af3b9e79-413e-4e41-94a5-9e22511c69da",
          "id" : "1d0f8205-b81b-446f-866b-237e69f338d9",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "8d475e45-01bc-4767-849a-8386d433285d",
        } ],
        "id" : "d25ba467-5924-40aa-bcdd-e1ac8643be08",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6d407bee-c7b6-4862-928b-6ace9e3b1e07",
    } ],
    "id" : "7efb4626-0f15-4ee3-9418-cb6419fb0bcd",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "入库/返品 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "505a452b-9d0e-4607-9c6e-5a1de7c8d722",
      "id" : "71e9fe84-4f41-453b-a6b5-35ed5cdbfadc",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "260b9853-f9b6-4b32-be09-325a251d890a",
    } ],
    "id" : "da8c93ee-69b0-47b5-83bb-61150b2aa560",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexarrivegoodsmain"

 force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
  "id" : "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
  "label": "LexArriveGsDetails",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "8743236b-840d-4987-8168-2449baaa559c",
              "columns": [
                {
                  "UUID": "861293f5-2153-4223-b8a6-ae59bc2843f0",
          "UUID" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
          "columns" : [ {
            "UUID" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "8743236b-840d-4987-8168-2449baaa559c",
          "regions": [
            {
              "components": [
                {
      "id" : "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexArriveGsDetails",
                  "id": "967bc21a-73f4-4af3-90e3-8961f1903457",
          "id" : "18ff9dd3-7039-4ffb-8d15-faa606335456",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "861293f5-2153-4223-b8a6-ae59bc2843f0",
        } ],
        "id" : "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "fed879a2-37ad-4d00-ac2b-6a7d45f219e0",
    } ],
    "id" : "2ed898cb-77b1-437e-8eca-16a3a98927e0",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "到货 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "1bde528a-2d7c-4e45-a5ae-cf6b4e730c1b",
      "id" : "961b31ea-175a-4e22-8256-be31f553c70c",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "123c9d6e-48b4-4a79-9c2c-cf348022512a",
    } ],
    "id" : "034871d6-1f2c-43f2-81d3-0e46a864ad33",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexarrivegsdetails"

 force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "b7569df4-3d59-4e39-9916-b444d62da530",
  "label": "lexCancelRemoveBox",
  "regions": [
    {
      "components": [
        {
  "id" : "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
  "label" : "LexCancelRemoveBox",
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
              "columns": [
                {
                  "UUID": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
          "UUID" : "e015f78b-3948-452d-9df3-fb57eaf1144a",
          "columns" : [ {
            "UUID" : "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
          "regions": [
            {
              "components": [
                {
      "id" : "e015f78b-3948-452d-9df3-fb57eaf1144a",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexCancelRemoveBox",
                  "id": "18cfcc0d-2e74-4439-b0e4-374d6173769c",
          "id" : "de961c6a-bc79-4956-aaf1-9b9a9329cd7b",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
        } ],
        "id" : "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "144d67b6-b37a-48bb-8d3f-c5a642a2eb15",
    } ],
    "id" : "63a06f7d-bca6-430e-b51f-04c307c741f9",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "取消拆盒~消耗品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "9a46d997-620e-4c7b-b471-14f9f099ed5f",
      "id" : "495b4819-9802-4a8b-af22-b33a65ed6dde",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "b0e97eeb-db76-4ec4-9d1a-4020dcecb04e",
    } ],
    "id" : "fc3783d1-cb91-473f-87a0-62c480010a60",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexcancelremovebox"

 force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
  "id" : "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
  "label": "LexConInvoiceView",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "d52f86d0-b463-43a9-9817-40d500fcc2ad",
          "columns" : [ {
            "UUID" : "73c51c99-c8ed-45c9-ab83-89ff66ca5239",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
        },
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "d52f86d0-b463-43a9-9817-40d500fcc2ad",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexConInvoiceView",
          "id": "188f5457-5ba8-4c48-b154-fac11122d6fa",
          "id" : "af1fd8e8-0495-4aa4-a724-b200588463eb",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "97ef1ee1-bf76-4af8-8fb0-67e0f93c9b20",
      "regionName": "header",
        } ],
        "id" : "73c51c99-c8ed-45c9-ab83-89ff66ca5239",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
      "type": "region"
    },
    {
      "id": "01bd66d3-16ee-49b0-8957-6c65fc9e6d35",
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "87b7dcd5-40d6-4441-9443-26d7647ded5c",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "d892a453-fd5d-41e9-a86a-2a5939d74274",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "发票 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "c117564e-23b4-4cd3-8d91-0f58a569c5b5",
      "id" : "0dacce9e-e531-41b1-ad79-6a6efefc9dd1",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0499e9da-7082-412c-8a76-3a002f26f75f",
    } ],
    "id" : "d415f744-fe96-4c81-90b0-73d1b66dafbb",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexconinvoiceview"

 force-app/main/default/experiences/Consumable1/views/lexConsumable.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
  "id" : "756785e1-4fb5-4ab3-b38a-58ea679a4361",
  "label": "LexConsumable",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "105e0268-90b6-4f6e-b018-41d4f9d70489",
              "columns": [
                {
                  "UUID": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
          "UUID" : "57a191f6-fa19-4876-98e5-da8c72cb9258",
          "columns" : [ {
            "UUID" : "6972e5ef-d04e-4c93-a2e6-07c797f78748",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "105e0268-90b6-4f6e-b018-41d4f9d70489",
          "regions": [
            {
              "components": [
                {
      "id" : "57a191f6-fa19-4876-98e5-da8c72cb9258",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexConsumable",
                  "id": "28c07586-c606-4466-93f4-7da43f4323cb",
          "id" : "f9cc8cb4-e94e-4c9e-aeac-91e4cc01875f",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
        } ],
        "id" : "6972e5ef-d04e-4c93-a2e6-07c797f78748",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "2094f211-8183-43a9-84d9-2b41cbc84990",
    } ],
    "id" : "c7989e63-0c78-4086-8ad3-f9db0c99411a",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "订单管理 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "19440ece-25e3-40df-ae9d-788b112b92f1",
      "id" : "ee494697-6008-45fc-a3c8-0bc4b904974b",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d3987b2a-05ec-4b44-a249-70a07a38d553",
    } ],
    "id" : "77747bb3-667b-42f0-8885-822eb331d6c9",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexconsumable"

 force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "f724180a-789f-4a5f-909f-a3b6926cff21",
  "id" : "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
  "label": "LexConsumableAccount",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
          "columns" : [ {
            "UUID" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
        },
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "21aff1b6-3fc5-4eaa-9c90-3909310f21fa",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexConsumableAccount",
          "id": "918c23ca-5bf3-4ed0-80cf-70c22fdc15e5",
          "id" : "5ad65eac-4ab2-4e31-823f-241cd8a31b77",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "53e16625-5ad6-4555-a03e-5ddfc7ed6200",
      "regionName": "header",
        } ],
        "id" : "600f91f5-1068-4b1f-8a86-d0a193bce882",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
      "type": "region"
    },
    {
      "id": "08d8f81e-8b77-4c51-bc72-53efd131a367",
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "da25695d-f912-48f0-a829-ff77681dea16",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "684378e9-c38e-49ee-acc0-ea99f8730e7d",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "客户 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "8922f5cd-dab7-49b9-98d6-dc3193827188",
      "id" : "34026022-6682-46cb-920f-4c24fbf656f8",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0890434c-63ef-4621-b17e-8b995d014686",
    } ],
    "id" : "149173b3-ab4a-47d1-824b-c73e4cee068d",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexconsumableaccount"

 force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
  "id" : "5d615179-dd62-4481-a874-de16a69d7374",
  "label": "LexConsumableAccountInfoPrint",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "74ce3d06-cf05-449f-882f-88400116354b",
              "columns": [
                {
                  "UUID": "1803a98f-aa73-4a73-b8ec-518365d169ec",
          "UUID" : "e9f987a3-92bd-470f-9afb-7804ecfcf578",
          "columns" : [ {
            "UUID" : "81d173bc-f9c3-4758-bc9e-570e99d92545",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "74ce3d06-cf05-449f-882f-88400116354b",
          "regions": [
            {
              "components": [
                {
      "id" : "e9f987a3-92bd-470f-9afb-7804ecfcf578",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexConsumableAccountInfoPrint",
                  "id": "4b082cd8-767e-43f5-94b6-cb5a3113c88a",
          "id" : "03fc88cd-8285-4d6e-878b-5c75456032a2",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "1803a98f-aa73-4a73-b8ec-518365d169ec",
        } ],
        "id" : "81d173bc-f9c3-4758-bc9e-570e99d92545",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "66e4d1fa-43ae-4e10-8387-2fc761caf3d9",
    } ],
    "id" : "4ff49dcd-f175-4fb8-a368-30195f218e22",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "LexConsumableAccountInfoPrint"
        "title" : "客户详细信息 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "41c17f3c-ec08-40cd-b41f-2e14e13f3277",
      "id" : "d08e3a38-3069-4275-b3f5-6db7c28ced59",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "fc6c01a8-09c5-4bd9-80eb-e36d3a65bb84",
    } ],
    "id" : "6b25d2b2-bb26-48ff-9e0f-226821b3d62a",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexconsumableaccountinfoprint"

 force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
  "id" : "0c6f8778-bba4-4726-97f6-b639cce7c99e",
  "label": "LexConsumableOrderManage",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
              "columns": [
                {
                  "UUID": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
          "UUID" : "c816a792-e9df-4280-a595-4f7a2de81a72",
          "columns" : [ {
            "UUID" : "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
          "regions": [
            {
              "components": [
                {
      "id" : "c816a792-e9df-4280-a595-4f7a2de81a72",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexConsumableOrderManage",
                  "id": "bcc9fb43-5bc7-4e22-b4db-4590542b0d63",
          "id" : "480e4dee-4c0b-43d9-b81a-ba3ecd96f4e3",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
        } ],
        "id" : "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "61d4e85c-8cf2-4c5a-9a25-5f7dd8797e86",
    } ],
    "id" : "5425b128-bc13-4529-9741-c37eca368806",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "订单管理 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "ecb86434-590f-47cf-a6b7-b4a2e03f8a45",
      "id" : "01bf62a2-fff9-4f38-8cea-6c4a8df40eda",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "ea264f2a-7bd5-4f4a-97e8-fbddc045e948",
    } ],
    "id" : "44d87bc4-7c1d-43ce-acc5-e20a018fc57d",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexconsumableordermanage"

 force-app/main/default/experiences/Consumable1/views/lexInventory.json

@@ -1,81 +1,68 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
  "label": "lexInventory",
  "regions": [
    {
      "components": [
        {
  "id" : "5a24538d-0a99-40a3-a6a1-4496d0333a05",
  "label" : "LexInventory",
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
              "columns": [
                {
                  "UUID": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
          "UUID" : "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
          "columns" : [ {
            "UUID" : "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
          "regions": [
            {
              "components": [
                {
      "id" : "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexInventory",
                  "id": "f87bb2fd-5cac-490f-ad2b-c0c96882413c",
          "id" : "567f3188-aa85-40b7-b2fa-9caf501e4b44",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
        } ],
        "id" : "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6f5860dd-27a5-44e6-8c5d-2d1011245d0d",
    } ],
    "id" : "45b8b9b5-bc3e-45f2-b8fb-a5c5b77924b6",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "盘点~消耗品管理系统"
        "title" : "库存盘点 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "7eb8f5a5-046e-44af-ba4f-c2805b21ef82",
      "id" : "49bde76e-3088-4ae0-91e2-a0d7f68a7ca6",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e30387d3-bc5d-45e1-9b2f-4c232581c35a",
    } ],
    "id" : "9e364a81-0317-445a-b308-8746e418eea6",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lex-inventory"
  "viewType" : "custom-lexinventory"
}

 force-app/main/default/experiences/Consumable1/views/lexInventoryView.json

@@ -4,61 +4,50 @@
  "dataProviders": [],
  "id": "afb34dd9-404b-4bea-949d-07c42681d821",
  "label": "LexInventoryView",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
              "columns": [
                {
          "columns" : [ {
                  "UUID": "7dae9038-fe28-4dd2-beda-d90442f650d1",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "747680b6-fa7d-40b9-9fb2-5eeedec2111f",
          "regions": [
            {
              "components": [
                {
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexinventoryViewLWC",
                  "id": "2db28040-90b0-4c1c-8793-28479780c069",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
        } ],
              "id": "7dae9038-fe28-4dd2-beda-d90442f650d1",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "f951952b-7e3c-4622-bef8-b6c333c9913d",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -68,13 +57,11 @@
          "id": "54a2e6e2-68ec-4ad2-9e6d-e2ab853931bc",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "417422ac-dd59-4afe-bf23-e35fda0bc023",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexinventoryview"

 force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
  "id" : "e8224149-f1b9-4c44-8839-4d9737739c72",
  "label": "LexOutboundorderImport",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "83050955-aa3b-4e32-80a6-da5359b8362a",
          "columns" : [ {
            "UUID" : "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
        },
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "83050955-aa3b-4e32-80a6-da5359b8362a",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexOutboundorderImport",
          "id": "3a2da04d-2fb3-4dc7-aadc-40c9a0fb049e",
          "id" : "68e59073-ba5b-46d7-b8cd-552587a748a2",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "280aa141-39f4-4ce6-8d22-f8c7132cc3bf",
      "regionName": "header",
        } ],
        "id" : "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
      "type": "region"
    },
    {
      "id": "396f0d91-64bb-48dd-a3c8-428458d7b4d1",
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "f58362fc-b12d-41ba-bb99-fce2e6dba3fb",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "a2a09aa1-691c-44b4-b20a-6450cfe54c0b",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "出库 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "20aa6845-e7bd-4cec-814f-c8a4422f0dd6",
      "id" : "e562ea3b-ac29-4271-9010-481f74d59780",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "bb3f92d2-e08e-411c-9a7b-196a86da29d6",
    } ],
    "id" : "ddc00cfb-8eb3-49b7-8d9a-44ac4fe1979b",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexoutboundorderimport"

 force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
  "id" : "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
  "label": "LexOverdueStock",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "cdbb12a5-9c06-495c-97bd-111a00ed0880",
          "columns" : [ {
            "UUID" : "4d9b4158-4336-47ad-8d7f-f2814c843237",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
        },
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "cdbb12a5-9c06-495c-97bd-111a00ed0880",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexOverdueStock",
          "id": "4a56ea96-8dbf-466a-8bae-c63c91494b47",
          "id" : "1840dac3-e335-4628-b86b-d46d31831af5",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "a4b13816-1cc1-4942-aac1-cd4a877f682a",
      "regionName": "header",
        } ],
        "id" : "4d9b4158-4336-47ad-8d7f-f2814c843237",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
      "type": "region"
    },
    {
      "id": "1bef605d-91f2-4557-bd39-00d4b2427d95",
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "70a9cbdd-d242-44d6-9ade-f12aa57a6101",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "e77e1337-6376-42be-847a-d4bd459d81ce",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "过期库存销存~消耗品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "0f5328a8-e4da-44d4-aa05-943f2aeb1a05",
      "id" : "65ba038f-9318-496d-9863-751d9b084cb0",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6da76625-3ea0-4b35-b08e-99dd6de43df8",
    } ],
    "id" : "87ad5976-ac2f-446f-aa1e-f9a0d34525fb",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexoverduestock"

 force-app/main/default/experiences/Consumable1/views/lexProductLimitEdit.json

@@ -4,61 +4,50 @@
  "dataProviders": [],
  "id": "57a80c74-e471-4b90-b214-580f7d3b66cd",
  "label": "LexProductLimitEdit",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
              "columns": [
                {
          "columns" : [ {
                  "UUID": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "59856db5-4bb3-414f-83d5-8ae14ccfc0d6",
          "regions": [
            {
              "components": [
                {
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexProductLimitEdit",
                  "id": "a096dd49-afe0-4796-8af0-cedd62664f2c",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
        } ],
              "id": "b78140a7-5f4e-4685-a3c4-0a92ba950dc7",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "d17f6f02-da3e-4235-81d9-1502e0ec6ca3",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -68,13 +57,11 @@
          "id": "f5b7eb44-8ce3-40c9-b71a-d5d9f3552955",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "2257c0fb-ca9b-4e22-9e82-b20b1c22eb1d",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexproductlimitedit"

 force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
  "label": "lexRemoveBox",
  "regions": [
    {
      "components": [
        {
  "id" : "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
  "label" : "LexRemoveBox",
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
              "columns": [
                {
                  "UUID": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
          "UUID" : "c8d284bf-b761-4de7-88ad-d976e03783c2",
          "columns" : [ {
            "UUID" : "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
          "regions": [
            {
              "components": [
                {
      "id" : "c8d284bf-b761-4de7-88ad-d976e03783c2",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexRemoveBox",
                  "id": "d16c00a3-c5f4-4385-91f3-834488f39600",
          "id" : "ff8f68eb-eb9b-40db-94ca-6aec9fb379c3",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
        } ],
        "id" : "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "8e5500f1-3f43-475d-a41f-26a35a4fd06e",
    } ],
    "id" : "e555311d-b588-4ab1-add1-4f830b0ebc03",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "拆盒 ~消耗品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "c044df7e-0f7d-459b-9082-4e5b89bca9e1",
      "id" : "ad6dcd28-5872-4bac-b016-ea09e096a6c3",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "06074999-fc27-4540-a8d6-a467900db79e",
    } ],
    "id" : "7c28cb01-e082-404a-81a8-7afe5f78c023",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexremovebox"

 force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
  "id" : "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
  "label": "LexSaleAndDelivery",
  "regions": [
    {
      "id": "1f0946e1-1735-4650-a205-dd61df8759d4",
      "regionName": "header",
      "type": "region"
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "02b47908-d44c-4ffe-89b4-6aad09343bd0",
          "columns" : [ {
            "UUID" : "a1846e1c-c395-4e77-9218-5375bac83cb8",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
    },
    {
      "components": [
        {
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "02b47908-d44c-4ffe-89b4-6aad09343bd0",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexSaleAndDelivery",
          "id": "e3313269-05be-4724-aa4e-db0958a1ddd0",
          "id" : "b77b243f-d2ce-42ff-8349-048ba0100837",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "3367d193-f337-49ca-95ca-6ac1caaa7349",
        } ],
        "id" : "a1846e1c-c395-4e77-9218-5375bac83cb8",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
        "type" : "region"
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "ed598892-294e-43c2-b91c-4df7dae88a1b",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "e25f498e-41fb-4f4d-8dfe-fbf9a069cb93",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "出库 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "84ec3d27-0378-42f8-a3ac-3fd350b72067",
      "id" : "5ee61636-ae06-4737-9d50-20fd9a6971db",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "430f1ad6-c368-493e-b311-28818c66e9cd",
    } ],
    "id" : "e27b9d74-50aa-4022-bffa-7f6a08f707b8",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexsaleanddelivery"

 force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json

@@ -1,54 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "componentName": "siteforce:sldsOneColLayout",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
  "id" : "c2e9c913-ab1c-4b38-899b-136fb95066fb",
  "label": "LexSummonsCreat",
  "regions": [
    {
      "id": "6388ef86-a800-4056-811f-d56f7381b8a1",
      "regionName": "header",
      "type": "region"
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "2f081513-f8b1-4a18-93ed-07528785644e",
          "columns" : [ {
            "UUID" : "0034a928-ed12-4a8f-8b61-e2a879be675e",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
    },
    {
      "components": [
        {
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "2f081513-f8b1-4a18-93ed-07528785644e",
      "regions" : [ {
        "components" : [ {
          "componentAttributes": {},
          "componentName": "c:lexSummonsCreat",
          "id": "2cf76214-9746-4039-aa9f-8d956261bf1e",
          "id" : "78274e15-2cc6-4863-8ce4-2d10e89d802f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "5080fa3e-dede-46af-8878-00cefafbea4a",
        } ],
        "id" : "0034a928-ed12-4a8f-8b61-e2a879be675e",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
        "type" : "region"
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "74103ed0-eb74-4ae0-a9f5-aa1bed790517",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "9138e351-3acd-45bd-8f86-81f98fc33515",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "出库单明细 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "08468c2f-c8ee-4a89-b3a4-e8a329634e17",
      "id" : "569ba6aa-c702-4a13-aed6-79a792706f37",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "29505c19-f110-4803-a463-159e2e71fb3d",
    } ],
    "id" : "cf2865b2-d5a1-434f-b53f-927218bca79c",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lexsummonscreat"

 force-app/main/default/experiences/Consumable1/views/lexTopPage.json

@@ -1,80 +1,67 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "bda75bd7-499d-4d41-ad47-2d49173854dd",
  "label": "lexTopPage",
  "regions": [
    {
      "components": [
        {
  "id" : "09c93676-a531-4ba7-8708-cc47f8458c90",
  "label" : "LexTopPage",
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "5d2f345c-27a4-493e-b41b-0aa663636b99",
              "columns": [
                {
                  "UUID": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
          "UUID" : "3493c458-56a0-4990-8499-772754716049",
          "columns" : [ {
            "UUID" : "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
                  "columnKey": "1",
                  "columnName": "Column 1",
                  "columnWidth": "12",
                  "seedComponents": []
                }
              ]
          } ]
            },
            "sectionHeight": 300
          },
          "componentName": "forceCommunity:section",
          "id": "5d2f345c-27a4-493e-b41b-0aa663636b99",
          "regions": [
            {
              "components": [
                {
      "id" : "3493c458-56a0-4990-8499-772754716049",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {},
                  "componentName": "c:lexTopPage",
                  "id": "bcc522fd-ec7f-44db-a05e-54157d9c1f3b",
          "id" : "a987052c-27fc-4881-a10a-76813f6f1a37",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
        } ],
        "id" : "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
              "regionLabel": "Column 1",
              "regionName": "1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "34880e8c-124a-46db-ab66-c8ab4dc1af9c",
    } ],
    "id" : "fef29330-80e6-40e7-83ce-74b60dd68887",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "消耗品管理系统"
        "title" : "订单提示 ~ æ¶ˆè€—品管理系统"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "638a5a1c-d763-42b1-9ffa-f45692336891",
      "id" : "6dbf3064-0f5f-4648-a787-4a09f1d915fe",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "9f86202b-a3f8-4a98-9255-352caf7a80c8",
    } ],
    "id" : "8cd1759d-130c-40a0-99b0-395cdd92cdc8",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-lextoppage"

 force-app/main/default/experiences/Consumable1/views/login.json

@@ -1,13 +1,18 @@
{
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
  "id" : "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
  "label": "Login",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : { },
      "componentName" : "salesforceIdentity:communityLogo2",
      "id" : "a96beff8-2727-4f74-b08a-e908ab6e72be",
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    }, {
          "componentAttributes": {
            "forgotPasswordLabel": "忘记密码？",
            "forgotPasswordUrl": "/ForgotPassword",
@@ -19,72 +24,41 @@
            "usernameLabel": "用户名"
          },
          "componentName": "salesforceIdentity:loginForm2",
          "id": "d6a2d892-7104-4e50-8da1-d4b81c2fd790",
      "id" : "2de8135d-cb57-4614-9afe-2453f1cbe676",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0249aee3-9513-4ce4-bc73-57051629556f",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Login"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "a508199c-9ac8-499b-9259-710b933385c9",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "b1f4c1e9-2975-469b-8450-23c36497bdb0",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    },
    {
      "components": [
        {
          "componentAttributes": {},
          "componentName": "salesforceIdentity:communityLogo2",
          "id": "44fd503d-4872-47ae-bd55-4e249e60eaac",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "headerText": "",
            "showHeader": false,
            "useCommunityDomainSso": true
          },
          "componentName": "salesforceIdentity:socialLogin2",
          "id": "5197f70b-55e5-4e64-827c-54630cc74b0c",
      "id" : "f4d72a64-5e5f-48d8-8bb7-4253a8309b40",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "ad5d0647-ce12-47ee-8439-a47a35d876ce",
      "regionName": "header",
    } ],
    "id" : "11b4798e-fa84-4594-beea-500d991e23f2",
    "regionName" : "content",
      "type": "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "customHeadTags" : "",
        "description" : "",
        "title" : "Login"
    },
    {
      "id": "70260364-5f55-47f8-9e09-bf445957eea1",
      "regionName": "sidebar",
      "componentName" : "forceCommunity:seoAssistant",
      "id" : "c72bcc7d-29ea-40e6-969c-c818f267f8f4",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "02d41dc1-9a37-47cf-90c8-438d40bba670",
    "regionName" : "sfdcHiddenRegion",
      "type": "region"
    },
    {
      "id": "b50b01b5-4352-4dce-850c-f4d477bb871b",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "login-home"

 force-app/main/default/experiences/Consumable1/views/loginError.json

@@ -1,56 +1,47 @@
{
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
  "id" : "ba40442c-80fc-411f-8c02-9cfce2ab1372",
  "label": "Login Error",
  "regions": [
    {
      "id": "79334ce5-8806-43ed-824a-36948d933f87",
  "regions" : [ {
    "id" : "18c0d543-48fc-4503-82bf-96cb3cb61e53",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "a7518e76-7f61-466f-a82a-9880b806f1af",
      "id" : "98a859f9-d38a-4454-b376-39558ba5a564",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "72829da8-38fa-478c-a4d8-70e3cbb74749",
    } ],
    "id" : "6778281e-69dc-4122-abff-15414362a3e3",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "0e1faede-f160-45cf-83d8-9c0256af66dc",
  }, {
    "id" : "562ba090-15e4-4844-baa3-568c08ef67be",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Login Error"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "8afbbb1d-2436-4920-83de-2485490447f8",
      "id" : "1367586b-b337-4e9b-b465-e2acd34738f8",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d30d0bbc-dc48-4a9e-a6a4-56831143992b",
    } ],
    "id" : "012e5756-ea8f-4d49-9778-29654974830d",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "login-error"

 force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json

@@ -1,91 +1,75 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "51554054-4eaf-44f6-96bd-b90145e6e078",
  "id" : "b253bc1d-fe4a-4156-91f4-88f4725a3616",
  "label": "MDF and Coop",
  "regions": [
    {
      "id": "698ada79-fc75-4ade-807e-75c384962660",
  "regions" : [ {
    "id" : "b9dd4ac2-817d-4d34-874f-58def515fa47",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "             <p>                 <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span>             </p>        "
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "f49e0798-27c8-4219-84fa-8b3c270c0052",
      "id" : "d8f1484b-ac5d-4563-adc7-7c5635d6cf40",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "tabsetConfig": {
              "UUID": "e9ff9632-77ea-4754-b16c-2bce71e42671",
          "UUID" : "08adad9c-71b1-4370-8572-a165f1f855a9",
              "activeTab": "tab1",
              "tabs": [
                {
                  "UUID": "37fc97f7-cde7-4498-aee2-80be33c2c147",
          "tabs" : [ {
            "UUID" : "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "filterName": "Recent",
                        "scope": "PartnerFundAllocation"
                      },
                      "fqn": "forceCommunity:objectHome"
                    }
                  ],
            } ],
                  "tabKey": "tab1",
                  "tabName": "Fund Allocations"
                },
                {
                  "UUID": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
          }, {
            "UUID" : "24cea51a-4f10-469b-ab68-750473d6a847",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "filterName": "Recent",
                        "scope": "PartnerFundRequest"
                      },
                      "fqn": "forceCommunity:objectHome"
                    }
                  ],
            } ],
                  "tabKey": "tab2",
                  "tabName": "Fund Requests"
                },
                {
                  "UUID": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
          }, {
            "UUID" : "46f65d8c-5983-4c38-9ea8-df27e49d3084",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "filterName": "Recent",
                        "scope": "PartnerFundClaim"
                      },
                      "fqn": "forceCommunity:objectHome"
                    }
                  ],
            } ],
                  "tabKey": "tab3",
                  "tabName": "Fund Claims"
                }
              ],
          } ],
              "useOverflowMenu": false
            }
          },
          "componentName": "forceCommunity:tabset",
          "id": "e9ff9632-77ea-4754-b16c-2bce71e42671",
          "regions": [
            {
              "components": [
                {
      "id" : "08adad9c-71b1-4370-8572-a165f1f855a9",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "enableInlineEdit": true,
                    "filterName": "Recent",
@@ -103,20 +87,17 @@
                    "showSearchBar": true
                  },
                  "componentName": "forceCommunity:objectHome",
                  "id": "3531b597-cb4c-4535-a558-8092b6fa8978",
          "id" : "26811630-f8f1-4326-91cc-25e8d8f712b3",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "37fc97f7-cde7-4498-aee2-80be33c2c147",
        } ],
        "id" : "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
              "regionLabel": "Fund Allocations",
              "regionName": "tab1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "enableInlineEdit": true,
                    "filterName": "Recent",
@@ -134,20 +115,17 @@
                    "showSearchBar": true
                  },
                  "componentName": "forceCommunity:objectHome",
                  "id": "78d6e688-cf9c-4af1-ade6-6daeb2457ba7",
          "id" : "8a6128de-fe3d-4cf1-b3a3-a81eefa1afd5",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
        } ],
        "id" : "24cea51a-4f10-469b-ab68-750473d6a847",
              "regionLabel": "Fund Requests",
              "regionName": "tab2",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "enableInlineEdit": true,
                    "filterName": "Recent",
@@ -165,33 +143,28 @@
                    "showSearchBar": true
                  },
                  "componentName": "forceCommunity:objectHome",
                  "id": "2b94ac35-0ffc-4846-a564-8ce23c8c82b5",
          "id" : "d838a652-cd5d-4c9c-bce0-37ec29b10b2b",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
        } ],
        "id" : "46f65d8c-5983-4c38-9ea8-df27e49d3084",
              "regionLabel": "Fund Claims",
              "regionName": "tab3",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "8af61955-d97e-44f2-b708-b0b1f86dd6e4",
    } ],
    "id" : "4a8ad10b-ad7d-4821-90e2-73e4e75738fe",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "1b5dacc9-d26b-484f-8de0-f7bee7b2b519",
  }, {
    "id" : "d8a1fe61-f24d-4969-bfa9-9745db5d1021",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "mdf"

 force-app/main/default/experiences/Consumable1/views/messages.json

@@ -1,26 +1,22 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
  "id" : "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
  "label": "Messages",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceChatter:messages",
          "id": "76859eb9-b786-4b53-9285-b3a81a95cd53",
      "id" : "e42525c8-73ea-4e9f-8306-81021473d168",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "665047c1-c182-448a-bab3-d5a0d581d5bb",
    } ],
    "id" : "a60f42f5-2ed2-4a01-93e5-dff8f3f5552f",
      "regionName": "content",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "messages"

 force-app/main/default/experiences/Consumable1/views/myAccount.json

@@ -1,67 +1,56 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:dynamicLayout",
  "dataProviders": [],
  "id": "25eab78c-263e-4a55-8bff-ad852efc15c9",
  "id" : "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
  "label": "My Account",
  "regions": [
    {
      "id": "c1b1b648-5ba6-4a83-8907-be9c4abd0d6d",
  "regions" : [ {
    "id" : "23da0649-b638-4675-96dc-b2c9ab32b443",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "background": "background: rgba(0,0,0,0)",
            "backgroundOverlay": "rgba(0,0,0,0.5)",
            "contentAreaWidth": 100,
            "sectionConfig": {
              "UUID": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
              "columns": [
                {
                  "UUID": "8086ee04-373f-44dc-a32d-1b3949308dcf",
          "UUID" : "f07182ad-75fc-4431-b6ba-400214c3d0ac",
          "columns" : [ {
            "UUID" : "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
                  "columnKey": "col1",
                  "columnName": "column 1",
                  "columnWidth": "12",
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {
                        "recordId": "{!CurrentUser.accountId}",
                        "sfdc:identifier": "forceCommunity_recordHeadline"
                      },
                      "fqn": "forceCommunity:recordHeadline"
                    },
                    {
            }, {
                      "attributes": {
                        "recordId": "{!CurrentUser.accountId}",
                        "sfdc:identifier": "forceCommunity_recordHomeTabs"
                      },
                      "fqn": "forceCommunity:recordHomeTabs"
                    }
                  ]
                }
              ]
            } ]
          } ]
            },
            "sectionHeight": 32
          },
          "componentName": "forceCommunity:section",
          "id": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
          "regions": [
            {
              "components": [
                {
      "id" : "f07182ad-75fc-4431-b6ba-400214c3d0ac",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "recordId": "{!CurrentUser.accountId}"
                  },
                  "componentName": "forceCommunity:recordHeadline",
                  "id": "0498afe2-2170-4e41-9a7b-5d96e1a9820b",
          "id" : "76e15d29-c38a-4c72-94b5-08c54a39de76",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                },
                {
        }, {
                  "componentAttributes": {
                    "detailsTabLabel": "Details",
                    "discussionsTabLabel": "Feed",
@@ -75,34 +64,29 @@
                    "timelineTabLabel": "Activity"
                  },
                  "componentName": "forceCommunity:recordHomeTabs",
                  "id": "9151bf03-f322-4ccf-93dc-3367571ea0f6",
          "id" : "7d8fefed-3819-4d75-8e8a-4757c623ab25",
                  "renderPriority": "NEUTRAL",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "8086ee04-373f-44dc-a32d-1b3949308dcf",
        } ],
        "id" : "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
              "regionLabel": "column 1",
              "regionName": "col1",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "c12e8d8d-e1f3-43b9-8543-5c285db3c848",
    } ],
    "id" : "b79a556f-e9df-45e1-bdab-1be9be91cfff",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "c6a9fc30-77e8-458b-a7f2-2f4d9fefc79b",
  }, {
    "id" : "f4a5b0fd-e283-47e3-9183-5364ef798372",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "my-account"

 force-app/main/default/experiences/Consumable1/views/questionDetail.json

@@ -1,13 +1,11 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsTwoCol84Layout",
  "dataProviders": [],
  "id": "d4ed7ed0-3745-461e-acd3-32108749ab93",
  "id" : "c29033d4-ea89-4311-9a8f-9b1cee010f96",
  "label": "Question Detail",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "bannerText": "",
            "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
@@ -18,87 +16,74 @@
            "uniqueNameOrId": "{!recordId}"
          },
          "componentName": "forceCommunity:headline",
          "id": "30e7636a-9f44-4386-927f-dc05e6dca7c3",
      "id" : "84f7129f-6ae2-44fa-8479-fda420f20cf4",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "5dc8a770-ab6e-425f-9737-c564f0ff61b8",
    } ],
    "id" : "eb922188-1611-42f3-be3f-671128373c93",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "id": "{!feedItemId}"
          },
          "componentName": "forceCommunity:feedItemDetail",
          "id": "541c18f5-73d0-4d1e-a815-5a6779bde321",
      "id" : "5f16c8ce-8910-4700-bf92-03bebb56d251",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d3c4b9c8-ec9d-4b90-bc4b-c0553ae852e6",
    } ],
    "id" : "23ae6845-c63c-4df8-b294-1460939daf5b",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "numberOfItems": 5,
            "showViewCounts": true,
            "title": "Related Questions"
          },
          "componentName": "selfService:similarQuestions",
          "id": "3ec73f50-3c08-4ffa-9e59-13ffc1fd8262",
      "id" : "2560050a-7f4a-4fe3-833b-4086f89d7cae",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "channel": "DefaultChannel",
            "title": ""
          },
          "componentName": "forceCommunity:recommendations",
          "id": "034fc1f4-bc73-4cc7-b3de-62ce6abadbd5",
      "id" : "fefd9c6b-eac3-425b-a0a6-2721a4131d4f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "c3057ca7-1e03-44b2-854d-944c6b2710c6",
    } ],
    "id" : "386f4a49-d920-4888-a249-1ae1f4c1b0d8",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "9b430d39-728f-4c02-8d61-7140d62ff5b7",
  }, {
    "id" : "efd4c33f-e3bf-4021-abf9-be0b741a0cd7",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record.Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "b5bcdcc8-6b0b-4742-916f-7690109d3a8e",
      "id" : "f0017168-74ce-4587-8af7-4c5e0dc965eb",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e66b0876-ced9-4b9e-a9dc-d3ca8b04dd3b",
    } ],
    "id" : "05ba98f5-e29b-47ce-8099-b16e50e34f30",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "feeditem"

 force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json

@@ -1,38 +1,32 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "b076cb5b-405f-4199-b9be-7429234ce226",
  "id" : "be244254-9e8f-46bd-83e0-a6cdb3780540",
  "label": "Quip Docs Related List",
  "regions": [
    {
      "id": "e701d724-1504-44c7-92a3-ea1ec941cf73",
  "regions" : [ {
    "id" : "2a9b05d7-cafd-4e4d-8f30-067e7e2f45ed",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "parentRecordId": "{!recordId}"
          },
          "componentName": "forceCommunity:relatedQuipItemsView",
          "id": "a9d4f298-cfdd-48b7-ace5-0c47aadf2876",
      "id" : "a2c16258-72fb-4eb3-8b04-b80f8b4beafb",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "b12e6374-255d-413c-93a1-d14857aaf21a",
    } ],
    "id" : "9bc5f2b8-7b65-47fc-a3d5-1d83ada44a72",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "a6b90480-6c77-4df3-a631-065e1f4f2c1b",
  }, {
    "id" : "73a8a853-5872-4055-8a42-9723c11db0e9",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "extrelated-quip"

 force-app/main/default/experiences/Consumable1/views/recordDetail.json

@@ -1,28 +1,24 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "c8075095-c3fd-4d07-8079-0eb063287ad7",
  "id" : "d30889c1-09fc-407a-8d9d-155b305cce6f",
  "label": "Record Detail",
  "regions": [
    {
      "id": "6da91020-2e9a-45bb-824c-c649aa91eb2b",
  "regions" : [ {
    "id" : "58b8dc89-c614-4b2a-be76-1cd2733c7a2d",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "90d97e07-565d-4df0-b939-466bdcd3af4a",
      "id" : "d6471194-6314-4cc2-ad8d-8844760b584f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
@@ -31,45 +27,39 @@
            "showLegacyActivityComposer": false,
            "tab1Type": "details",
            "tab2Type": "related",
            "tab3Type": "chatter",
        "tab3Type" : "none",
            "tab4Type": "none",
            "timelineTabLabel": "Activity"
          },
          "componentName": "forceCommunity:recordHomeTabs",
          "id": "8857f111-6bd5-4e6e-aeaf-c5222f826b61",
      "id" : "43f7a144-34dd-4fe7-a4d6-9b4ce60a2633",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "bf3bbcd3-bf99-43a1-a4d8-139ede220c94",
    } ],
    "id" : "79ac024a-2855-4c3d-ad2e-1529cb3588a7",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "b0395436-3796-48d1-be24-0fdc721d91a3",
  }, {
    "id" : "73ccaf9e-c514-4a24-aaf6-c5c0d176c356",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "0a293aa4-d48c-4b46-8a04-30d0a0e02f54",
      "id" : "23c28297-68e4-4693-b7c2-eddb3a672965",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "24d73a32-25b2-404e-8b51-64f354ada477",
    } ],
    "id" : "06f1cca0-baa5-4d1c-b943-72735f101956",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail"

 force-app/main/default/experiences/Consumable1/views/recordList.json

@@ -1,36 +1,45 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "568148b6-8356-45bb-a31e-e8c320ff9726",
  "id" : "f14a9999-9077-4660-a62f-b9df05228f6c",
  "label": "Record List",
  "regions": [
    {
      "id": "26cdcc22-9daa-47ef-99dc-be188646430f",
  "regions" : [ {
    "id" : "c142f9c9-d513-4938-8678-c78cb05ca097",
      "regionName": "header",
      "type": "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "enableInlineEdit" : true,
        "filterName" : "{!filterId}",
        "layout" : "FULL",
        "pageSize" : 25,
        "scope" : "{!objectName}",
        "showActionBar" : true,
        "showChartsPanel" : true,
        "showDisplay" : "showall",
        "showFilterPanel" : true,
        "showImageIcon" : true,
        "showManualRefreshButton" : true,
        "showObjectName" : true,
        "showPinnedList" : true,
        "showSearchBar" : true
    },
    {
      "components": [
        {
          "componentAttributes": {},
          "componentName": "c:RetrospectiveWeeklyReport",
          "id": "9a2492e1-96b7-48dc-bfb4-c01067848016",
      "componentName" : "forceCommunity:objectHome",
      "id" : "9cf46f79-994f-4674-9cf3-8f1309488f9e",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e56df536-cc19-4136-97d0-fe33a9209a61",
    } ],
    "id" : "2d62ef08-0512-4116-8b2c-877e41412967",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "24a8ec26-2d89-4203-9025-61f05c4d8a2b",
  }, {
    "id" : "53ed7ccf-2c5e-428f-84aa-9c122f0a2031",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list"

 force-app/main/default/experiences/Consumable1/views/register.json

@@ -1,31 +1,27 @@
{
  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
  "appPageId" : "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
  "id" : "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
  "label": "Register",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "salesforceIdentity:communityLogo2",
          "id": "9c0037ff-0d41-4d35-b8c6-4dc80d41c19a",
      "id" : "03d0e758-407a-4e8e-83ee-5a0ab3c4e2a0",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "76521ecb-efe5-42bf-870c-0689113e2470",
      "id" : "59a3555f-3c74-470e-a473-bb10cbe44afb",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "confirmPasswordLabel": "Confirm Password",
            "emailLabel": "Email",
@@ -39,57 +35,50 @@
            "submitButtonLabel": "Sign Up"
          },
          "componentName": "salesforceIdentity:selfRegister2",
          "id": "a9570792-c915-4d1a-9118-10d822a486ca",
      "id" : "b4dd7cc4-4fc4-4f38-bd0e-c89b1f32590b",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "headerText": "",
            "showHeader": false,
            "useCommunityDomainSso": true
          },
          "componentName": "salesforceIdentity:socialLogin2",
          "id": "ebe05af6-96dc-4fce-9e84-4d4f3431c32a",
      "id" : "3af49aa2-c5df-472d-a9f8-d1320b632c9a",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "b28a8b4b-abd0-4e0e-a7d3-906c8325d1b6",
      "id" : "a1dd5955-819a-4921-80e5-29882955ca7e",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "8ba378ad-f887-47f5-854b-ad866edaecc6",
    } ],
    "id" : "4d46ac5c-75c6-4730-a2ac-bc191a179149",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Register"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "14c2fe6e-169e-43ca-9cba-8b06e14820b5",
      "id" : "fce946a1-2d69-4ed8-bf94-2a246fc10291",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "e6ab04a5-8f13-41ee-bc2c-f40309ba6b5e",
    } ],
    "id" : "7d12b5c7-f9c8-45e9-a4e8-71d4639011af",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "self-register"

 force-app/main/default/experiences/Consumable1/views/relatedRecordList.json

@@ -1,18 +1,15 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "172db5bf-c37b-4cee-853b-212bf73517d7",
  "id" : "2a182209-2527-4335-b672-176196ee6a0d",
  "label": "Related Record List",
  "regions": [
    {
      "id": "0b2e1664-3809-4c37-b7e4-20b63faf9e5e",
  "regions" : [ {
    "id" : "6caa2d71-5392-4b0c-b738-9ac48f16aa52",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -23,22 +20,19 @@
            "showRowNumbers": true
          },
          "componentName": "forceCommunity:relatedList",
          "id": "2ba8fce5-1fdb-4d3d-804e-f6790c20e360",
      "id" : "d476d8c7-4802-4819-951f-39a101f6be63",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "766cafb3-a3bf-47f0-aca8-e6358ffe63e7",
    } ],
    "id" : "715ead5b-8d41-4edc-bf80-4daebe3464c7",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "e07e0baf-8c53-44c3-b957-5e12464c2137",
  }, {
    "id" : "d6ef29fb-2766-4065-a1c9-2e251d3a24da",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist"

 force-app/main/default/experiences/Consumable1/views/reportBuilder.json

@@ -1,38 +1,32 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
  "id" : "059d5f4a-e616-4540-be96-a34b294fb2a4",
  "label": "Report Builder",
  "regions": [
    {
      "id": "dba98a8a-984b-42ed-9b2c-c979fbc59d0b",
  "regions" : [ {
    "id" : "b0668fae-e6be-4e0f-85ad-0bd2ff51e3f4",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:reportBuilder",
          "id": "6beb6fa8-c9bf-4990-b075-edd5e3022e32",
      "id" : "2d38f9cf-474d-490e-92d0-ab02343f9c7a",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d727fea1-1d73-48c4-b2ac-be189e71a38b",
    } ],
    "id" : "69520259-ca39-49a9-bc51-28a53ce45025",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "529179bd-e9d3-4070-b7b8-e657e5f5a36b",
  }, {
    "id" : "2bcf6747-9ca7-4726-8e9a-dd1334643433",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "createreport"

 force-app/main/default/experiences/Consumable1/views/reportDetail.json

@@ -1,56 +1,47 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
  "id" : "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
  "label": "Report Detail",
  "regions": [
    {
      "id": "b8a2ac35-b501-4034-a616-5f54591b17d0",
  "regions" : [ {
    "id" : "993df7e2-02c2-4043-80f2-75b1fc26b624",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:reportPage",
          "id": "abe06f62-acc2-41c3-809c-1f150f8841da",
      "id" : "a1126338-71f3-4c8b-9fad-fdb3915a12a4",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "8cdd6f99-9662-4a58-b0ee-4065486d0ef4",
    } ],
    "id" : "993ff9cc-3b17-46b6-a40d-f1f97c4db48c",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "a10f13ff-f8c2-433d-82e5-20397d085c0c",
  }, {
    "id" : "8429749f-ee7b-4be7-b953-ce1a28fe724e",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "bdc1ac10-229a-4c7b-97c7-eb30938a33db",
      "id" : "a848b6bf-1473-4426-ad50-f3e85894c8c2",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d1410883-3540-4f4c-9b28-06294a5a0248",
    } ],
    "id" : "c3a6a3e2-ce86-4417-ba50-39bb2e8d6939",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-00O"

 force-app/main/default/experiences/Consumable1/views/reportList.json

@@ -1,36 +1,30 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "f71c1609-6433-4cf0-8846-695e50897517",
  "id" : "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
  "label": "Report List",
  "regions": [
    {
      "id": "dca7f9b0-515d-46aa-8122-e600b7eb2b35",
  "regions" : [ {
    "id" : "21fd7f4b-ed35-4d5e-ba32-40b7cabd6c5a",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceCommunity:reportList",
          "id": "6687e39c-5cf3-478c-9a1c-214f17e3c358",
      "id" : "48d0998f-cc83-4f4d-8467-473e2648f1d5",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "612fbb2a-1b08-4491-aa90-af9c07e3077b",
    } ],
    "id" : "165cdeb7-c542-4a6a-8c42-214baade96e1",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "1bb69df7-0e36-45ef-853e-3c9367670818",
  }, {
    "id" : "1fce8eb4-ac5b-4828-9fea-364d5916925b",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-00O"

 force-app/main/default/experiences/Consumable1/views/resources.json

@@ -1,74 +1,62 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsTwoCol84Layout",
  "dataProviders": [],
  "id": "2feda9aa-a785-4e98-9448-352e28d95b34",
  "id" : "dc215254-3731-423c-ba11-3d87746598e8",
  "label": "Resources",
  "regions": [
    {
      "id": "6372864b-d004-480d-a164-80d5c483d6d5",
  "regions" : [ {
    "id" : "72cef312-c96f-46e1-859d-1dfc1ac2c05a",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "librariesHeaderLabel": "Libraries",
            "showWorkspaceImage": true
          },
          "componentName": "forceCommunity:workspacesList",
          "id": "2e0e0428-6e7c-4b95-9e9e-4e82022fa404",
      "id" : "d02b982c-c404-4ee6-b7eb-81cc247d2e58",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "eb700be4-2afe-4df5-94b6-0f0cc019d588",
    } ],
    "id" : "a5fb005e-9493-44c8-be82-daa9ed4855db",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "title": "Popular Now"
          },
          "componentName": "forceChatter:recommendationsBig",
          "id": "285d61be-06fc-4a6f-aaee-3ecbb483b948",
      "id" : "2a81731a-6fd2-4087-a360-23531384ce7b",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "180d635c-3d79-40c1-a9be-466504176d9e",
    } ],
    "id" : "5f304697-36f3-4e31-985d-b54afad66c28",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "0d2455d9-0fcf-4a57-b9b9-85ef03129973",
  }, {
    "id" : "31ffad04-7009-47aa-b99a-01f08cb17d10",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Resources"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "413ba905-225b-4c23-aa6a-e07b7f2d8b28",
      "id" : "a49b7653-081c-4721-ab11-85ec5590cf32",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "a81d27b2-b367-40c4-a1f2-d24a2bb0f930",
    } ],
    "id" : "85fe3418-3e87-45e0-ab01-9530875c41c3",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "files"

 force-app/main/default/experiences/Consumable1/views/search.json

@@ -1,58 +1,44 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "99b69c91-c8d8-42fe-91af-6f71e4612910",
  "id" : "74aeae6d-8d40-433e-8168-45175ee356a6",
  "label": "Search",
  "regions": [
    {
      "id": "d3a00bfd-a6c5-494e-9dd0-9d01699c5557",
  "regions" : [ {
    "id" : "f0168968-61fd-41cb-b7af-1eff3f8b32f3",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "scopes": [
              {
                "isPublic": false,
                "name": "Lead"
              },
              {
                "isPublic": false,
                "name": "Opportunity"
              },
              {
                "isPublic": false,
                "name": "Campaign"
              },
              {
        "scopes" : [ {
                "isPublic": false,
                "name": "ContentDocument"
              }
            ],
        }, {
          "isPublic" : true,
          "name" : "Consumable_order__c"
        }, {
          "isPublic" : true,
          "name" : "Consumable_order_details2__c"
        } ],
            "searchResultFiltering": true,
            "searchTerm": "{!term}",
            "showTopResults": true
          },
          "componentName": "forceCommunity:search",
          "id": "300943f3-7e89-43b5-986d-013d1e677bad",
      "id" : "5f9e6d47-2bcc-4097-a92c-1ed613352db1",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "0cca2c58-a0c4-4cba-857b-7a81fb548c6e",
    } ],
    "id" : "5724ab02-cf0e-4aa8-b6d9-27c93918f75f",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "76ff2160-08e4-42e2-bf3a-85c8cc7f50c1",
  }, {
    "id" : "de00bfc5-bb66-40f6-8d83-e45d83c02f17",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "global-search"

 force-app/main/default/experiences/Consumable1/views/streamDetail.json

@@ -1,38 +1,32 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
  "id" : "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
  "label": "Stream Detail",
  "regions": [
    {
      "id": "f1637238-82ab-4cef-a8b0-1278d67c9d5a",
  "regions" : [ {
    "id" : "48e57d3b-e3d0-4f72-be2f-a2fae7b65a0a",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "id": "{!recordId}"
          },
          "componentName": "forceCommunity:streamDetail",
          "id": "60702a91-77e0-4289-a4ca-a5161a96550a",
      "id" : "8c078f23-692d-4f99-a755-99025f03a1b5",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "825c9a77-bb20-48f2-a7f3-02e2b65a7523",
    } ],
    "id" : "cd36c50d-c89e-4a33-a381-6e21077775b9",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "fa8bc833-0127-4936-acb3-7ddb285df900",
  }, {
    "id" : "a16a1ef4-47ac-4970-9d30-9cc7d15dd873",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-0Fq"

 force-app/main/default/experiences/Consumable1/views/streamList.json

@@ -1,26 +1,22 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "6ef6f17a-0dda-4824-8310-e283e961890f",
  "id" : "e1275716-f06a-4a27-a667-19c49eefb083",
  "label": "Stream List",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceCommunity:streamList",
          "id": "b37e561b-bcc1-471e-a893-29ce0f7bac79",
      "id" : "c55e158b-0343-40b2-bca0-888ab4e1ae18",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "f37c8024-a2e2-43ee-bb73-7ce689c4d6d9",
    } ],
    "id" : "e93a4c80-2373-4f62-a413-6b91c74928e1",
      "regionName": "content",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-0Fq"

 force-app/main/default/experiences/Consumable1/views/topicCatalog.json

@@ -1,13 +1,11 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
  "id" : "3912430c-3c10-4bf3-bf37-5a619a596491",
  "label": "Topic Catalog",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "bannerText": "",
            "bannerTextWithKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineArticles\">articles</a> and <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
@@ -18,55 +16,46 @@
            "uniqueNameOrId": ""
          },
          "componentName": "forceCommunity:headline",
          "id": "2dea3547-05b7-4553-b77d-4792aac6c392",
      "id" : "bb3cf42e-7839-4d1b-9397-61f43400e885",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "4aa7eaf6-e706-4e57-9ce3-9c8f3cf26246",
    } ],
    "id" : "e0161633-e87a-4873-a308-f87278393077",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "forceCommunity:topicCatalog",
          "id": "ca681efe-4067-4a6c-b442-e95f316babae",
      "id" : "c4149a20-518c-4518-8f16-363ca10cb9fd",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6b2ab383-10e2-4ce7-aed3-1d8ab837fa13",
    } ],
    "id" : "0250f471-2b7a-48e8-894e-775d5d3edb11",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "266bf649-4b83-43f8-a08c-d227b505ca84",
  }, {
    "id" : "36965db0-cc03-4916-b508-0b3747f12f39",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "Topic Catalog"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "a8fbeba0-f3a7-46c8-93d9-7aaa0035f1ab",
      "id" : "e81daa52-bbe0-4f2d-bd9e-a43f4156623b",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "dd88451a-81bf-48c6-bea8-1f411e587fb7",
    } ],
    "id" : "44a8bb9f-9013-450a-ab7d-d6da72269e33",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "topic-catalog"

 force-app/main/default/experiences/Consumable1/views/topicDetail.json

@@ -1,30 +1,25 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsTwoCol84Layout",
  "dataProviders": [],
  "id": "8f8238dc-8f81-4994-9933-b4dcb285776e",
  "id" : "060ff5da-04b3-49de-8fb8-03decd8c188c",
  "label": "Topic Detail",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "13faad2b-64b9-4f9d-8d5a-94eba2bcaa34",
      "id" : "09e98f13-f206-43ee-bf41-828332156a3f",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "6e67d805-16ce-4e1c-8b47-21f7add68528",
    } ],
    "id" : "e0e7dbc4-3b5b-442a-b4ee-700038c2f223",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "canChangeSorting": false,
            "defaultFilter": "",
@@ -36,57 +31,48 @@
            "type": "Topics"
          },
          "componentName": "forceCommunity:forceCommunityFeed",
          "id": "a38781d5-55f1-4c8d-9052-33b5b6bb86c4",
      "id" : "6016edf0-5479-47bd-83af-b01e58fe5b1c",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "7060705f-116c-43a2-b035-fc6e4711f9cc",
    } ],
    "id" : "0ed07a83-ddeb-4f62-ae37-d5b0acfc6584",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordDetail",
          "id": "dd3773a2-2efd-4ba6-9fc7-cf8fa7b7abc1",
      "id" : "33d2426c-2eb9-4abf-8059-25a02fdc20a1",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "450ad7df-3edc-4c67-90e2-ab7edac4a4d2",
    } ],
    "id" : "ca54845f-e7c2-4d40-9243-8e253709523b",
      "regionName": "sidebar",
      "type": "region"
    },
    {
      "id": "9ed58d0e-69ea-4d40-8ffa-446f944e7137",
  }, {
    "id" : "f2cc39b9-f4a1-44dd-98eb-928de7f45b4f",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "{!Record.Description}",
            "title": "{!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "5d9718ca-83b1-45dc-aca9-2e4f947ef338",
      "id" : "e3d92037-2073-4756-a86f-90c4c43998ec",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "1a11e61a-6963-4a58-8497-681783af4954",
    } ],
    "id" : "c559cbc3-8107-4482-b65e-0fc253417b1c",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "topic"

 force-app/main/default/experiences/Consumable1/views/userProfile.json

@@ -1,120 +1,99 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "2245cd19-8057-487b-8284-d7f20c56e1f7",
  "id" : "b3764d11-d26d-4554-8747-e7f30fb722bd",
  "label": "User Profile",
  "regions": [
    {
      "id": "14612469-280a-47d6-a13e-c7c856cebb73",
  "regions" : [ {
    "id" : "089ae725-a61b-476e-aab7-3ea5bf1ef011",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "id": "{!recordId}",
            "showFullPhotoAsCircle": true,
            "showReputation": false
          },
          "componentName": "forceCommunity:userProfileHeader",
          "id": "9f2b692c-0288-4aaa-af5d-112c2d8d0165",
      "id" : "7ef45f8f-cc14-404a-8867-e6d3557f32d3",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "tabsetConfig": {
              "UUID": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
          "UUID" : "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
              "activeTab": "tab1",
              "tabs": [
                {
                  "UUID": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
          "tabs" : [ {
            "UUID" : "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {},
                      "fqn": "forceCommunity:userProfileDetail"
                    }
                  ],
            } ],
                  "tabKey": "tab1",
                  "tabName": "Details"
                },
                {
                  "UUID": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
          }, {
            "UUID" : "02c71e1a-5c7b-4265-8ff5-486737b59caf",
                  "allowGuestUser": false,
                  "locked": false,
                  "seedComponents": [
                    {
            "seedComponents" : [ {
                      "attributes": {},
                      "fqn": "forceCommunity:userRelatedList"
                    }
                  ],
            } ],
                  "tabKey": "tab2",
                  "tabName": "Related"
                }
              ],
          } ],
              "useOverflowMenu": false
            }
          },
          "componentName": "forceCommunity:tabset",
          "id": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
          "regions": [
            {
              "components": [
                {
      "id" : "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
      "regions" : [ {
        "components" : [ {
                  "componentAttributes": {
                    "id": "{!recordId}"
                  },
                  "componentName": "forceCommunity:userProfileDetail",
                  "id": "263079c1-25b9-4a89-ad82-ff789f1cec6b",
          "id" : "3910b7ed-af10-4a8e-9858-6780fc312390",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
        } ],
        "id" : "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
              "regionLabel": "Details",
              "regionName": "tab1",
              "renditionMap": {},
              "type": "region"
            },
            {
              "components": [
                {
      }, {
        "components" : [ {
                  "componentAttributes": {
                    "userId": "{!recordId}"
                  },
                  "componentName": "forceCommunity:userRelatedList",
                  "id": "f2d05739-3021-4c7b-8a2c-ef986d23c0e7",
          "id" : "ffeb3b47-04b8-455c-be55-69b69096f017",
                  "renditionMap": {},
                  "type": "component"
                }
              ],
              "id": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
        } ],
        "id" : "02c71e1a-5c7b-4265-8ff5-486737b59caf",
              "regionLabel": "Related",
              "regionName": "tab2",
              "renditionMap": {},
              "type": "region"
            }
          ],
      } ],
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "4eee041e-a134-466c-ad5a-39b2189c9de6",
    } ],
    "id" : "4ad735e0-ad67-4c2b-9b52-717f1be31466",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "1943f596-5d30-46eb-aec0-c155ebebf201",
  }, {
    "id" : "d9fb20dc-9a48-4767-b7ab-fc7c8a5cb56a",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-005"

 force-app/main/default/experiences/Consumable1/views/userSettings.json

@@ -1,18 +1,15 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
  "id" : "8225f2be-2536-4868-afe9-ed11e1c1eb15",
  "label": "User Settings",
  "regions": [
    {
      "id": "661a308a-163f-4685-aec7-5d617a450359",
  "regions" : [ {
    "id" : "0e29e12f-82e2-4770-9056-00412cb4914b",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "accountSectionTitle": "Account",
            "accountTabName": "Account Management",
@@ -38,22 +35,19 @@
            "settingsPageTitle": "My Settings"
          },
          "componentName": "forceCommunity:userSettingsCustomizable",
          "id": "1a67d89b-1f40-4cd5-ac5b-c655aa5043ee",
      "id" : "be9a963a-9ad1-4190-845c-c1f479b4c9f2",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "c3d59adc-a0ce-40a8-85de-f06d2a758226",
    } ],
    "id" : "7eb02000-7cb9-48f9-8463-eae4dfa60e4c",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "455997bb-5cc3-45cf-9da7-0a28c22be1f5",
  }, {
    "id" : "f99dd3f8-ab5f-49e4-b57e-b51dc2ab9ccd",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "usersettings"

 force-app/main/default/experiences/Consumable1/views/ÒDZí°åévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "97ed2657-7949-4aed-9e5d-cae9c935f730",
  "label": "仪表板 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "c5f2427e-9a5d-4db5-9929-e3d6e633475f",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "4b9072b6-40de-478a-a460-c3aa1d3e286d",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "d682a0cb-7ab6-47e0-8f11-c18f2d49ea91",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-01Z"

 force-app/main/default/experiences/Consumable1/views/ѧ»á?ÅàѵԔ¼š.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "0ad6b8ab-53a5-4a50-a8e4-2cb763631aab",
  "label": "学会・培训 è©³ç´°",
  "regions": [
    {
  "regions" : [ {
      "id": "a8e33a85-eba0-4b3c-972d-7829e6b042b4",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
@@ -21,8 +18,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
@@ -40,20 +36,16 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "898fe2f9-0d89-483a-b133-91df0a115989",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "3c9b71ac-95f1-4237-b65e-45a8dbcbf70e",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -63,13 +55,11 @@
          "id": "f68810fc-4086-4193-a0d7-a8e8d181c7e2",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "b9a30282-520a-436a-9688-5153df33ee48",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-701"

 force-app/main/default/experiences/Consumable1/views/ѧ»á?ÅàѵévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "4cf18bf4-7c54-4746-b895-ec877e8fcd43",
  "label": "学会・培训 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "bbdd3f25-7b32-4aaa-bb84-0fd898f088da",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "ca0496e5-65f5-481b-80db-1aa60c6eb160",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "024970ab-9ccf-4185-8637-88e1279fa959",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-701"

 force-app/main/default/experiences/Consumable1/views/С×éévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "6c787120-bb1e-4d47-b4b2-7fa80ac6d3fb",
  "label": "小组 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "adf7a874-f08a-4835-9975-94719db0529e",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "df80875a-1086-4356-98d6-a7300c39507e",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "1a614d08-a4e0-4aba-9233-cfab0ef016f3",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-0F9"

 force-app/main/default/experiences/Consumable1/views/±¨±íévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "4dff72f1-db87-40bc-a8d6-36073e365a18",
  "label": "报表 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "255f30d3-0419-4484-a86a-69463e5ecf61",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "9e86bc1f-69aa-47e8-95ef-91fb76147818",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "7d5f8a26-65a3-408e-a2f1-ac0e6e5aab59",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-00O"

 force-app/main/default/experiences/Consumable1/views/ÎļþévßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "3d5f9dc6-9374-4d60-8e41-d9ae76e732e3",
  "label": "文件 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "746cff4c-6e69-4feb-a676-a5a1d40dda0b",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "5f5b300a-ff22-4632-8889-d9ed5bc3399d",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "2ce507fd-d529-4d11-a2cc-e0c9cd56c0f1",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-069"

 force-app/main/default/experiences/Consumable1/views/Á÷évßB¥ê¥¹¥È.json

@@ -4,23 +4,19 @@
  "dataProviders": [],
  "id": "cd0d3153-1cca-4111-ae2a-08454a8fe698",
  "label": "流 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "97c8b536-fe44-45cf-ab4d-c97c3b43ef67",
      "regionName": "header",
      "type": "region"
    },
    {
  }, {
      "id": "13171fdc-cefa-466f-8796-f827886547e4",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "f0cd4e02-22fe-4c43-ad6d-fb48a0ee400a",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-0Fq"

 force-app/main/default/experiences/Consumable1/views/ÏûºÄÆ·¶©µ¥Áбí.json

@@ -1,51 +1,45 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "c331401c-5c71-4d88-9350-c5e8a79202c5",
  "id" : "293921b6-1a37-49a3-a225-be2f3471a41c",
  "label": "消耗品订单 åˆ—表",
  "regions": [
    {
      "id": "9c56ed8b-747d-4b08-8651-5fc2f53ea168",
  "regions" : [ {
    "id" : "c1c91ef1-d313-4e66-b600-3b5ece7f6488",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "enableInlineEdit": false,
            "filterName": "Overdue",
        "filterName" : "D00_approved_view",
            "layout": "FULL",
            "pageSize": 25,
            "scope": "Consumable_order__c",
            "showActionBar": true,
            "showChartsPanel": true,
            "showDisplay": "showall",
            "showFilterPanel": true,
        "showActionBar" : false,
        "showChartsPanel" : false,
        "showDisplay" : "grid",
        "showFilterPanel" : false,
            "showImageIcon": true,
            "showManualRefreshButton": true,
            "showObjectName": true,
            "showPinnedList": true,
        "showPinnedList" : false,
            "showSearchBar": true
          },
          "componentName": "forceCommunity:objectHome",
          "id": "e91f7d10-dc6c-4a2e-af8c-706f73f7a8cc",
      "id" : "5a679d55-a414-4a30-9e45-410f58926560",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "f603c8cc-3519-4e8c-a262-eef3a9fe442a",
    } ],
    "id" : "5b054b02-44fa-4d1a-a233-bc406c227ab1",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "4efaa155-2075-4409-82e7-71e9abc62284",
  }, {
    "id" : "93caa3c5-152b-4c37-a27c-6711bafd7493",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-a2K"

 force-app/main/default/experiences/Consumable1/views/ÏûºÄÆ·¶©µ¥Ïà¹ØÁбí.json

@@ -1,18 +1,15 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "3dd9b830-a644-429b-8b1c-e2770454179a",
  "id" : "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
  "label": "消耗品订单 ç›¸å…³åˆ—表",
  "regions": [
    {
      "id": "55e18a02-9472-4658-914e-755e9a83c302",
  "regions" : [ {
    "id" : "19e75fde-55d3-4d05-ad35-859e9253f3e3",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -23,22 +20,19 @@
            "showRowNumbers": true
          },
          "componentName": "forceCommunity:relatedList",
          "id": "a4e0f988-e956-4c9d-b02c-83866661cf0e",
      "id" : "a56b04ba-b611-4311-b693-60df1d15bc41",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d576983a-e7b9-4910-bf69-4ad5909303da",
    } ],
    "id" : "b73a78fe-8a2a-495c-a415-0e6b1f3d5bba",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "430d0911-909b-499d-9e55-ef40f5e938d0",
  }, {
    "id" : "508cdb2d-9f19-489c-88ea-d56da66f3360",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-a2K"

 force-app/main/default/experiences/Consumable1/views/ÏûºÄÆ·¶©µ¥ÏêϸÐÅÏ¢.json

@@ -1,28 +1,24 @@
{
  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
  "appPageId" : "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
  "componentName": "siteforce:sldsOneColLayout",
  "dataProviders": [],
  "id": "bea87922-55fe-41d0-9a2f-6647aa020e56",
  "id" : "2757e7e7-c2ba-4c5b-9480-4877420e6c40",
  "label": "消耗品订单 è¯¦ç»†ä¿¡æ¯",
  "regions": [
    {
      "id": "f3e32491-d89a-467a-97cb-099c98bc5ba1",
  "regions" : [ {
    "id" : "002e3e28-a40b-4f71-924f-b04dbb3aad57",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
          "componentName": "forceCommunity:recordHeadline",
          "id": "c7db25b2-0eb2-4e2e-b369-9af45d0c76e0",
      "id" : "e347f5d6-b40e-48b3-ad46-ed15d001bfc2",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
@@ -31,45 +27,39 @@
            "showLegacyActivityComposer": false,
            "tab1Type": "details",
            "tab2Type": "related",
            "tab3Type": "none",
        "tab3Type" : "chatter",
            "tab4Type": "none",
            "timelineTabLabel": "Activity"
          },
          "componentName": "forceCommunity:recordHomeTabs",
          "id": "44e2d9e9-5aa0-437e-b32b-4eea960c1ac9",
      "id" : "777d94b0-f4e1-4de6-93ff-6b5126fc0ba4",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "d0496ef7-ef71-40b4-8673-c38781880436",
    } ],
    "id" : "4e4ee28e-35eb-4682-95d4-3279649fa4fe",
      "regionName": "content",
      "type": "region"
    },
    {
      "id": "09482c1a-f6b6-422f-9433-6a2fcfd13ddf",
  }, {
    "id" : "19a87d46-ec32-40b1-b8b5-c4fd0a79b588",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
            "title": "{!Record._Object}: {!Record._Title}"
          },
          "componentName": "forceCommunity:seoAssistant",
          "id": "fbb0fc4c-2c29-4451-a499-0ac072e7e7e6",
      "id" : "7cf01a81-80f5-40bf-a99a-131727098aea",
          "renditionMap": {},
          "type": "component"
        }
      ],
      "id": "fbe33d47-5a71-489d-8a79-5d95f1a00c3d",
    } ],
    "id" : "5ce72d1c-5178-4e9a-8405-5fb99e32ed6b",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail-a2K"

 force-app/main/default/experiences/Consumable1/views/Óû§¥ê¥¹¥È.json

@@ -4,23 +4,19 @@
  "dataProviders": [],
  "id": "09574ae1-7a1d-465b-852b-6604abee87c2",
  "label": "用户 ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "4b35d932-84a2-442d-9b0c-e5cb790b6580",
      "regionName": "header",
      "type": "region"
    },
    {
  }, {
      "id": "b109e1ab-8757-414e-ba5d-cddeafb4eff1",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "6c741f21-5b6e-443a-a0af-4b7fb5151480",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list-005"

 force-app/main/default/experiences/Consumable1/views/Óû§évßB¥ê¥¹¥È.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "a7a75c83-a63d-4031-8a1a-524e45f77737",
  "label": "用户 é–¢é€£ãƒªã‚¹ãƒˆ",
  "regions": [
    {
  "regions" : [ {
      "id": "5504b9cc-87ba-4a13-a6de-882db87b1ef9",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "90a88344-631c-4a99-bfb9-5b5918c98cdc",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "c8110fe8-136a-4078-a991-8810167e994a",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist-005"

 force-app/main/default/experiences/Site3.site-meta.xml

 force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json

 force-app/main/default/experiences/Site3/config/languages.json

 force-app/main/default/experiences/Site3/config/loginAppPage.json

 force-app/main/default/experiences/Site3/config/mainAppPage.json

 force-app/main/default/experiences/Site3/config/µç×ÓÇ©ÊÕϵͳ.json

 force-app/main/default/experiences/Site3/routes/checkPassword.json

 force-app/main/default/experiences/Site3/routes/createRecord.json

 force-app/main/default/experiences/Site3/routes/error.json

 force-app/main/default/experiences/Site3/routes/forgotPassword.json

 force-app/main/default/experiences/Site3/routes/home.json

 force-app/main/default/experiences/Site3/routes/login.json

 force-app/main/default/experiences/Site3/routes/loginError.json

 force-app/main/default/experiences/Site3/routes/recordDetail.json

 force-app/main/default/experiences/Site3/routes/recordList.json

 force-app/main/default/experiences/Site3/routes/register.json

 force-app/main/default/experiences/Site3/routes/relatedRecordList.json

 force-app/main/default/experiences/Site3/routes/search.json

 force-app/main/default/experiences/Site3/routes/°ÂÁÖ°Í˹µç×ÓÇ©ÊÕϵͳ.json

 force-app/main/default/experiences/Site3/routes/½ø¿Úµ¥Ö¤Ã÷ϸ.json

New file
@@ -0,0 +1,10 @@
{
  "activeViewId" : "793767ac-c71a-49a2-ba5a-591a85646551",
  "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
  "id" : "62cd6cac-031d-4d5d-a256-7117468729df",
  "label" : "进口单证明细",
  "pageAccess" : "UseParent",
  "routeType" : "custom-attachment-display",
  "type" : "route",
  "urlPrefix" : "AttachmentDisplay"
}

 force-app/main/default/experiences/Site3/themes/buildYourOwn.json

@@ -10,32 +10,26 @@
    "ServiceNotAvailable": "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
  },
  "type": "theme",
  "views": [
    {
  "views" : [ {
      "componentAttributes": {},
      "componentName": "salesforceIdentity:loginBody2",
      "id": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
      "label": "Login",
      "regions": [
        {
    "regions" : [ {
          "id": "c7939c0b-7063-4e10-8c4f-45f5e9a33b91",
          "regionName": "header",
          "type": "region"
        },
        {
    }, {
          "id": "fd5ba3cd-84a7-4c49-bce0-730c85b9ce14",
          "regionName": "content",
          "type": "region"
        },
        {
    }, {
          "id": "fdc32d28-41af-4381-a451-e0574e1e2263",
          "regionName": "footer",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    },
    {
  }, {
      "componentAttributes": {
        "fixedPageWidth": 1440,
        "isPageWidthFixed": true
@@ -43,33 +37,26 @@
      "componentName": "siteforce:starterBody",
      "id": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
      "label": "Default",
      "regions": [
        {
          "components": [
            {
    "regions" : [ {
      "components" : [ {
              "componentAttributes": {
                "maxAutoCompleteResults": 5,
                "searchLabel": "Search...",
                "searchObjects": [
                  {
          "searchObjects" : [ {
                    "isPublic": true,
                    "name": "Account"
                  }
                ]
          } ]
              },
              "componentName": "forceCommunity:globalSearchInput",
              "id": "6b6bd259-0936-4573-8301-b6c3c47991f5",
              "renditionMap": {},
              "type": "component"
            }
          ],
      } ],
          "id": "e1e03672-2dfc-493e-8a59-2cedaf4bdaed",
          "regionName": "search",
          "type": "region"
        },
        {
          "components": [
            {
    }, {
      "components" : [ {
              "componentAttributes": {
                "accountManagementLabel": "Account Management",
                "communityBuilderLabel": "Experience Builder",
@@ -91,15 +78,12 @@
              "id": "886ade64-9894-4fb5-9f0a-91f718f37a7c",
              "renditionMap": {},
              "type": "component"
            }
          ],
      } ],
          "id": "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
          "regionName": "profileMenu",
          "type": "region"
        },
        {
          "components": [
            {
    }, {
      "components" : [ {
              "componentAttributes": {
                "NavigationMenuEditorRefresh": "",
                "hideAppLauncher": true,
@@ -109,16 +93,13 @@
              "id": "74de3519-3e37-45f7-a9b0-686b6d576293",
              "renditionMap": {},
              "type": "component"
            }
          ],
      } ],
          "id": "32f4c679-a1ec-4d0f-8227-f766aff2348b",
          "regionName": "navBar",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    },
    {
  }, {
      "componentAttributes": {
        "fixedPageWidth": 1170,
        "headerBgColor": "rgba(0, 0, 0, 0)",
@@ -131,19 +112,15 @@
      "componentName": "siteforce:themeLayoutStarter",
      "id": "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
      "label": "ServiceNotAvailable",
      "regions": [
        {
    "regions" : [ {
          "id": "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
          "regionName": "themeHeader",
          "type": "region"
        },
        {
    }, {
          "id": "e598c1cc-513c-4cff-9029-ace967593639",
          "regionName": "themeFooter",
          "type": "region"
        }
      ],
    } ],
      "type": "view"
    }
  ]
  } ]
}

 force-app/main/default/experiences/Site3/views/checkPassword.json

@@ -4,10 +4,8 @@
  "dataProviders": [],
  "id": "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
  "label": "Check Password",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
          },
@@ -16,8 +14,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\">Check the email account associated with your user name for instructions on resetting your password. Remember to look in your spam folder, where automated messages sometimes filter.   If you still can't log in, contact your administrator.</div>"
          },
@@ -26,8 +23,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Back to login</a></div>"
          },
@@ -36,15 +32,12 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "aff6a477-e89c-4adf-865f-a6ed3bf3b795",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -54,13 +47,11 @@
          "id": "51b9427e-2b7e-49f7-a4b1-ccf0eafa56a3",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "c4dd2d29-9f0d-412d-9a48-08d0464ba417",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "check-password"

 force-app/main/default/experiences/Site3/views/createRecord.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "9cb0795b-6c6d-4948-9dcd-68a568028499",
  "label": "Create Record",
  "regions": [
    {
  "regions" : [ {
      "id": "d451ff76-e162-4234-bfff-bc56db891edd",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "actionApiName": "{!actionApiName}"
          },
@@ -21,18 +18,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "4f97e4bd-c420-46f2-80c4-4aefec37a12b",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "5a882757-dc4e-4c73-9191-6d0edb0dcb95",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "createrecord"

 force-app/main/default/experiences/Site3/views/error.json

@@ -4,37 +4,30 @@
  "dataProviders": [],
  "id": "c792b011-93b7-4274-aa53-359303ca2567",
  "label": "Error",
  "regions": [
    {
  "regions" : [ {
      "id": "1789e5dc-0771-4bbe-bacd-189f7ff243ab",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<div style='text-align: center;'>Invalid Page</div>"
        "richTextValue" : "<p style=\"text-align: center;\">Invalid Page</p>"
          },
          "componentName": "forceCommunity:richTextInline",
          "id": "cdc3e240-9222-48c5-a1d6-aa93804b982d",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "3410ec75-14f6-435d-b4e3-e8fb3844d9c1",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "c0398406-6a67-4006-abdf-c90203f0aa48",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -44,13 +37,11 @@
          "id": "4683476f-e4bf-4709-a9b4-5a4fca5d1c9a",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "f7aafc3f-c920-4c75-9d02-5d4140ca0048",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "error"

 force-app/main/default/experiences/Site3/views/forgotPassword.json

@@ -4,10 +4,8 @@
  "dataProviders": [],
  "id": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
  "label": "Forgot Password",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
          },
@@ -16,8 +14,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\">To reset your password, we'll need your username.<br/> We'll send password reset instructions to the email address associated with your account.</div>"
          },
@@ -26,8 +23,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "checkEmailUrl": "./CheckPasswordResetEmail",
            "submitButtonLabel": "Reset Password",
@@ -38,8 +34,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
          },
@@ -48,15 +43,12 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "231c935f-3d29-4c7c-8e69-5cb4c7c2ba99",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -66,13 +58,11 @@
          "id": "2ec7e376-133b-41d9-a0be-2b65d7fa4274",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "8a72b39f-ec8c-4f9a-9f34-10cd245d9e18",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "forgot-password"

 force-app/main/default/experiences/Site3/views/home.json

@@ -4,25 +4,20 @@
  "dataProviders": [],
  "id": "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
  "label": "Home",
  "regions": [
    {
  "regions" : [ {
      "id": "497754d6-c23e-4ff5-baab-fe8d842e18fd",
      "regionName": "header",
      "type": "region"
    },
    {
  }, {
      "id": "22e5790e-e557-47ce-be11-77ca9b9517bd",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "e0652978-bbe3-47ab-83f1-f659fcf2427a",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -32,13 +27,11 @@
          "id": "b37194eb-0306-407c-9bba-88c9e30b2b42",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "bd9053b8-fc17-48bf-8ab2-f56e8071fb82",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "home"

 force-app/main/default/experiences/Site3/views/login.json

@@ -4,18 +4,15 @@
  "dataProviders": [],
  "id": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
  "label": "Login",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "salesforceIdentity:communityLogo2",
          "id": "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "forgotPasswordLabel": "Forgot your password?",
            "forgotPasswordUrl": "/ForgotPassword",
@@ -31,8 +28,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "headerText": "",
            "showHeader": false,
@@ -43,8 +39,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "employeeLoginLinkLabel": "Are you an employee? Login here"
          },
@@ -53,15 +48,12 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "e58b0f5b-923e-4126-aa5c-610c548487ce",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -71,13 +63,11 @@
          "id": "23ceab67-1956-4a59-918a-a65cd1da2c0d",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "5fc9f8cd-81d0-4209-9177-e7267fad5d99",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "login-home"

 force-app/main/default/experiences/Site3/views/loginError.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "acfc3c4f-6e34-4219-a88a-39af60aece24",
  "label": "Login Error",
  "regions": [
    {
  "regions" : [ {
      "id": "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
          },
@@ -21,20 +18,16 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "ecdce3fb-0b9b-44ae-b7b0-fbf42f12e826",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "d7969d47-f741-49af-8879-5d2aa4a8b92b",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -44,13 +37,11 @@
          "id": "7124e5aa-b506-4383-acf2-cd508614a65c",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "e86aa86c-d5f8-481b-becd-f641d6dddb07",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "login-error"

 force-app/main/default/experiences/Site3/views/recordDetail.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
  "label": "Record Detail",
  "regions": [
    {
  "regions" : [ {
      "id": "d7e0c80b-0785-4368-b355-8df9b74d7585",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "recordId": "{!recordId}"
          },
@@ -21,8 +18,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "detailsTabLabel": "Details",
            "discussionsTabLabel": "Feed",
@@ -39,20 +35,16 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "431670c5-9b29-44ff-9abb-08da1f5bc596",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "ef26bfcc-676c-44ae-bba2-ef9d4e139000",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -62,13 +54,11 @@
          "id": "e54f6f0f-9bb6-49c5-874b-e0cb6df5aac9",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "545512d3-d5b2-48c3-81d7-08d3a34ca75a",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "detail"

 force-app/main/default/experiences/Site3/views/recordList.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
  "label": "Record List",
  "regions": [
    {
  "regions" : [ {
      "id": "f55ac5c7-e89e-4a0c-b673-369053d0ccbb",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "enableInlineEdit": true,
            "filterName": "{!filterId}",
@@ -34,18 +31,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "9657d9bf-f46a-400c-a19f-252c3878377f",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "abde8654-b5ac-4f5b-83d1-52935c514cd0",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "list"

 force-app/main/default/experiences/Site3/views/register.json

@@ -4,18 +4,15 @@
  "dataProviders": [],
  "id": "f7082e1e-e1e4-4b79-a271-59037e25c845",
  "label": "Register",
  "regions": [
    {
      "components": [
        {
  "regions" : [ {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "salesforceIdentity:communityLogo2",
          "id": "e21ea511-10c6-4a67-82ef-ec485b7617bf",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
          },
@@ -24,8 +21,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "confirmPasswordLabel": "Confirm Password",
            "emailLabel": "Email",
@@ -43,8 +39,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "headerText": "",
            "showHeader": false,
@@ -55,8 +50,7 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        },
        {
    }, {
          "componentAttributes": {
            "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
          },
@@ -65,15 +59,12 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "6b062d85-f6af-410f-bc27-1a1da6da32b8",
      "regionName": "content",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -83,13 +74,11 @@
          "id": "4a889e5c-547a-48d9-bd3a-9e87166e7a82",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "6e5174c2-5e4d-4e3e-a1a2-ec60126f3596",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Login",
  "type": "view",
  "viewType": "self-register"

 force-app/main/default/experiences/Site3/views/relatedRecordList.json

@@ -4,15 +4,12 @@
  "dataProviders": [],
  "id": "df2fbc80-2a44-4533-b646-40276661a5cf",
  "label": "Related Record List",
  "regions": [
    {
  "regions" : [ {
      "id": "176c742a-9692-4939-927d-411b650ed76f",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customTitle": "",
            "parentRecordId": "{!recordId}",
@@ -27,18 +24,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "2672648c-0a4a-48c9-9ba6-af6a3630da20",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "08fd2e61-7c7e-41b8-9aff-4910b70422cd",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "relatedlist"

 force-app/main/default/experiences/Site3/views/search.json

@@ -4,34 +4,26 @@
  "dataProviders": [],
  "id": "1b73e50d-9811-4744-8c07-ffc097aa102a",
  "label": "Search",
  "regions": [
    {
  "regions" : [ {
      "id": "5a6cc49b-d707-4df0-a634-7c716a793f2a",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "scopes": [
              {
        "scopes" : [ {
                "isPublic": true,
                "name": "FeedPost"
              },
              {
        }, {
                "isPublic": true,
                "name": "KnowledgeArticleVersion"
              },
              {
        }, {
                "isPublic": false,
                "name": "Case"
              },
              {
        }, {
                "isPublic": true,
                "name": "CollaborationGroup"
              }
            ],
        } ],
            "searchResultFiltering": true,
            "searchTerm": "{!term}",
            "showTopResults": true
@@ -41,18 +33,15 @@
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "72128e90-ca44-4078-be1e-37490d727222",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "cdba3ee9-b011-4e7c-a760-0b9c5401d719",
      "regionName": "footer",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "global-search"

 force-app/main/default/experiences/Site3/views/°ÂÁÖ°Í˹µç×ÓÇ©ÊÕϵͳ.json

@@ -4,35 +4,28 @@
  "dataProviders": [],
  "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
  "label": "奥林巴斯电子签收系统",
  "regions": [
    {
  "regions" : [ {
      "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
      "regionName": "header",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {},
          "componentName": "c:eSignHomePage",
          "id": "ea68fcac-c35d-415e-86e8-040f4a6820d5",
          "renderPriority": "NEUTRAL",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "6ff94da4-7138-452e-a15c-ddfbb167b364",
      "regionName": "content",
      "type": "region"
    },
    {
  }, {
      "id": "c7a5b214-989d-437e-b11b-19c533e37cf3",
      "regionName": "footer",
      "type": "region"
    },
    {
      "components": [
        {
  }, {
    "components" : [ {
          "componentAttributes": {
            "customHeadTags": "",
            "description": "",
@@ -42,13 +35,11 @@
          "id": "528b9108-2ebf-4ba1-8e2b-9ebec00fa61a",
          "renditionMap": {},
          "type": "component"
        }
      ],
    } ],
      "id": "d2699d17-8cc3-4386-a7db-72e53dea52e4",
      "regionName": "sfdcHiddenRegion",
      "type": "region"
    }
  ],
  } ],
  "themeLayoutType": "Inner",
  "type": "view",
  "viewType": "custom-esign-data-entry"

 force-app/main/default/experiences/Site3/views/½ø¿Úµ¥Ö¤Ã÷ϸ.json

New file
@@ -0,0 +1,68 @@
{
  "appPageId" : "7f290f39-4245-4612-9453-2b0c9f9e3701",
  "componentName" : "siteforce:dynamicLayout",
  "dataProviders" : [ ],
  "id" : "793767ac-c71a-49a2-ba5a-591a85646551",
  "label" : "进口单证明细",
  "regions" : [ {
    "components" : [ {
      "componentAttributes" : {
        "background" : "background: rgba(0,0,0,0)",
        "backgroundOverlay" : "rgba(0,0,0,0.5)",
        "contentAreaWidth" : 100,
        "sectionConfig" : {
          "UUID" : "f248bb54-1de0-4045-a694-6878661820df",
          "columns" : [ {
            "UUID" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
            "columnKey" : "1",
            "columnName" : "Column 1",
            "columnWidth" : "12",
            "seedComponents" : [ ]
          } ]
        },
        "sectionHeight" : 300
      },
      "componentName" : "forceCommunity:section",
      "id" : "f248bb54-1de0-4045-a694-6878661820df",
      "regions" : [ {
        "components" : [ {
          "componentAttributes" : { },
          "componentName" : "c:AttachmentDisplay",
          "id" : "e1758a66-b8a1-45af-ae6e-03125b843456",
          "renderPriority" : "NEUTRAL",
          "renditionMap" : { },
          "type" : "component"
        } ],
        "id" : "73f32934-3d6d-4797-b1fd-7b87702e1e1e",
        "regionLabel" : "Column 1",
        "regionName" : "1",
        "renditionMap" : { },
        "type" : "region"
      } ],
      "renderPriority" : "NEUTRAL",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "5ce20936-231e-48fd-8417-dba7d007a09f",
    "regionName" : "content",
    "type" : "region"
  }, {
    "components" : [ {
      "componentAttributes" : {
        "customHeadTags" : "",
        "description" : "",
        "title" : "进口单证明细"
      },
      "componentName" : "forceCommunity:seoAssistant",
      "id" : "f149154f-4929-4eb1-b363-1c35f2c0a852",
      "renditionMap" : { },
      "type" : "component"
    } ],
    "id" : "f6d5daee-acfb-4753-8635-5d29ed2e46e9",
    "regionName" : "sfdcHiddenRegion",
    "type" : "region"
  } ],
  "themeLayoutType" : "Inner",
  "type" : "view",
  "viewType" : "custom-attachment-display"
}

 force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.html

@@ -1,8 +1,6 @@
<template>
    <lightning-input  style="border:1px solid red" step="0" type="number" name="shipmentNumber" label="出货数量"
    <c-common-toast></c-common-toast>
    <lightning-input style="border:1px solid red;border-radius:5px;" step="any" type="number" name="shipmentNumber" label="出货数量"
    variant="label-hidden" onchange={dataChange} data-field="shipmentNumber" value={shipmentNumber}
    onblur={shipmentNumberBlur} min="0" class="inputFont"></lightning-input>
    <!-- <lightning-input  style="border:1px solid red" name="shipmentNumber" label="出货数量"
    variant="label-hidden" onchange={dataChange} data-field="shipmentNumber" value={shipmentNumber}
    onblur={shipmentNumberBlur}></lightning-input> -->
</template>

 force-app/main/default/lwc/customShipmentNumberComp/customShipmentNumberComp.js

@@ -3,15 +3,35 @@
export default class CustomShipmentNumberComp extends LightningElement {
    @api recordId;
    @api shipmentNumber;
    @api isConinvoice;
    @api esdInvoiceProNotCount;

    connectedCallback(){
        console.log('shipmentNumber = ' + this.shipmentNumber);
    }

    shipmentNumberBlur(event){
        debugger
        console.log('shipmentNumberBlur')
        this.shipmentNumber = event.target.value;

        if (this.isConinvoice) {
            if (this.hasDecimals(this.shipmentNumber)) {
                this.showMyToast('错误', '请输入整数', 'Error');
                this.shipmentNumber = 0;
            }else{
                if(this.esdInvoiceProNotCount < this.shipmentNumber){
                    this.showMyToast('错误', '发票数量不能超过还没发票数量！', 'Error');
                    this.shipmentNumber = 0;
                }
            }
        } else {
            //向下取整
            if (this.hasDecimals(this.shipmentNumber)) {
                this.showMyToast('错误', '请输入整数', 'Error');
                this.shipmentNumber = Math.floor(this.shipmentNumber)
            }
        }
        event.target.value = this.shipmentNumber;
        this.dispatchEvent(new CustomEvent('shipmentnumber', {
            composed: true,
            bubbles: true,
@@ -21,4 +41,30 @@
            }
        }));
    }

    hasDecimals(num) {
        return !Number.isInteger(Number(num));
    }

    showMyToast(title, message, variant) {
        this.isShowSpinner = false;
        this.showLoadingSpinner = false;
        this.showAttPop = false;
        this.filesUploaded = [];
        this.fileName = null;
        console.log('show custom message');
        var iconName = '';
        var content = '';
        if (variant.toLowerCase() == 'success') {
            iconName = 'utility:check';
        } else {
            iconName = 'utility:error';
        }
        if (message != '') {
            content = '<h2><strong>' + title + '<strong/></h2><h5>' + message + '</h5>';
        } else {
            content = '<h2><strong>' + title + '<strong/></h2>';
        }
        this.template.querySelector('c-common-toast').showToast(variant, content, iconName, 10000);
    }
}

 force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.html

@@ -1,5 +1,5 @@
<template>
    <lightning-input style="border:1px solid red"  step="0.01" type="number" name="shipmentUnitPrice"
    <lightning-input style="border:1px solid red;border-radius:5px" step="any" type="number" name="shipmentUnitPrice"
        label="deliveryOrderNo" variant="label-hidden" data-field="shipmentUnitPrice" value={shippingUnitPrice}
        onblur={shipmentUnitPriceBlur} class="inputFont"></lightning-input>
        onblur={shipmentUnitPriceBlur} min="0" class="inputFont" onchange={limitDecimals}></lightning-input>
</template>

 force-app/main/default/lwc/customShippingUnitPriceComp/customShippingUnitPriceComp.js

@@ -8,6 +8,16 @@
        console.log('shippingUnitPrice = ' + this.shippingUnitPrice);
    }

    limitDecimals(event) {
        const value = parseFloat(event.target.value); // å°†è¾“入值转换为数字类型
        const roundedValue = Math.round(value * 100) / 100; // å°†æ•°å­—四舍五入到两位小数
        if (isNaN(value) || isNaN(roundedValue)) { // å¦‚果数字无效，则清空输入框
            event.target.value = '';
        } else if (roundedValue !== value) { // å¦‚果输入框的值超出了两位小数，则修改为两位小数
            event.target.value = roundedValue.toFixed(2);
        }
    }

    shipmentUnitPriceBlur(event){
        console.log('shipmentUnitPriceBlur')
        this.shippingUnitPrice = event.target.value;

 force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js

@@ -55,8 +55,8 @@
                type: 'Title',
                recordId: { fieldName: "Id" }
            },
            hideDefaultActions: true,initialWidth:200},
        {label:'SAP合同号',fieldName:'ContractNo__c',hideDefaultActions: true},
            hideDefaultActions: true,initialWidth:200,wrapText:true},
        {label:'SAP合同号',fieldName:'ContractNo__c',hideDefaultActions: true,wrapText:true,initialWidth:180},
        {label:'订单总数',
            type: "customOutputGood",
            typeAttributes: {

 force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html

@@ -59,7 +59,7 @@
                                        <div style="color:#696969;font-size:16px;">消耗品订单名称<lightning-helptext style="--lwc-spacingXxSmall:0px;" content={label.helpText}></lightning-helptext></div>
                                    </td>
                                    <td style="width:200px;">
                                        <lightning-formatted-text style="font-size: 16px;" value={coc.arriveOrder}></lightning-formatted-text>
                                        <a style="text-decoration: underline;color:black;" onclick={clickOrder}><lightning-formatted-text style="font-size: 16px;" value={coc.arriveOrder}></lightning-formatted-text></a>
                                        <!-- <lightning-formatted-text value={coc.Arrive_Order__r.Name}></lightning-formatted-text> -->
                                    </td>
                                    <td></td>
@@ -81,7 +81,7 @@
                        <!-- <p style="font-size: 16px;"><strong>在库商品库存一览</strong></p> -->
                    </div>
                    <div style="padding:10px;">
                        <lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" columns={colms} data={consumableorderdetailsRecords}></lightning-datatable>
                        <lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" hide-checkbox-column key-field="recordId" columns={colms} data={consumableorderdetailsRecords}></lightning-datatable>
                    </div>
                </div>
            </div>

 force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.js

@@ -30,7 +30,7 @@
        {label:'注册证编码号' , fieldName:'approbation_No', hideDefaultActions: true,wrapText:true,initialWidth:125},
        {label:'注册证效期' , fieldName:'expiration_DateStr', hideDefaultActions: true,wrapText:true,initialWidth:115},
        {label:'使用期限' , fieldName:'Sterilization_limitStr', hideDefaultActions: true,wrapText:true,initialWidth:115},
        {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,initialWidth:250},
        {label:'BarCode' , fieldName:'barCode', hideDefaultActions: true,initialWidth:250,wrapText:true},
        {label:'采购单价' ,type:'number',fieldName:'intraTradeList', hideDefaultActions: true,wrapText:true,initialWidth:120,typeAttributes:{minimumFractionDigits: 2},cellAttributes: { alignment: "right" }}
    ];
    label = {helpText};
@@ -109,7 +109,8 @@
        proSale({
            cocStr : JSON.stringify(this.coc),
            orderallcountParm : this.orderallcount,
            consumableorderdetailsCountParm : this.consumableorderdetailsCount
            consumableorderdetailsCountParm : this.consumableorderdetailsCount,
            eSetIdStr : this.eSetId
        })
        .then(result=>{
            if(result.result == 'Success'){
@@ -123,7 +124,7 @@
                this[NavigationMixin.Navigate](config);
            }else {
                this.showSpinner = false;
                console.log("error:"+error);
                console.log("error:"+result.errorMsg);
                this.showMyToast('出库失败',result.errorMsg,'error');
            }
        })
@@ -135,6 +136,18 @@
        })
    }

    clickOrder(){
        if(this.coc.Arrive_Order__c != null && this.coc.Arrive_Order__c != ''){
            const config = {
                type: 'standard__webPage',
                attributes: {
                   url: '/detail/'+this.coc.Arrive_Order__c
                }
            };
            this[NavigationMixin.Navigate](config);
        }
    }

    showMyToast(title, message, variant) {
        console.log('show custom message');
        var iconName = '';

 force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html

 force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js

 force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.css

@@ -43,3 +43,8 @@
.fontWeight{
    font-size:16px;
}

.fileUpload {
    font-size: 16px;
    --lwc-formLabelFontSize:16px;
}

 force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html

@@ -3,7 +3,7 @@
<template>
    <c-common-toast></c-common-toast>
    <template if:true={isShowSpinner}>
        <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
    </template>


@@ -11,55 +11,64 @@
        <template if:false={isConInvoiceList}>
            <!-- æœç´¢å®¢æˆ·å -->
            <template if:true={isModalOpen}>
                <!-- Modal/Popup Box LWC starts here -->
                <section role="dialog" tabindex="-1" aria-labelledby="modal-heading-01" aria-modal="true"
                    aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open">
                    aria-describedby="modal-content-id-1" class="slds-modal slds-fade-in-open slds-modal_medium"
                    style="border: 1px solid #D4D4D4;">
                    <div class="slds-modal__container">
                        <!-- Modal/Popup Box LWC header here -->
                        <header class="slds-modal__header">
                            <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
                        <header class="slds-modal__header" style="background-color: #F3F3F3;">
                            <button style="" class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse"
                                title="Close" onclick={closeModal}>
                                <lightning-icon icon-name="utility:close" alternative-text="close" variant="inverse"
                                    size="small"></lightning-icon>
                                <span class="slds-assistive-text">Close</span>
                            </button>
                            <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">
                                ç»é”€å•†åŒ»é™¢æ£€ç´¢
                            </h2>
                            <h2 id="modal-heading-01" class="slds-text-heading_medium slds-hyphenate">经销商医院检索</h2>
                        </header>
                        <!-- Modal/Popup Box LWC body starts here -->
                        <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1">
                        <div class="slds-modal__content slds-p-around_medium" id="modal-content-id-1"
                            style="border: 1px solid #F3F3F3;">
                            <table style="width: 100%;">
                                <tbody>
                                    <tr>
                                        <td style="width: 74px;">
                                            <div style="color:#696969;font-size:16px;text-align: left;">医院名称</div>
                                        </td>
                                        <td style="width: 60%;"><lightning-input class="inputFont" label="医院名称"
                                                variant="label-hidden" placeholder="请输入医院名称" value={searchHospitalName}
                                                data-field="searchHospitalName" onchange={dataChange}></lightning-input></td>
                                        <td style="width: 10px;"></td>
                                        <td><button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
                                                style="height: 32px;" label="搜索" onclick={searchHospital}>搜索</button></td>
                                    </tr>
                                </tbody>
                            </table>
                            <p style="height: 20px;"></p>
                            <!-- <p>已选择医院：{chooseHospital}</p> -->
                            <div
                                style="border: 1px solid #D4D4D4;border-top: 3px solid #51606E;border-radius:5px;margin-bottom:7px;">
                                <div style="border-bottom: 1px solid #D4D4D4;padding:3px;">
                            <lightning-layout>
                                <lightning-layout-item flexibility="auto" padding="around-small">
                                    <lightning-input type="text" label="医院名称" onchange={dataChange}
                                        data-field="searchHospitalName" value={searchHospitalName}
                                        variant="label-inline" class="inputFont"></lightning-input>
                                </lightning-layout-item>
                                <lightning-layout-item flexibility="auto" padding="around-small"
                                    style="padding-top: 16px;">
                                    <!-- <lightning-button label="检索" onclick={searchHospital}></lightning-button> -->
                                    <button class="slds-button slds-button_neutral" onclick={searchHospital}
                                        title="searchHospital" style="font-size: 16px;">
                                        æ£€ç´¢
                                    </button>
                                        <lightning-layout-item padding="around-small">
                                            <p style="font-size: 18px">
                                                <strong>搜索结果</strong>
                                            </p>
                                </lightning-layout-item>
                            </lightning-layout>

                            <div class="tableColumn">
                                <lightning-layout class="datatable" style="height: 250px;">
                                    <!-- <p style="font-size: 16px;"><strong>搜索结果</strong></p> -->
                                </div>
                                <div class="myTable" style="padding:10px;">
                                    <!-- <lightning-datatable class="wrapped-header-datatable" key-field="id"
                                        hide-checkbox-column="true" data={hospitalList} columns={hosCols}
                                        onrowaction={chooseHos}></lightning-datatable> -->
                                    <lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
                                        key-field="id" data={hospitalList} columns={hospitalColumns}
                                        hide-checkbox-column="true" onrowaction={searchHandleRowAction}>
                                        key-field="id" data={hospitalList} columns={hospitalColumns} hide-checkbox-column="true"
                                        onrowaction={searchHandleRowAction}>
                                    </lightning-datatable>
                                </lightning-layout>
                            </div>
                        </div>
                        <!-- Modal/Popup Box LWC footer starts here -->
                        </div>
                        <footer class="slds-modal__footer">
                            <button class="slds-button slds-button_neutral" onclick={closeModal} title="Cancel"
                                style="font-size: 16px;">
                                å…³é—­
                            </button>
                            <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="取消"
                                onclick={closeModal}>取消</button>
                        </footer>
                    </div>
                </section>
@@ -73,23 +82,9 @@
                            <div lwc:dom="manual" class="resultDiv"></div>
                            <div draggable="false">
                                <template if:false={EditAble}>
                                    <lightning-layout>
                                        <lightning-layout-item size="12">
                                            <div class="slds-m-top_small slds-m-bottom_medium">
                                                <!-- <lightning-layout-item size="3">
                                                    <lightning-input label="" name="上传附件" onchange={handleFilesChange}
                                                        type="file" accept={acceptedType}
                                                        disabled={isDisabledReopen}></lightning-input>
                                                </lightning-layout-item>
                                                <lightning-layout-item size="3">
                                                    <span class="slds-form-element__label" data-form-label></span>
                                                    </br>
                                                    <lightning-button label="保存附件" style="margin-top: 20px"
                                                        onclick={saveAttachmentJs}
                                                        disabled={isDisabledReopen}></lightning-button>
                                                </lightning-layout-item> -->
                                                <lightning-layout multiple-rows="true">
                                                    <lightning-layout-item size="12">
                                        <lightning-layout-item size="2"></lightning-layout-item>
                                        <lightning-layout-item size="10">
                                                        <button
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder"
                                                            onclick={SetEditAbleJs} disabled={isDisabledEdit}
@@ -106,8 +101,14 @@
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
                                                            onclick={reopenJs} disabled={isDisabledReopen}
                                                            style="width: 150px;">作废重开</button>
                                        </lightning-layout-item>
                                    </lightning-layout>

                                    <lightning-layout multiple-rows="true" style="margin-top: 20px;">
                                        <lightning-layout-item size="2"></lightning-layout-item>
                                        <lightning-layout-item size="10">
                                                        <button
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
                                                class="slds-button slds-button_neutral slds-button_stretch lexBorder"
                                                            onclick={deleteButtonJs} disabled={isDisabledDelete}
                                                            style="width: 150px;">删除</button>

@@ -120,22 +121,6 @@
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder buttonminMarginLeft"
                                                            onclick={saveAttachmentJs} disabled={isDisabledReopen}
                                                            style="width: 150px;">保存附件</button>
                                                    </lightning-layout-item>
                                                    <!-- <lightning-layout-item size="2">
                                                        <button
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder"
                                                            disabled={isDisabledReopen}
                                                            onclick={uploadOrder} style="width: 150px;">上传附件</button>
                                                    </lightning-layout-item>
                                                    <lightning-layout-item size="2">
                                                        <button
                                                            class="slds-button slds-button_neutral slds-button_stretch lexBorder"
                                                            onclick={saveAttachmentJs}
                                                            disabled={isDisabledReopen} style="margin-left: -50px;width: 150px;">保存附件</button>
                                                    </lightning-layout-item> -->
                                                </lightning-layout>

                                            </div>
                                        </lightning-layout-item>
                                    </lightning-layout>
                                </template>
@@ -165,7 +150,7 @@
                                                id="modal-content-id-2" style="border: 1px solid #F3F3F3;">
                                                <div class="slds-m-top_medium slds-m-bottom_x-large">
                                                    <div class="slds-p-around_medium lgc-bg">
                                                        <lightning-input type="file" label="附件上传"
                                                        <lightning-input class="fileUpload" type="file" label="附件上传"
                                                            accept=".xlsx, .xls, .csv, .png, .doc, .docx, .pdf"
                                                            onchange={attChange}></lightning-input>
                                                    </div>
@@ -178,10 +163,14 @@
                                                </div>
                                            </div>
                                            <footer class="slds-modal__footer">
                                                <lightning-button style="margin-left: 10px;" variant="neutral"
                                                <!-- <lightning-button style="margin-left: 10px;" variant="neutral"
                                                    label="取消" onclick={closePop}></lightning-button>
                                                <lightning-button style="margin-left: 10px;" variant="neutral"
                                                    label="上传" onclick={handleFilesChange}></lightning-button>
                                                    label="上传" onclick={handleFilesChange}></lightning-button> -->
                                                <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="margin-left: 10px;"
                                                    label="取消" onclick={closePop}>取消</button>
                                                <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-left: 10px;"
                                                    label="上传" onclick={handleFilesChange}>上传</button>
                                            </footer>
                                        </div>
                                    </section>
@@ -258,23 +247,24 @@
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field field-name="Name"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
                                                <lightning-output-field
                                                    field-name="Invoice_status__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                                <lightning-output-field
                                                    field-name="Invoice_status__c"></lightning-output-field>
                                            </lightning-layout-item>
                                        </lightning-layout>

                                        <!-- å‘票日期 -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field
                                                    field-name="Invoice_Date__c"></lightning-output-field>
                                            </lightning-layout-item>
@@ -285,7 +275,7 @@
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout multiple-rows="true">
                                                <lightning-layout-item class="hehe-layoutItem" size="4">
                                                <lightning-layout-item class="hehe-layoutItem" size="5">
                                                    <lightning-output-field
                                                        field-name="Order_Dealer_Info__c"></lightning-output-field>
                                                </lightning-layout-item>
@@ -296,7 +286,7 @@
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field field-name="ShipmentAccount__c"
                                                    class="hideHelpText"></lightning-output-field>
                                            </lightning-layout-item>
@@ -306,23 +296,23 @@
                                        <lightning-layout multiple-rows="true" style="height:35.5px">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field
                                                    field-name="Order_ForCustomerText__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item size="4" class="readOnly">
                                            <lightning-layout-item size="5" class="readOnly" style="padding-left: 100px;">
                                                <lightning-input label="发票票面金额(元)" value={sumPrice} read-only
                                                    variant="label-inline"></lightning-input>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>
                                        </lightning-layout>

                                        <!-- å¤‡æ³¨ -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>
                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field
                                                    field-name="Invoice_Note__c"></lightning-output-field>
                                            </lightning-layout-item>
@@ -332,24 +322,24 @@
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-output-field
                                                    field-name="Invoice_attachment__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
                                                <lightning-output-field
                                                    field-name="Invoicedet_attachment__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>
                                        </lightning-layout>

                                        <!-- é™„件预览 -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1">
                                            </lightning-layout-item>
                                            <lightning-layout-item size="11">
                                            <lightning-layout-item size="10">
                                                <lightning-card class="attListTitle" variant="Narrow" title="附件列表"
                                                    icon-name="utility:attach">

@@ -362,9 +352,9 @@
                                                                    style="margin-left: 20px;" icon-name="doctype:gform"
                                                                    alternative-text={item.Title}
                                                                    size="large"></lightning-icon><br />
                                                                <span title={item.Title}>
                                                                    {item.fileName}
                                                                </span>
                                                                <div title={item.Title} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
                                                                    {item.Title}
                                                                </div>
                                                                <p>
                                                                    <!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
                                                                    <a href={item.attUrl} target="_blank">
@@ -373,7 +363,7 @@
                                                                    <a href={item.downloadUrl}>
                                                                        ä¸‹è½½
                                                                    </a>&nbsp;·&nbsp;
                                                                    <a data-fileid={item.recordId} onclick={deleteAtt}>
                                                                    <a data-fileid={item.Id} onclick={deleteAtt}>
                                                                        åˆ é™¤
                                                                    </a>
                                                                </p>
@@ -394,25 +384,25 @@
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-input label="发票号" value={OrderCode} data-field="OrderCode"
                                                    onchange={dataChange} variant="label-inline" required
                                                    class="inputFont"></lightning-input>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
                                                <lightning-output-field
                                                    field-name="Invoice_status__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>
                                        </lightning-layout>

                                        <!-- å‘票日期 -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-input type="date" label="发票日期" variant="label-inline"
                                                    value={InvoiceDate} onchange={invoiceDateChange} required
                                                    class="inputFont"></lightning-input>
@@ -423,7 +413,7 @@
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <div
                                                    class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
                                                    <lightning-icon size="x-small"
@@ -436,41 +426,41 @@
                                                </div>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
                                                <lightning-combobox data-field="secondaryDistributor"
                                                    name="secondaryDistributor" label="二级经销商"
                                                    value={secondaryDistributor} placeholder="请选择..."
                                                    options={provinceOptsMap} variant="label-inline"
                                                    onchange={dataChange} class="inputFont"></lightning-combobox>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>
                                        </lightning-layout>

                                        <!-- ç§‘室 ç»é”€å•†(录入) -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-input-field onchange={dataChange}
                                                    data-field="ForCustomerText" value={ForCustomerText}
                                                    field-name="Order_ForCustomerText__c"
                                                    class="inputFont"></lightning-input-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5" style="padding-left: 100px;">
                                                <lightning-output-field
                                                    field-name="Order_ForDealerText__c"></lightning-output-field>
                                            </lightning-layout-item>

                                            <lightning-layout-item size="1"></lightning-layout-item>
                                        </lightning-layout>

                                        <!-- å¤‡æ³¨ -->
                                        <lightning-layout multiple-rows="true">
                                            <lightning-layout-item size="1"></lightning-layout-item>

                                            <lightning-layout-item class="hehe-layoutItem" size="4">
                                            <lightning-layout-item class="hehe-layoutItem" size="5">
                                                <lightning-input-field onchange={dataChange} data-field="InvoiceNote"
                                                    value={InvoiceNote} field-name="Invoice_Note__c"
                                                    class="inputFont"></lightning-input-field>
@@ -498,7 +488,8 @@
                                    <lightning-layout-item padding="around-small">
                                        <!-- <lightning-button label="&#12288;检索&#12288;"
                                            onclick={InvoiceorderSearchJs}></lightning-button> -->
                                        <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
                                        <button
                                            class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
                                            onclick={InvoiceorderSearchJs}>检索</button>
                                    </lightning-layout-item>
                                </template>
@@ -645,7 +636,8 @@
                                                <div class="slds-form-element__label ">出库日&#12288;从</div>
                                                <lightning-input type="date" variant="label-hidden" label="出库日 ä»Ž"
                                                    onchange={dataChange} data-field="deliveryFromDate"
                                                    value={deliveryFromDate} class="inputFont"></lightning-input>
                                                    value={deliveryFromDate} class="inputFont"
                                                    style="max-width: 150px;"></lightning-input>
                                            </div>

                                            </br>
@@ -654,7 +646,8 @@
                                                </div>
                                                <lightning-input type="date" variant="label-hidden" label="到"
                                                    onchange={dataChange} data-field="deliveryToDate"
                                                    value={deliveryToDate} class="inputFont"></lightning-input>
                                                    value={deliveryToDate} class="inputFont"
                                                    style="max-width: 150px;"></lightning-input>
                                            </div>
                                        </div>
                                    </lightning-layout-item>
@@ -662,16 +655,16 @@
                                        <div class="slds-grid slds-grid_vertical-align-center">
                                            <div class="slds-form-element__label ">发票号</div>
                                            <lightning-input variant="label-hidden" label="发票号" onchange={dataChange}
                                                data-field="category1" value={category1}
                                                class="inputFont"></lightning-input>
                                                data-field="category1" value={category1} class="inputFont"
                                                style="max-width: 150px;"></lightning-input>
                                        </div>
                                    </lightning-layout-item>
                                    <lightning-layout-item flexibility="auto">
                                        <div class="slds-grid slds-grid_vertical-align-center">
                                            <div class="slds-form-element__label ">客户名</div>
                                            <lightning-input variant="label-hidden" label="客户名" onchange={dataChange}
                                                data-field="category2" value={category2}
                                                class="inputFont"></lightning-input>
                                                data-field="category2" value={category2} class="inputFont"
                                                style="max-width: 150px;"></lightning-input>
                                        </div>
                                    </lightning-layout-item>
                                    <lightning-layout-item flexibility="auto">
@@ -680,24 +673,22 @@
                                            <lightning-combobox data-field="invoiceStatus" name="invoiceStatus"
                                                label="状态" value={invoiceStatusValue} placeholder="请选择..."
                                                options={Options} variant="label-hidden" onchange={dataChange}
                                                style="min-width: 100px;" class="inputFont"></lightning-combobox>
                                                style="min-width: 100px;max-width: 200px;"
                                                class="inputFont"></lightning-combobox>
                                        </div>
                                    </lightning-layout-item>
                                    <lightning-layout-item flexibility="auto">
                                        <div class="slds-grid slds-grid_vertical-align-center">
                                            <!-- <lightning-button label="检索"
                                                onclick={invoiceCodeSearchJs}></lightning-button> -->
                                            <button
                                                class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle"
                                                onclick={invoiceCodeSearchJs}>检索</button>
                                                onclick={invoiceCodeSearchJs} style="max-width: 110px;">检索</button>
                                        </div>
                                    </lightning-layout-item>
                                    <lightning-layout-item flexibility="auto">
                                        <div class="slds-grid slds-grid_vertical-align-center">
                                            <!-- <lightning-button label="清空" onclick={ClearJs}></lightning-button> -->
                                            <button
                                                class="slds-button slds-button_neutral slds-button_stretch lexclearStyle"
                                                onclick={ClearJs}>清空</button>
                                                onclick={ClearJs} style="max-width: 110px;">清空</button>
                                        </div>
                                    </lightning-layout-item>
                                </lightning-layout>
@@ -763,21 +754,21 @@
                            <lightning-record-edit-form object-api-name="Consumable_order__c"
                                record-id={detailsInvoiceId} onload={handleLoad2}>
                                <lightning-layout multiple-rows="true">
                                    <lightning-layout-item size="2"></lightning-layout-item>
                                    <lightning-layout-item size="4">
                                    <lightning-layout-item size="1"></lightning-layout-item>
                                    <lightning-layout-item size="5">
                                        <lightning-output-field field-name="Name"></lightning-output-field>
                                    </lightning-layout-item>
                                </lightning-layout>
                                <lightning-layout multiple-rows="true">
                                    <lightning-layout-item size="2"></lightning-layout-item>
                                    <lightning-layout-item size="4" class="hehe-layoutItem">
                                    <lightning-layout-item size="1"></lightning-layout-item>
                                    <lightning-layout-item size="5" class="hehe-layoutItem">
                                        <lightning-output-field field-name="ShipmentAccount__c"
                                            class="hideHelpText"></lightning-output-field>
                                    </lightning-layout-item>
                                </lightning-layout>
                                <lightning-layout multiple-rows="true">
                                    <lightning-layout-item size="2"></lightning-layout-item>
                                    <lightning-layout-item size="4">
                                    <lightning-layout-item size="1"></lightning-layout-item>
                                    <lightning-layout-item size="5">
                                        <lightning-output-field
                                            field-name="Order_ForCustomerText__c"></lightning-output-field>
                                    </lightning-layout-item>
@@ -803,14 +794,14 @@
                        <div draggable="false">
                            <lightning-record-edit-form object-api-name="Consumable_order__c" record-id={detailsCocId}>
                                <lightning-layout multiple-rows="true">
                                    <lightning-layout-item size="2"></lightning-layout-item>
                                    <lightning-layout-item size="4">
                                    <lightning-layout-item size="1"></lightning-layout-item>
                                    <lightning-layout-item size="5">
                                        <lightning-output-field field-name="Name"></lightning-output-field>
                                    </lightning-layout-item>
                                </lightning-layout>
                                <lightning-layout multiple-rows="true">
                                    <lightning-layout-item size="2"></lightning-layout-item>
                                    <lightning-layout-item size="4">
                                    <lightning-layout-item size="1"></lightning-layout-item>
                                    <lightning-layout-item size="5">
                                        <lightning-output-field field-name="Outbound_Date__c"></lightning-output-field>
                                    </lightning-layout-item>
                                </lightning-layout>
@@ -839,7 +830,8 @@
                            <c-lex-custom-lightning-datatable key-field="Id" data={detailsData} columns={detailsColumns}
                                onunitchange={handleUnitChange} onshipmentnumber={handleShipmentNumber}
                                onrowselection={detailsGetSelectedRows} selected-rows={detailsSelectedRows}
                                style="word-wrap:break-word; word-break:break-all; " class="wrapped-header-datatable">
                                style="word-wrap:break-word; word-break:break-all; " class="wrapped-header-datatable"
                                min-column-width="115">
                            </c-lex-custom-lightning-datatable>
                            <lightning-datatable class="datatabel slds-border_top wrapped-header-datatable"
                                key-field="id" data={invoiceAllpriceData} columns={detailsColumns} hide-checkbox-column

 force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.js

@@ -13,7 +13,7 @@
import serContact from "@salesforce/apex/lexSearchAgencyHospitalController.serContact";
import detailsInit from "@salesforce/apex/LexConInvoicedetailsController.init";
import detailsSave from "@salesforce/apex/LexConInvoicedetailsController.save";
import deleteAtt from '@salesforce/apex/LexConsumableController.deleteAtt';
import deleteAtt from '@salesforce/apex/LexSummonsCreatController.deleteAtt';
import { NavigationMixin } from "lightning/navigation";
//table css 
import { loadStyle } from "lightning/platformResourceLoader";
@@ -22,21 +22,10 @@

const hospitalColumns = [
    {
        label: "医院名称",
        fieldName: "Name",
        initialWidth: 400,
        hideDefaultActions: true,
        wrapText: true,
    },
    {
        label: "省份",
        fieldName: "stateMasterName",
        hideDefaultActions: true,
    },
    {
        label: "选择",
        label: "",
        fieldName: "Id1",
        type: "button",
        initialWidth: 90,
        hideDefaultActions: true,
        typeAttributes: {
            label: "选择",
@@ -44,6 +33,17 @@
            size: 1,
        },
    },
    {
        label: "医院名称",
        fieldName: "Name",
        hideDefaultActions: true,
        wrapText: true,
    },
    {
        label: "省份",
        fieldName: "stateMasterName",
        hideDefaultActions: true,
    }
];
const invoiceDetailsColumns = [
    {
@@ -96,6 +96,7 @@
        hideDefaultActions: true,
        wrapText: true,
        cellAttributes: { alignment: 'right' },
        initialWidth:145,
        type: "number",
        typeAttributes: {
            minimumFractionDigits: 2,
@@ -160,6 +161,7 @@
        label: "产品型号",
        fieldName: "esdAssetModelNo",
        hideDefaultActions: true,
        initialWidth: 200,
        wrapText: true,
    },
    {
@@ -240,6 +242,8 @@
        typeAttributes: {
            recordId: { fieldName: "recordId" },
            shipmentNumber: { fieldName: "shipmentNumber" },
            isConinvoice: { fieldName: "isConinvoice" },
            esdInvoiceProNotCount: { fieldName: "esdInvoiceProNotCount" },
        },
    },
    {
@@ -248,6 +252,7 @@
        fieldName: "invoiceAllprice",
        hideDefaultActions: true,
        type: "number",
        initialWidth: 150,
        typeAttributes: {
            minimumFractionDigits: 2,
        },
@@ -369,6 +374,7 @@

    //文件上传
    @track showLoadingSpinner = false;
    @track showPopSpinner = false;
    @track UploadFile = "Upload File";
    @track fileName = "";
    @track fileData = [];
@@ -517,6 +523,7 @@
                        this.detailsData[i]['esdInvoiceUnitprice'] = this.detailsData[i].esd.Invoice_Unitprice__c;
                        //发票数量
                        this.detailsData[i]['shipmentNumber'] = this.detailsData[i].invoiceCount;
                        this.detailsData[i]['isConinvoice'] = true;
                        this.detailsData[i]['invoiceAllprice'] = this.detailsData[i].invoiceAllprice;

                        if (this.detailsData[i].check) {
@@ -552,7 +559,7 @@
                    this.ConInvoiceListUserWorkLocation = r.entity.userWorkLocation;

                    this.ConInvoiceListAgencyProType = r.entity.agencyProType;
                    if (this.ConInvoiceListAgencyProType != 'ET')
                    //if (this.ConInvoiceListAgencyProType != 'ET')
                        this.isOpenReportDisabled = false;
                    this.invoiceData = r.entity.raesList;
                    for (var i in this.invoiceData) {
@@ -660,7 +667,7 @@
                    this.HospitalName = r.entity.HospitalName;
                    this.HospitalInfo = r.entity.HospitalInfo;
                    this.agencyProType = r.entity.agencyProType;
                    if (this.agencyProType != 'ET')
                    //if (this.agencyProType != 'ET')
                        this.isOpenReportDisabled = false;
                    //科室
                    this.ForCustomerText = this.coc.Order_ForCustomerText__c;
@@ -681,6 +688,7 @@
                            label: '客户名',
                            fieldName: "hospitalName",
                            hideDefaultActions: true,
                            wrapText: true,
                        };
                        let object2 = {
                            label: '出货金额(元)',
@@ -827,6 +835,15 @@
    removeAtt() {
        this.filesUploaded = [];
        this.fileName = '';
    }

    //是否显示附件移除
    get attDelBtn() {
        if (this.fileName != '' && this.fileName != null && this.fileName != '选择一个文件上传') {
            return true;
        } else {
            return false;
        }
    }

    keepTwoDecimalStr(num) {
@@ -1041,15 +1058,14 @@
    }

    handleSave() {
        this.isShowSpinner = true;
        console.log("saveFile");
        if (this.filesUploaded.length > 0) {
            this.showPopSpinner = true;
            this.file = this.filesUploaded[0];
            if (this.file.size > this.MAX_FILE_SIZE) {
                this.showMyToast('保存失败', '文件过大', 'Error');
                return;
            }
            this.showLoadingSpinner = true;
            this.fileReader = new FileReader();

            this.fileReader.onloadend = () => {
@@ -1078,8 +1094,8 @@
            r = JSON.parse(JSON.stringify(r));
            console.log("r = " + JSON.stringify(r));
            if (r != '') {
                this.showLoadingSpinner = false;
                this.showMyToast('附件上传成功', '', 'Success');
                this.showPopSpinner = false;
                this.showMyToast('上传成功', '', 'Success');
                this.closePop();
                this.init();
            } else {
@@ -1117,8 +1133,9 @@
    }

    saveAttachmentJs() {
        debugger
        this.showLoadingSpinner = true;
        let cloneData = this.fileData
        let cloneData = this.deepClone(this.fileData)
        for (var i in cloneData) {
            delete cloneData[i].Id;
            delete cloneData[i].recordId;
@@ -1435,13 +1452,15 @@
        let reportUrl = this.label.LexConInvoiceViewReport;
        let reportFilters = '[{"operator":"equals","value":"' + this.OrderCode + '","column":"FK_NAME"}]';
        console.log('reportUrl = ' + reportUrl);
        let url = "/report/"+ reportUrl +"?reportFilters=" + encodeURIComponent(reportFilters);
        this[NavigationMixin.Navigate]({
            type: "standard__webPage",
            attributes: {
                url: url,
            },
        });
        let url = "/s/report/" + reportUrl + "?reportFilters=" + encodeURIComponent(reportFilters);
        window.open(url);
        // this[NavigationMixin.Navigate]({
        //     type: "standard__webPage",
        //     attributes: {
        //         url: url,
        //         target: '_blank'
        //     },
        // });
    }

    reopenJs() {
@@ -1461,6 +1480,7 @@
    showMyToast(title, message, variant) {
        this.isShowSpinner = false;
        this.showLoadingSpinner = false;
        this.showPopSpinner = false;
        this.showAttPop = false;
        this.filesUploaded = [];
        this.fileName = null;
@@ -1645,9 +1665,13 @@
        console.log("this.data = " + JSON.stringify(this.data));
    }

    deepClone(obj) {
        return JSON.parse(JSON.stringify(obj));
    }

    detailsSaveJs() {
        this.isShowSpinner = true;
        let cloneData = this.detailsData;
        let cloneData = this.deepClone(this.detailsData);

        let selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
        console.log('selectedRows = ' + JSON.stringify(selectedRows));
@@ -1747,18 +1771,19 @@
        console.log('attid:' + recordId);
        deleteAtt({
            contentVersionId: recordId
        }).then(result => {
            if (result.result == 'Success') {
        }).then(r => {
            r = JSON.parse(JSON.stringify(r));
            if (r.status == "Success") {
                this.showMyToast('删除成功', '', 'Success');
                if (this.fileData.length == 1)
                    window.location.reload();
                else
                    this.init();
            } else {
                this.showMyToast('删除失败', result.errorMsg, 'Error');
                this.showMyToast('删除失败', r.msg, 'Error');
            }
        }).catch(error => {
            this.showMyToast('错误', '删除失败', 'Error');
            this.showMyToast('错误', error.message, 'Error');
        })
    }
}

 force-app/main/default/lwc/lexConsumable/lexConsumable.html

@@ -130,9 +130,12 @@
                                                        <template for:each={attachmentRecoeds} for:item="item" for:index="index">
                                                            <lightning-layout-item padding="around-none" size="2" key={item.recordId} style="text-align: left;padding:5px">
                                                                <lightning-icon title={item.fileFullName} style="margin-left: 20px;" icon-name="doctype:gform" alternative-text={item.fileFullName} size="large"></lightning-icon><br/>
                                                                <span title={item.fileFullName}>
                                                                <!-- <span style="word-wrap:break-word; word-break:break-all;width:80px;display:flex;" title={item.fileFullName}>
                                                                    {item.fileName}
                                                                </span>
                                                                </span> -->
                                                                <div title={item.fileFullName} style="width: 100px;text-overflow: ellipsis;overflow: hidden;white-space: nowrap;">
                                                                    {item.fileName}
                                                                </div>
                                                                <p>
                                                                    <!-- <a data-fileid ={item.documentId} onclick={previweAtt}> -->
                                                                    <a href={item.attUrl} target="_blank">
@@ -165,11 +168,11 @@
                        <div style="padding:10px;">
                            <table>
                                <tbody>
                                    <tr>
                                        <td style="width: 90px;">
                                    <!-- <tr>
                                        <td style="width: 100px;">
                                            <div style="color:#696969;font-size:16px;"><span style="color: red;">*&nbsp;</span>合同</div>
                                        </td>
                                        <td style="width:300px;">
                                        <td style="width:320px;">
                                            <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
                                                <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
                                                <lightning-input class="inputFont" variant="label-hidden" label="合同" placeholder="请选择合同" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
@@ -189,36 +192,13 @@
                                                </div>
                                            </template>
                                        </td>
                                        <!-- <td style="width: 30px;"></td>
                                        <td style="width: 66px;"></td>
                                        <td style="width:150px;"></td> -->
                                        <td style="width: 30px;"></td>
                                        <td style="width: 66px;"></td>
                                        <td style="width:140px;"></td>
                                        <td style="width: 30px;"></td>
                                        <td></td>
                                    </tr>
                                    <tr style="height: 10px;"></tr>
                                    <!-- <tr>
                                        <td><div style="color:#696969;font-size:14px;"><span style="color: red;">*&nbsp;</span>合同</div></td>
                                        <td style="padding-bottom:5px;padding-top:5px;">
                                            <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
                                                <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
                                                <lightning-input variant="label-hidden" label="合同" placeholder="请选择合同" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
                                            </div>
                                        <td colspan="4">
                                            <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="width:130px;height:32px;margin-right: 10px;" label="消耗品搜索" onclick={searchProduct}>消耗品搜索</button>
                                            <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="width:80px;height:32px;" label="清空" onclick={clear}>清空</button>
                                        </td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                        <td></td>
                                    </tr> -->
                                    <!-- <tr style="height: 10px;"></tr> -->
                                    <tr>
                                        <td>
                                            <div style="color:#696969;font-size:16px;">消耗品名称</div>
@@ -230,27 +210,51 @@
                                        <td>
                                            <div style="color:#696969;font-size:16px;">第3分类</div>
                                        </td>
                                        <td style="width:140px;">
                                        <td>
                                            <lightning-combobox class="inputFont" variant="label-hidden" label="第3分类" value={category3} options={category3Option} onchange={category3Change}></lightning-combobox>
                                        </td>
                                        <td style="width:30px;"></td>
                                        <td style="width:66px;">
                                            <div style="color:#696969;font-size:16px;">第4分类</div>
                                        </td>
                                        <td style="width:140px;">
                                        <td >
                                            <lightning-combobox class="inputFont" variant="label-hidden" label="第4分类" value={category4} options={category4Option} onchange={category4Change}></lightning-combobox>
                                        </td>
                                        <td></td>
                                        <td>
                                        <td style="width: 66px;">
                                            <div style="color:#696969;font-size:16px;">第5分类</div>
                                        </td>
                                        <td>
                                        <td style="width: 160px;">
                                            <lightning-combobox class="inputFont" variant="label-hidden" label="第5分类" value={category5} options={category5Option} onchange={category5Change}></lightning-combobox>
                                        </td>
                                        <td></td>
                                        <td>
                                            <!-- <lightning-button style="margin-right: 10px;margin-left: 15px;" label="消耗品搜索" onclick={searchProduct}></lightning-button>
                                            <lightning-button label="清空" onclick={clear}></lightning-button> -->
                                    </tr>
                                    <tr style="height: 10px;"></tr>
                                    <tr>
                                        <td style="width: 100px;">
                                            <div style="color:#696969;font-size:16px;"><span style="color: red;">*&nbsp;</span>合同</div>
                                        </td>
                                        <td style="width:320px;">
                                            <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
                                                <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
                                                <lightning-input class="inputFont" variant="label-hidden" label="合同" placeholder="请选择合同" value={contractName} onchange={changeCon} onclick={showSearchCon}></lightning-input>
                                            </div>
                                        </td>
                                        <td style="width: 30px;"></td>
                                        <td style="width:66px;">
                                            <template if:true={showHospital}>
                                                <div style="color:#696969;font-size:16px;"><span style="color: red;">*&nbsp;</span>医院</div>
                                            </template>
                                        </td>
                                        <td colspan="4" style="padding-bottom:5px;padding-top:5px;">
                                            <template if:true={showHospital}>
                                                <div class="slds-form-element__control slds-input-has-icon slds-input-has-icon_right">
                                                    <lightning-icon size="x-small" class="iconMargin slds-icon slds-input__icon slds-input__icon_right slds-icon-text-default" icon-name="utility:search" ></lightning-icon>
                                                    <lightning-input class="inputFont" variant="label-hidden" label="医院" placeholder="请选择医院" value={hospitalName} onclick={showSearchHos} onchange={changeHos}></lightning-input>
                                                </div>
                                            </template>
                                        </td>
                                        <td style="width: 30px;"></td>
                                        <td colspan="2">
                                            <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="width:130px;height:32px;margin-right: 10px;" label="消耗品搜索" onclick={searchProduct}>消耗品搜索</button>
                                            <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="width:80px;height:32px;" label="清空" onclick={clear}>清空</button>
                                        </td>
@@ -298,7 +302,7 @@
                    </div>
                    <div style="padding:10px;">
                        <template if:true={editAble}>
                            <c-lex-custom-lightning-datatable class="wrapped-header-datatable" key-field="recordId" data={currentRecord} columns={cols}
                            <c-lex-custom-lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" key-field="recordId" data={currentRecord} columns={cols}
                            selected-rows={selectRows} onrowselection={checkRows} onchangevalue={conCountChange} onvalueblur={conCountBlur}
                            default-sort-direction="asc" sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}></c-lex-custom-lightning-datatable>
                            <c-paginator onprevious={prePageClick} onnext={nextPageClick}
@@ -308,7 +312,7 @@
                                record-end={recordEnd} total-records={totalRecords}></c-paginator>
                        </template>
                        <template if:false={editAble}>
                            <c-lex-custom-lightning-datatable class="wrapped-header-datatable" hide-checkbox-column key-field="recordId" data={consumableorderdetailsRecordsview} columns={cols}></c-lex-custom-lightning-datatable>
                            <c-lex-custom-lightning-datatable class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all;" hide-checkbox-column key-field="recordId" data={consumableorderdetailsRecordsview} columns={cols}></c-lex-custom-lightning-datatable>
                            <c-paginator onprevious={prePageClick} onnext={nextPageClick}
                                onpageschange={pageSizeChange} onfirst={goFirstPage} onlast={goLastPage}
                                page-size-options={pageSizeOptions} previous-button-disabled={previousButtonDisabled}

 force-app/main/default/lwc/lexConsumable/lexConsumable.js

@@ -1,29 +1,30 @@
import { LightningElement, wire, api, track } from "lwc";
import { CurrentPageReference } from "lightning/navigation";
import { ShowToastEvent } from "lightning/platformShowToastEvent";
import { NavigationMixin } from "lightning/navigation";
import initPage from "@salesforce/apex/LexConsumableController.init";
import categoryAllload from "@salesforce/apex/LexConsumableController.categoryAllload";
import categoryload from "@salesforce/apex/LexConsumableController.categoryload";
import searchConsumableorderdetails from "@salesforce/apex/LexConsumableController.searchConsumableorderdetails";
import searchorderdetails from "@salesforce/apex/LexConsumableController.searchorderdetails";
import save from "@salesforce/apex/LexConsumableController.save";
import ordrCopy from "@salesforce/apex/LexConsumableController.ordrCopy";
import setEditAble from "@salesforce/apex/LexConsumableController.setEditAble";
import backOrder from "@salesforce/apex/LexConsumableController.backOrder";
import delConsumable from "@salesforce/apex/LexConsumableController.delConsumable";
import sorder from "@salesforce/apex/LexConsumableController.sorder";
import filesUpload from "@salesforce/apex/LexConsumableController.filesUpload";
import initHospital from "@salesforce/apex/LexSearchHospitalController.init";
import searchHospital from "@salesforce/apex/LexSearchHospitalController.searchHospital";
import initContract from "@salesforce/apex/LexSearchContractController.init";
import searchContract from "@salesforce/apex/LexSearchContractController.searchContract";
import deleteAtt from "@salesforce/apex/LexConsumableController.deleteAtt";
import { LightningElement,wire,api,track } from 'lwc';
import { CurrentPageReference } from 'lightning/navigation';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';
import { NavigationMixin } from 'lightning/navigation';
import initPage from '@salesforce/apex/LexConsumableController.init';
import categoryAllload from '@salesforce/apex/LexConsumableController.categoryAllload';
import categoryload from '@salesforce/apex/LexConsumableController.categoryload';
import searchConsumableorderdetails from '@salesforce/apex/LexConsumableController.searchConsumableorderdetails';
import searchorderdetails from '@salesforce/apex/LexConsumableController.searchorderdetails';
import save from '@salesforce/apex/LexConsumableController.save';
import ordrCopy from '@salesforce/apex/LexConsumableController.ordrCopy';
import setEditAble from '@salesforce/apex/LexConsumableController.setEditAble';
import backOrder from '@salesforce/apex/LexConsumableController.backOrder';
import delConsumable from '@salesforce/apex/LexConsumableController.delConsumable';
import sorder from '@salesforce/apex/LexConsumableController.sorder';
import filesUpload from '@salesforce/apex/LexConsumableController.filesUpload';
import initHospital from '@salesforce/apex/LexSearchHospitalController.init';
import searchHospital from '@salesforce/apex/LexSearchHospitalController.searchHospital';
import initContract from '@salesforce/apex/LexSearchContractController.init';
import searchContract from '@salesforce/apex/LexSearchContractController.searchContract';
import deleteAtt from '@salesforce/apex/LexConsumableController.deleteAtt';
//table css
import { loadStyle } from "lightning/platformResourceLoader";
import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";

export default class LexConsumable extends NavigationMixin(LightningElement) {
   
  //页面基础数据
  @track editAble;
  @track pageType;
@@ -37,9 +38,9 @@
  @track specialCampaign = false;
  @track dealerProductId = [];
  @track category1;
  @track category3 = "";
  @track category4 = "";
  @track category5 = "";
   @track category3 = '';
   @track category4 = '';
   @track category5 = '';
  @track category_Goods;
  @track category3Option = [];
  @track category4Option = [];
@@ -81,7 +82,7 @@
  //是否一直显示提示
  @track isNoteStay = true;
  //排序相关
  @track sortDirection = "asc";
   @track sortDirection = 'asc';
  @track sortedBy;
  //分页
  @track currentPage = 1;
@@ -114,34 +115,10 @@
  @track tempidHp;
  @track hosCols = [
    // {label:'医院名称',fieldName:'Name',type:'button',typeAttributes:{label:{fieldName:'Name'},variant:'base'}},
    {
      label: "",
      type: "button",
      typeAttributes: { label: "选择" },
      initialWidth: 90,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "医院名称",
      fieldName: "Name",
      initialWidth: 380,
      wrapText: true,
      hideDefaultActions: true
    },
    {
      label: "省份",
      fieldName: "StateMaster",
      initialWidth: 80,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "地址",
      fieldName: "Address__c",
      hideDefaultActions: true,
      wrapText: true
    }
      {label:'',type:'button',typeAttributes:{label:'选择'},initialWidth:90,hideDefaultActions: true,wrapText:true},
      {label:'医院名称',fieldName:'Name',initialWidth:380,wrapText:true,hideDefaultActions: true},
      {label:'省份',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
      {label:'地址',fieldName:'Address__c',hideDefaultActions: true,wrapText:true}
  ];
  //合同搜索
  @track contractLabel;
@@ -154,211 +131,66 @@
  @track contractName;
  @track tempidPp;
  @track conCols = [
    {
      label: "",
      type: "button",
      typeAttributes: { label: "选择" },
      initialWidth: 90,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "合同名称",
      fieldName: "Name",
      wrapText: true,
      hideDefaultActions: true
    },
    {
      label: "省份",
      fieldName: "StateMaster",
      initialWidth: 80,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "申请销售课",
      fieldName: "Sales_Section__c",
      initialWidth: 160,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "允许报价期间(开始日)",
      fieldName: "Contract_Decide_Start_Date__c",
      initialWidth: 175,
      hideDefaultActions: true,
      wrapText: true
    },
    {
      label: "允许报价期间(结束日)",
      fieldName: "Contract_Decide_End_Date__c",
      initialWidth: 175,
      hideDefaultActions: true,
      wrapText: true
    }
      {label:'',type:'button',typeAttributes:{label:'选择'},initialWidth:90,hideDefaultActions: true,wrapText:true},
      {label:'合同名称',fieldName:'Name',wrapText:true,hideDefaultActions: true},
      {label:'省份',fieldName:'StateMaster',initialWidth:80,hideDefaultActions: true,wrapText:true},
      {label:'申请销售课',fieldName:'Sales_Section__c',initialWidth:160,hideDefaultActions: true,wrapText:true},
      {label:'允许报价期间(开始日)',fieldName:'Contract_Decide_Start_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true},
      {label:'允许报价期间(结束日)',fieldName:'Contract_Decide_End_Date__c',initialWidth:175,hideDefaultActions: true,wrapText:true}
  ];

  //消耗品数据col
  get cols() {
    var cols = [];
    cols.push({
      label: "消耗品名称",
      fieldName: "prodName",
      wrapText: true,
      hideDefaultActions: true,
      sortable: true
    });
    cols.push({
      label: "规格",
      fieldName: "packing_list",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 50,
      cellAttributes: { alignment: "right" }
    });
    cols.push({
      label: "CFDA状态",
      fieldName: "prodSFDAStatus",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 97
    });
    cols.push({
      label: "注册证编码号",
      fieldName: "approbation_No",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 120
    });
    cols.push({
      label: "注册证效期",
      fieldName: "expiration_Date",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 105
    });
    cols.push({
      label: "第3分类",
      fieldName: "prodCategory3",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 78,
      sortable: true
    });
    cols.push({
      label: "第4分类",
      fieldName: "prodCategory4",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 107,
      sortable: true
    });
    cols.push({
      label: "第5分类",
      fieldName: "prodCategory5",
      wrapText: true,
      hideDefaultActions: true,
      initialWidth: 80,
      sortable: true
    });
      cols.push({label:'消耗品名称',fieldName:'prodName',wrapText:true,hideDefaultActions: true,sortable: true,initialWidth:150});
      cols.push({label:'规格',fieldName:'packing_list',wrapText:true,hideDefaultActions: true,initialWidth:50,cellAttributes: { alignment: "right" }});
      cols.push({label:'CFDA状态',fieldName:'prodSFDAStatus',wrapText:true,hideDefaultActions: true,initialWidth:97});
      cols.push({label:'注册证编码号',fieldName:'approbation_No',wrapText:true,hideDefaultActions: true,initialWidth:120});
      cols.push({label:'注册证效期',fieldName:'expiration_Date',wrapText:true,hideDefaultActions: true,initialWidth:105});
      cols.push({label:'第3分类',fieldName:'prodCategory3',wrapText:true,hideDefaultActions: true,initialWidth:78,sortable: true});
      cols.push({label:'第4分类',fieldName:'prodCategory4',wrapText:true,hideDefaultActions: true,initialWidth:107,sortable: true});
      cols.push({label:'第5分类',fieldName:'prodCategory5',wrapText:true,hideDefaultActions: true,initialWidth:80,sortable: true});
    if (this.cansee) {
      cols.push({
        label: "标准单价",
        type: "number",
        typeAttributes: { minimumFractionDigits: 2 },
        fieldName: "prodIntraTradeList",
        hideDefaultActions: true,
        initialWidth: 80
      });
         cols.push({label:'标准单价',type:'number',typeAttributes:{minimumFractionDigits: 2},fieldName:'prodIntraTradeList',hideDefaultActions: true,initialWidth:80});
    }
    if (this.editAble) {
      cols.push({
        label: "采购数量",
        type: "customTableInput",
        typeAttributes: {
         cols.push(
            {label:'采购数量',
            type: "customTableInput",typeAttributes: {
          recordId: { fieldName: "recordId" },
          inputValue: { fieldName: "consumableCount" },
          upperLimit: { fieldName: "upperlimit" },
          lowerLimit: { fieldName: "lowerlimit" },
          allnumber: { fieldName: "allnumber" },
          valueType: "Number"
               valueType: 'Number'
        },
        hideDefaultActions: true,
        initialWidth: 80
      });
            hideDefaultActions: true,initialWidth:80});
    } else {
      cols.push({
        label: "采购数量",
        fieldName: "consumableCount",
        hideDefaultActions: true,
        initialWidth: 80,
        cellAttributes: { alignment: "right" }
      });
         cols.push({label:'采购数量',fieldName:'consumableCount',hideDefaultActions: true,initialWidth:80,cellAttributes: { alignment: "right" }});
    }
    cols.push({
      label: "在库数下限",
      fieldName: "lowerlimit",
      hideDefaultActions: true,
      initialWidth: 100,
      cellAttributes: { alignment: "right" }
    });
    cols.push({
      label: "在库数上限",
      fieldName: "upperlimit",
      hideDefaultActions: true,
      initialWidth: 100,
      cellAttributes: { alignment: "right" }
    });
      cols.push({label:'在库数下限',fieldName:'lowerlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
      cols.push({label:'在库数上限',fieldName:'upperlimit',hideDefaultActions: true,initialWidth:100,cellAttributes: { alignment: "right" }});
    // cols.push({label:'有效期库存(盒)',fieldName:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
    cols.push({
      label: "有效期库存(盒)",
      cols.push(
         {label:'有效期库存(盒)',
      type: "customInventoryColor",
      typeAttributes: {
        value: { fieldName: "allnumber" },
        upperlimit: { fieldName: "upperlimit" },
        lowerlimit: { fieldName: "lowerlimit" },
        boxPrice: "盒"
            boxPrice: '盒'
      },
      hideDefaultActions: true,
      initialWidth: 126
    });
    cols.push({
      label: "有效期库存(个)",
      fieldName: "allnumber_piece",
      hideDefaultActions: true,
      initialWidth: 126,
      cellAttributes: { alignment: "right" }
    });
         hideDefaultActions: true,initialWidth:126});
      cols.push({label:'有效期库存(个)',fieldName:'allnumber_piece',hideDefaultActions: true,initialWidth:126,cellAttributes: { alignment: "right" }});
    return cols;
  }

  //附件cols
  @track attCols = [
    {
      label: "标题",
      fieldName: "attUrl",
      type: "url",
      typeAttributes: { label: { fieldName: "fileName" }, target: "_blank" },
      hideDefaultActions: true
    },
    {
      label: "创建人",
      fieldName: "ownerUrl",
      type: "url",
      typeAttributes: { label: { fieldName: "ownerName" }, target: "_blank" },
      hideDefaultActions: true
    },
    { label: "上传日期", fieldName: "updateDate", hideDefaultActions: true },
    {
      label: "",
      type: "tableCellIcon",
      typeAttributes: {
        iconName: "utility:delete",
        recordId: { fieldName: "recordId" }
      },
      initialWidth: 50,
      hideDefaultActions: true
    }
      {label:'标题',fieldName:'attUrl',type:'url',typeAttributes:{label:{fieldName:'fileName'},target: "_blank"},hideDefaultActions: true},
      {label:'创建人',fieldName:'ownerUrl',type:'url',typeAttributes:{label:{fieldName:'ownerName'},target: "_blank"},hideDefaultActions: true},
      {label:'上传日期',fieldName:'updateDate',hideDefaultActions: true},
      {label:'',type:'tableCellIcon',typeAttributes:{iconName:'utility:delete',recordId:{fieldName : 'recordId'}},initialWidth:50,hideDefaultActions: true}
  ];

  //取得所有被勾选的产品id
@@ -378,26 +210,16 @@
    for (var i in this.consumableorderdetailsRecordsview) {
      var count = 0;
      for (var j in selectedRows) {
        if (
          this.consumableorderdetailsRecordsview[i].recordId ==
          selectedRows[j].recordId
        ) {
          count++;
          console.log(
            "checkId:" +
              selectedRows[j].recordId +
              "---" +
              this.consumableorderdetailsRecordsview[i].prodName
          );
            if(this.consumableorderdetailsRecordsview[i].recordId == selectedRows[j].recordId){
               count++
               console.log("checkId:"+selectedRows[j].recordId+'---'+this.consumableorderdetailsRecordsview[i].prodName);
        }
      }
      if (count == 0) {
        this.consumableorderdetailsRecordsview[i].check = false;
      } else {
        this.consumableorderdetailsRecordsview[i].check = true;
        this.selectRows.push(
          this.consumableorderdetailsRecordsview[i].recordId
        );
            this.selectRows.push(this.consumableorderdetailsRecordsview[i].recordId);
      }
    }
    for (var i in this.selectRows) {
@@ -414,18 +236,16 @@
  conCountChange(event) {
    var recordId = event.detail.data.recordId;
    var conCount = event.detail.data.value;
    console.log("countChange:" + recordId + "---" + conCount);
      console.log('countChange:'+recordId+'---'+conCount);
    for (var i in this.consumableorderdetailsRecordsview) {
      if (this.consumableorderdetailsRecordsview[i].recordId == recordId) {
        this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c =
          conCount;
            this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c = conCount;
        this.consumableorderdetailsRecordsview[i].consumableCount = conCount;
        if (conCount != null && conCount != 0 && conCount != "") {
            if(conCount != null && conCount !=0 && conCount!=''){
          this.consumableorderdetailsRecordsview[i].check = true;
        } else {
          this.consumableorderdetailsRecordsview[i].check = false;
          this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c =
            null;
               this.consumableorderdetailsRecordsview[i].esd.Consumable_count__c = null;
          this.consumableorderdetailsRecordsview[i].consumableCount = null;
        }
      }
@@ -433,9 +253,7 @@
    this.getAllChecked();
    for (var i in this.currentRecord) {
      if (this.currentRecord[i].recordId == recordId) {
        console.log(
          "currentRecord1:" + this.currentRecord[i].esd.Consumable_count__c
        );
            console.log("currentRecord1:"+this.currentRecord[i].esd.Consumable_count__c);
      }
    }
  }
@@ -446,43 +264,29 @@
    var allnumber = event.detail.data.allnumber;
    var upperLimit = event.detail.data.upperLimit;
    var lowerLimit = event.detail.data.lowerLimit;
    console.log(
      "limit:" +
        conCount +
        "---" +
        allnumber +
        "---" +
        lowerLimit +
        "---" +
        allnumber
    );
    if (
      upperLimit != null &&
      lowerLimit != null &&
      conCount != null &&
      allnumber != null
    ) {
      console.log('limit:'+conCount+'---'+ allnumber+'---'+lowerLimit+'---'+allnumber);
      if(upperLimit != null && lowerLimit != null && conCount != null && allnumber != null){
      if (parseInt(allnumber) + parseInt(conCount) > upperLimit) {
        // window.alert("该产品订购数量超出库存上限！");
        this.showMyToast("该产品订购数量超出库存上限！", "", "error");
            this.showMyToast('该产品订购数量超出库存上限！','','error');
      }
      if (parseInt(allnumber) + parseInt(conCount) < lowerLimit) {
        // window.alert("该产品订购数量低于库存下限！");
        this.showMyToast("该产品订购数量低于库存下限！", "", "error");
            this.showMyToast('该产品订购数量低于库存下限！','','error');
      }
    }
  }

  @wire(CurrentPageReference)
  getStateParameters(currentPageReference) {
    console.log("CurrentPageReference");
      console.log('CurrentPageReference');
    if (currentPageReference) {
      this.pageType = currentPageReference.state?.type;
      this.esetId = currentPageReference.state?.ESetid;
      this.keyWords = currentPageReference.state?.KeyWords;
      console.log("type:" + this.pageType);
      console.log("esetId:" + this.esetId);
      console.log("keyWords:" + this.keyWords);
         console.log('type:'+this.pageType);
         console.log('esetId:'+this.esetId);
         console.log('keyWords:'+this.keyWords);
    }
  }

@@ -502,14 +306,10 @@
  //页面初始化
  connectedCallback() {
    this.showSpinner = true;
    initPage({
      type: this.pageType,
      esetId: this.esetId,
      keywordStr: this.keyWords
    })
      .then((result) => {
      initPage({type:this.pageType, esetId:this.esetId, keywordStr:this.keyWords})
         .then(result=>{
        this.isNoteStay = result.isNoteStay;
        if (result.result == "Success") {
            if(result.result == 'Success'){
          this.editAble = result.editAble;
          this.edoffersPrice = result.edoffersPrice;
          this.cansee = result.cansee;
@@ -522,45 +322,33 @@
          this.OSHFLG = result.OSHFLG;
          this.hospitalName = result.hospitalName;
          this.contractName = result.contractName;
          this.contractLabel = "经销商有效合同";
          this.consumableorderdetailsRecordsview =
            result.consumableorderdetailsRecordsview;
               this.contractLabel = '经销商有效合同';
               this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
          this.currentPage = 1;
          this.showCurrentReocrd();
          this.getAllChecked();
          this.attachmentRecoeds = result.attachmentRecoeds;
          console.log("attSize:" + this.attachmentRecoeds.length);
          for (var i in this.attachmentRecoeds) {
            this.attachmentRecoeds[i]["recordId"] =
              this.attachmentRecoeds[i].Concc.Id;
            this.attachmentRecoeds[i]["documentId"] =
              this.attachmentRecoeds[i].Concc.ContentDocumentId;
            this.attachmentRecoeds[i]["fileFullName"] =
              this.attachmentRecoeds[i].Concc.Title;
                  this.attachmentRecoeds[i]['recordId'] = this.attachmentRecoeds[i].Concc.Id;
                  this.attachmentRecoeds[i]['documentId'] = this.attachmentRecoeds[i].Concc.ContentDocumentId;
                  this.attachmentRecoeds[i]['fileFullName'] = this.attachmentRecoeds[i].Concc.Title;
            var contractionName = this.attachmentRecoeds[i].Concc.Title;
            // var contractionName = '长文件长文件长文件长文件';
            if (contractionName.length > 25) {
              contractionName = contractionName.substr(0, 21) + "...";
            }
            this.attachmentRecoeds[i]["fileName"] = contractionName;
            this.attachmentRecoeds[i]["ownerName"] =
              this.attachmentRecoeds[i].Concc.Owner.Name;
            this.attachmentRecoeds[i]["downloadUrl"] =
              "/sfc/servlet.shepherd/document/download/" +
              this.attachmentRecoeds[i].Concc.ContentDocumentId +
              "?operationContext=S1";
                  this.attachmentRecoeds[i]['fileName'] = contractionName;
                  this.attachmentRecoeds[i]['ownerName'] = this.attachmentRecoeds[i].Concc.Owner.Name;
                  this.attachmentRecoeds[i]['downloadUrl'] = '/sfc/servlet.shepherd/document/download/'+this.attachmentRecoeds[i].Concc.ContentDocumentId+'?operationContext=S1';
            // var date = this.attachmentRecoeds[i].Concc.CreatedDate;
            // var year = date.getFullYear();
            // var month = date.getMonth();
            // var day = date.getDay();
            // console.log(year+'-'+month+'-'+day);
            this.attachmentRecoeds[i]["updateDate"] = new Date(
              Date.parse(this.attachmentRecoeds[i].Concc.CreatedDate)
            ).toLocaleString();
            this.attachmentRecoeds[i]["attUrl"] =
              "/" + this.attachmentRecoeds[i].Concc.Id;
            this.attachmentRecoeds[i]["ownerUrl"] =
              "/" + this.attachmentRecoeds[i].Concc.OwnerId;
                  this.attachmentRecoeds[i]['updateDate'] = new Date(Date.parse(this.attachmentRecoeds[i].Concc.CreatedDate)).toLocaleString();
                  this.attachmentRecoeds[i]['attUrl'] = '/'+this.attachmentRecoeds[i].Concc.Id;
                  this.attachmentRecoeds[i]['ownerUrl'] = '/'+this.attachmentRecoeds[i].Concc.OwnerId;
          }
          this.errorMsgs = result.errorMsgList;
          this.warningMsgs = result.warningMsgList;
@@ -575,18 +363,13 @@
          this.contactDealer = result.contactDealer;
          this.pageType = result.methodType;
          this.proLimitAndDate = result.proLimitAndDate;
          console.log(
            "proLimitAndDate:" + JSON.stringify(this.proLimitAndDate)
          );
               console.log("proLimitAndDate:"+JSON.stringify(this.proLimitAndDate));
          this.coc = result.coc;
          this.cocId = this.coc.Id;
          if (this.pageType == "hospitalorder" && this.agencyProType != "ET") {
               if(this.pageType == 'hospitalorder' && this.agencyProType != 'ET'){
            this.showHospital = true;
          }
          if (
            this.coc.Order_status__c == "已提交" ||
            this.coc.Order_status__c == "批准"
          ) {
               if(this.coc.Order_status__c == "已提交" || this.coc.Order_status__c == "批准"){
            this.showOrderDate = true;
          }
          if (this.coc.Consumable_pdf_insert_day__c != null) {
@@ -596,35 +379,20 @@
            this.showEditBtn = true;
            this.showOfferPriceInputBtn = true;
          }
          if (
            this.coc.Order_status__c == "已提交" ||
            this.coc.Order_status__c == "批准" ||
            this.coc.Order_status__c == "驳回"
          ) {
               if(this.coc.Order_status__c == "已提交" || this.coc.Order_status__c == "批准" || this.coc.Order_status__c == "驳回"){
            this.disabledEditBtn = true;
            this.disabledUploadSheetBtn = true;
            this.disabledSubOrderbtn = true;
            this.disabledDeleteBtn = true;
            this.disabledOfferPriceInputBtn = true;
          }
          if (
            !(
              this.editDelCommitBtnDisabled ||
              this.editAble ||
              this.edoffersPrice
            )
          ) {
               if(!(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)){
            this.showPrintSheetBtn = true;
            this.showUploadSheetBtn = true;
            this.showSubOrderbtn = true;
            this.showDeleteBtn = true;
          }
          if (
            (this.editDelCommitBtnDisabled ||
              this.editAble ||
              this.edoffersPrice) &&
            this.coc.Order_status__c != "驳回"
          ) {
               if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "驳回"){
            this.showSaveOrderbtn1 = true;
          }
          if (this.coc.Order_status__c == "驳回" && this.editAble) {
@@ -638,33 +406,31 @@
        } else {
          this.showSpinner = false;
          console.log("Error:" + result.errorMsg);
          this.showMyToast("初始化页面失败", result.errorMsg, "error");
               this.showMyToast('初始化页面失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
         .catch(error=>{
        this.showSpinner = false;
        console.log("error:" + error);
        this.showMyToast("初始化页面失败", error, "error");
      });
            this.showMyToast('初始化页面失败',error,'error');
         })
  }

  //排序
  onHandleSort(event) {
    //将已经选好了的放到前面，不进行排序
    console.log("sort");
      console.log('sort');
    if (this.editAble) {
      const { fieldName: sortedBy, sortDirection } = event.detail;
      const cloneData = [...this.currentRecord];
      cloneData.sort(this.sortBy(sortedBy, sortDirection === "asc" ? 1 : -1));
         cloneData.sort(this.sortBy(sortedBy, sortDirection === 'asc' ? 1 : -1));
      let index = 0;
      let selectedRows = this.template
        .querySelector("c-lex-custom-lightning-datatable")
        .getSelectedRows();
         let selectedRows = this.template.querySelector('c-lex-custom-lightning-datatable').getSelectedRows();
      let selectedRowsIds = [];
      for (var i in selectedRows) {
        selectedRowsIds.push(selectedRows[i].recordId);
      }
      console.log("selectedRowsIds = " + JSON.stringify(selectedRowsIds));
         console.log('selectedRowsIds = ' + JSON.stringify(selectedRowsIds));
      for (var i = 0; i < cloneData.length; i++) {
        if (selectedRowsIds.indexOf(cloneData[i].recordId) != -1) {
          if (i != 0) {
@@ -681,7 +447,7 @@
    } else {
      const { fieldName: sortedBy, sortDirection } = event.detail;
      const cloneData = [...this.currentRecord];
      cloneData.sort(this.sortBy(sortedBy, sortDirection === "asc" ? 1 : -1));
         cloneData.sort(this.sortBy(sortedBy, sortDirection === 'asc' ? 1 : -1));
      this.currentRecord = cloneData;
      this.sortDirection = sortDirection;
      this.sortedBy = sortedBy;
@@ -738,44 +504,39 @@
  category3Change(event) {
    this.showSpinner = true;
    this.category3 = event.detail.value;
    this.category4 = "";
    this.category5 = "";
    categoryAllload({
      agencyProTypeStr: this.agencyProType,
      category3Str: this.category3
    }).then((result) => {
      if (result.result == "Success") {
      this.category4 = '';
      this.category5 = '';
      categoryAllload({agencyProTypeStr:this.agencyProType, category3Str:this.category3})
         .then(result=>{
            if(result.result == 'Success'){
        this.category4Option = result.category4Option;
        this.category5Option = result.category5Option;
        this.showSpinner = false;
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("加载分类失败", result.errorMsg, "error");
               this.showMyToast('加载分类失败',result.errorMsg,'error');
      }
    });
         })
  }

  //第四分类change事件
  category4Change(event) {
    this.showSpinner = true;
    this.category4 = event.detail.value;
    this.category5 = "";
    categoryload({
      agencyProTypeStr: this.agencyProType,
      category3Str: this.category3,
      category4Str: this.category4
    }).then((result) => {
      if (result.result == "Success") {
      this.category5 = '';
      categoryload({agencyProTypeStr:this.agencyProType, category3Str:this.category3, category4Str:this.category4})
         .then(result=>{
            if(result.result == 'Success'){
        this.category4Option = result.category4Option;
        this.category5Option = result.category5Option;
        this.showSpinner = false;
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("加载分类失败", result.errorMsg, "error");
               this.showMyToast('加载分类失败',result.errorMsg,'error');
      }
    });
         })
  }

  //第五分类change事件
@@ -786,8 +547,7 @@
  //搜索产品
  searchProduct(event) {
    this.showSpinner = true;
    searchConsumableorderdetails({
      userWorkLocationStr: this.userWorkLocation,
      searchConsumableorderdetails({userWorkLocationStr:this.userWorkLocation,
      agencyProTypeStr: this.agencyProType,
      accountNameStr: this.accountName,
      accountIdStr: this.accountid,
@@ -802,15 +562,12 @@
      dealerProductIdStr: JSON.stringify(this.dealerProductId),
      methodTypeStr: this.pageType,
      editAbleStr: this.editAble,
      consumableorderdetailsRecordsviewStr: JSON.stringify(
        this.consumableorderdetailsRecordsview
      ),
         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
      proLimitAndDateList: this.proLimitAndDate
    })
      .then((result) => {
        if (result.result == "Success") {
          this.consumableorderdetailsRecordsview =
            result.consumableorderdetailsRecordsview;
            .then(result=>{
               if(result.result == 'Success'){
                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
          this.currentPage = 1;
          this.currentRecord = [];
          this.showCurrentReocrd();
@@ -820,28 +577,28 @@
          this.warningMsgs = result.warningMsgList;
          // this.hasError = result.hasError;
          // this.hasWarning = result.hasWarning;
          this.showMyToast("搜索成功", result.errorMsg, "success");
                  this.showMyToast('搜索成功',result.errorMsg,'success');
        } else {
          this.showSpinner = false;
          console.log("Error:" + result.errorMsg);
          if (result.errorMsg == "没有搜索到相关数据") {
            this.showMyToast(result.errorMsg, "", "error");
                  if(result.errorMsg == '没有搜索到相关数据'){
                     this.showMyToast(result.errorMsg,'','error');
          } else {
            this.showMyToast("搜索失败", result.errorMsg, "error");
                     this.showMyToast('搜索失败',result.errorMsg,'error');
          }
        }
      })
      .catch((error) => {
            .catch(error=>{
        console.log("Error:" + error);
      });
            })
  }

  //清除搜索栏
  clear(event) {
    this.category1 = "";
    this.category3 = "";
    this.category4 = "";
    this.category5 = "";
      this.category1 = '';
      this.category3 = '';
      this.category4 = '';
      this.category5 = '';
    this.showSpinner = true;
    searchConsumableorderdetails({
      userWorkLocationStr: this.userWorkLocation,
@@ -859,39 +616,32 @@
      dealerProductIdStr: JSON.stringify(this.dealerProductId),
      methodTypeStr: this.pageType,
      editAbleStr: this.editAble,
      consumableorderdetailsRecordsviewStr: JSON.stringify(
        this.consumableorderdetailsRecordsview
      ),
         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
      proLimitAndDateList: this.proLimitAndDate
    }).then((result) => {
      if (result.result == "Success") {
        this.consumableorderdetailsRecordsview =
          result.consumableorderdetailsRecordsview;
      }).then(result=>{
            if(result.result == 'Success'){
               this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
        this.currentPage = 1;
        this.currentRecord = [];
        this.showCurrentReocrd();
        this.getAllChecked();
        this.showSpinner = false;
        this.showMyToast("搜索成功", result.errorMsg, "success");
               this.showMyToast('搜索成功',result.errorMsg,'success');
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        if (result.errorMsg == "没有搜索到相关数据") {
          this.showMyToast(result.errorMsg, "", "error");
               if(result.errorMsg == '没有搜索到相关数据'){
                  this.showMyToast(result.errorMsg,'','error');
        } else {
          this.showMyToast("搜索失败", result.errorMsg, "error");
                  this.showMyToast('搜索失败',result.errorMsg,'error');
        }
      }
    });
         })
  }

  //选择所有
  checkAll(event) {
    for (
      let i = 0, len = this.consumableorderdetailsRecordsview.length;
      i < len;
      i++
    ) {
      for(let i=0, len=this.consumableorderdetailsRecordsview.length; i < len ;i++){
      this.consumableorderdetailsRecordsview[i].check = event.target.checked;
    }
  }
@@ -920,15 +670,13 @@
  //保存订单
  saveOrder(event) {
    this.showSpinner = true;
    console.log("start save");
      console.log('start save');
    save({
      contractNameStr: this.contractName,
      cocStr: JSON.stringify(this.coc),
      agencyProTypeStr: this.agencyProType,
      accountidStr: this.accountid,
      consumableorderdetailsRecordsviewStr: JSON.stringify(
        this.consumableorderdetailsRecordsview
      ),
         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
      contactDealerStr: JSON.stringify(this.contactDealer),
      methodTypeStr: this.pageType,
      eSetIdStr: this.esetId,
@@ -936,24 +684,23 @@
      contractIdStr: this.contractId,
      agencyProType1Str: this.agencyProType1,
      OSHFLGStr: this.OSHFLG
    }).then((result) => {
      }).then(result=>{
      this.showSpinner = false;
      if (result.result == "Success") {
         if(result.result == 'Success'){
        this.esetId = result.eSetId;
        const config = {
          type: "standard__webPage",
               type: 'standard__webPage',
          attributes: {
            url:
              "/lexconsumable?ESetid=" + this.esetId + "&type=" + this.pageType
                  url: '/lexconsumable?ESetid=' + this.esetId + '&type=' + this.pageType
          }
        };
        this[NavigationMixin.Navigate](config);
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("保存失败", result.errorMsg, "error");
            this.showMyToast('保存失败',result.errorMsg,'error');
      }
    });
      })
  }

  //保存订单（驳回）
@@ -964,41 +711,39 @@
      cocStr: JSON.stringify(this.coc),
      agencyProTypeStr: this.agencyProType,
      accountidStr: this.accountid,
      consumableorderdetailsRecordsviewStr: JSON.stringify(
        this.consumableorderdetailsRecordsview
      ),
         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
      contactDealerStr: JSON.stringify(this.contactDealer),
      methodTypeStr: this.pageType,
      hospitalIdStr: this.hospitalId,
      contractIdStr: this.contractId,
      agencyProType1Str: this.agencyProType1,
      OSHFLGStr: this.OSHFLG
    }).then((result) => {
      }).then(result=>{
      this.showSpinner = false;
      if (result.result == "Success") {
         if(result.result == 'Success'){
        this.esetId = result.eSetId;
        const config = {
          type: "standard__webPage",
               type: 'standard__webPage',
          attributes: {
            url:
              "/lexconsumable?ESetid=" + this.esetId + "&type=" + this.pageType
                   url: '/lexconsumable?ESetid=' + this.esetId + '&type=' + this.pageType
          }
        };
        this[NavigationMixin.Navigate](config);
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("保存失败", result.errorMsg, "error");
            this.showMyToast('保存失败',result.errorMsg,'error');
      }
    });
      })
  }

  //编辑
  editOrder(event) {
    setEditAble({ eSetidStr: this.esetId }).then((result) => {
      if (result.result == "Success") {
      setEditAble({eSetidStr:this.esetId})
         .then(result=>{
            if(result.result == 'Success'){
        const config = {
          type: "standard__webPage",
                  type: 'standard__webPage',
          attributes: {
            url: result.url
          }
@@ -1007,18 +752,18 @@
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("编辑失败", result.errorMsg, "error");
               this.showMyToast('编辑失败',result.errorMsg,'error');
      }
    });
         })
  }

  //打印配置单
  printOrder(event) {
    var site = window.location.origin;
    const config = {
      type: "standard__webPage",
         type: 'standard__webPage',
      attributes: {
        url: site + "/consumable/PrintConsumblePDF?ESetid=" + this.esetId
            url: site+'/consumable/PrintConsumblePDF?ESetid='+this.esetId
      }
    };
    this[NavigationMixin.Navigate](config);
@@ -1032,10 +777,10 @@
  //提交订单
  submitOrder(event) {
    sorder({ eSetidStr: this.esetId, accountidStr: this.accountid })
      .then((result) => {
        if (result.result == "Success") {
         .then(result=>{
            if(result.result == 'Success'){
          const config = {
            type: "standard__webPage",
                  type: 'standard__webPage',
            attributes: {
              url: result.url
            }
@@ -1047,25 +792,26 @@
          this.warningMsgs = result.warningMsgList;
          console.log("Error:" + result.errorMsg);
          if (result.errorMsg.indexOf("请上传订货配置单附件") != -1) {
            result.errorMsg = "请上传订货配置单附件";
                  result.errorMsg = '请上传订货配置单附件';
          }
          this.showMyToast("提交失败", result.errorMsg, "error");
               this.showMyToast('提交失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
         .catch(error=>{
        console.log("Error:" + error);
      });
         })
  }

  //删除订单
  deleteOrder(event) {
    if (!window.confirm("删除是不可恢复的，你确认要删除吗？")) {
      if(!window.confirm('删除是不可恢复的，你确认要删除吗？')){
      return;
    }
    delConsumable({ eSetidStr: this.esetId }).then((result) => {
      if (result.result == "Success") {
      delConsumable({eSetidStr:this.esetId})
         .then(result=>{
            if(result.result == 'Success'){
        const config = {
          type: "standard__webPage",
                  type: 'standard__webPage',
          attributes: {
            url: result.url
          }
@@ -1074,9 +820,9 @@
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("删除失败", result.errorMsg, "error");
               this.showMyToast('删除失败',result.errorMsg,'error');
      }
    });
         })
  }

  //特价金额录入
@@ -1089,9 +835,7 @@
      this.showEditBtn = false;
      this.showOfferPriceInputBtn = false;
    }
    if (
      !(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)
    ) {
      if(!(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)){
      this.showPrintSheetBtn = true;
      this.showUploadSheetBtn = true;
      this.showSubOrderbtn = true;
@@ -1102,10 +846,7 @@
      this.showSubOrderbtn = false;
      this.showDeleteBtn = false;
    }
    if (
      (this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) &&
      this.coc.Order_status__c != "驳回"
    ) {
      if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "驳回"){
      this.showSaveOrderbtn1 = true;
    } else {
      this.showSaveOrderbtn1 = false;
@@ -1114,10 +855,11 @@

  //再申请
  reapplyOrder(event) {
    backOrder({ eSetidStr: this.esetId }).then((result) => {
      if (result.result == "Success") {
      backOrder({eSetidStr:this.esetId})
         .then(result=>{
            if(result.result == 'Success'){
        const config = {
          type: "standard__webPage",
                  type: 'standard__webPage',
          attributes: {
            url: result.url
          }
@@ -1126,9 +868,9 @@
      } else {
        this.showSpinner = false;
        console.log("Error:" + result.errorMsg);
        this.showMyToast("再申请失败", result.errorMsg, "error");
               this.showMyToast('再申请失败',result.errorMsg,'error');
      }
    });
         })
  }

  //附件change事件
@@ -1136,17 +878,13 @@
    if (event.target.files.length > 0) {
      this.filesUploaded = event.target.files;
      this.fileName = event.target.files[0].name;
      console.log("this.fileName:" + this.fileName);
         console.log('this.fileName:'+this.fileName);
    }
  }

  //是否显示附件移除
  get attDelBtn() {
    if (
      this.fileName != "" &&
      this.fileName != null &&
      this.fileName != "请选择一个文件上传"
    ) {
      if(this.fileName != '' && this.fileName != null && this.fileName != '请选择一个文件上传'){
      return true;
    } else {
      return false;
@@ -1163,7 +901,7 @@
  //移除附件
  removeAtt() {
    this.filesUploaded = [];
    this.fileName = "";
      this.fileName = '';
  }

  //上传附件
@@ -1171,45 +909,42 @@
    if (this.filesUploaded.length > 0) {
      this.file = this.filesUploaded[0];
      if (this.file.size > this.MAX_FILE_SIZE) {
        window.console.log("文件过大");
            window.console.log('文件过大');
        return;
      }
      this.fileReader = new FileReader();

      this.fileReader.onloadend = () => {
         this.fileReader.onloadend = (() => {
        this.fileContents = this.fileReader.result;
        let base64 = "base64,";
            let base64 = 'base64,';
        this.content = this.fileContents.indexOf(base64) + base64.length;
        this.fileContents = this.fileContents.substring(this.content);
        this.saveToFile();
      };
         });
      this.fileReader.readAsDataURL(this.file);
    } else {
      this.fileName = "请选择一个文件上传";
      }
      else {
         this.fileName = '请选择一个文件上传';
    }
  }

  //调用上传附件后台方法
  saveToFile() {
    this.showPopSpinner = true;
    filesUpload({
      pId: this.esetId,
      fileName: this.file.name,
      base64Data: encodeURIComponent(this.fileContents)
    })
      .then((result) => {
      filesUpload({pId:this.esetId, fileName: this.file.name, base64Data: encodeURIComponent(this.fileContents)})
         .then(result => {
        this.showPopSpinner = false;
        if (result.result == "Success") {
            if(result.result == 'Success'){
          this.closePop();
          window.location.reload();
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("上传失败", result.errorMsg, "error");
               this.showMyToast('上传失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
         .catch(error => {
        this.showPopSpinner = false;
        this.showMyToast("上传失败", error, "error");
            this.showMyToast('上传失败',error,'error');
      });
  }

@@ -1217,22 +952,22 @@
  deleteAtt(event) {
    this.showSpinner = true;
    var recordId = event.target.getAttribute("data-fileid");
    console.log("attid:" + recordId);
    deleteAtt({ contentVersionId: recordId })
      .then((result) => {
      console.log('attid:'+recordId);
      deleteAtt({contentVersionId : recordId, cocId : this.esetId})
      .then(result=>{
        this.showSpinner = false;
        if (result.result == "Success") {
         if(result.result == 'Success'){
          window.location.reload();
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("删除失败", result.errorMsg, "error");
            this.showMyToast('删除失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
      .catch(error=>{
        this.showSpinner = false;
        console.log("Error:" + error);
        this.showMyToast("删除失败", JSON.stringify(error), "error");
      });
         this.showMyToast('删除失败',JSON.stringify(error),'error');
      })
  }

  //预览附件
@@ -1240,9 +975,9 @@
    var recordId = event.target.getAttribute("data-fileid");
    console.log(recordId);
    this[NavigationMixin.Navigate]({
      type: "standard__namedPage",
         type:'standard__namedPage',
      attributes: {
        pageName: "filePreview"
            pageName:'filePreview'
      },
      state: {
        recordIds: recordId,
@@ -1254,51 +989,46 @@
  //打开搜索弹窗，并初始化弹窗
  showSearchHos(event) {
    initHospital()
      .then((result) => {
        if (result.result == "Success") {
         .then(result=>{
            if(result.result == 'Success'){
          this.showAttHosPop = true;
          this.hospitalList = result.attList;
          for (var i in this.hospitalList) {
            if (this.hospitalList[i].State_Master__c) {
              this.hospitalList[i]["StateMaster"] =
                this.hospitalList[i].State_Master__r.Name;
                     this.hospitalList[i]['StateMaster'] = this.hospitalList[i].State_Master__r.Name;
            }
          }
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("初始化检索医院页面失败", result.errorMsg, "error");
               this.showMyToast('初始化检索医院页面失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
         .catch(error=>{
        console.log("Error:" + error);
        this.showMyToast("初始化检索医院页面失败", error, "error");
      });
            this.showMyToast('初始化检索医院页面失败',error,'error');
         })
  }

  //检索医院
  searchHos(event) {
    searchHospital({
      searchName: this.searchNameHos,
      accountId: this.accountid
    })
      .then((result) => {
        if (result.result == "Success") {
      searchHospital({searchName:this.searchNameHos, accountId:this.accountid})
         .then(result=>{
            if(result.result == 'Success'){
          this.hospitalList = result.attList;
          for (var i in this.hospitalList) {
            if (this.hospitalList[i].State_Master__c) {
              this.hospitalList[i]["StateMaster"] =
                this.hospitalList[i].State_Master__r.Name;
                     this.hospitalList[i]['StateMaster'] = this.hospitalList[i].State_Master__r.Name;
            }
          }
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("搜索失败", result.errorMsg, "error");
               this.showMyToast('搜索失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
         .catch(error=>{
        console.log("Error:" + error);
        this.showMyToast("搜索失败", error, "error");
      });
            this.showMyToast('搜索失败',error,'error');
         })
  }

  //医院名称change
@@ -1309,8 +1039,8 @@
  //关闭弹窗
  closeHospitalPop() {
    this.showAttHosPop = false;
    this.chooseHospital = "";
    this.chooseHospitalId = "";
      this.chooseHospital = '';
      this.chooseHospitalId = '';
  }

  // //选择医院
@@ -1334,14 +1064,14 @@
    const row = event.detail.row;
    this.chooseHospitalId = row.Id;
    this.chooseHospital = row.Name;
    console.log("row.Id:" + row.Id);
    console.log("row.Name:" + row.Name);
      console.log('row.Id:'+row.Id);
      console.log('row.Name:'+row.Name);
    this.confirmHospital();
  }

  //确认选择医院
  confirmHospital() {
    if (this.chooseHospital != "" && this.chooseHospital != null) {
      if(this.chooseHospital != '' && this.chooseHospital != null){
      this.hospitalId = this.chooseHospitalId;
      this.tempidHp = this.chooseHospitalId;
      this.hospitalName = this.chooseHospital;
@@ -1349,12 +1079,12 @@
      //消除警告
      var arr = [];
      for (var i in this.warningMsgs) {
        if (this.warningMsgs[i] != "请选择医院") {
            if(this.warningMsgs[i] != '请选择医院'){
          arr.push(this.warningMsgs[i]);
        }
      }
      this.warningMsgs = arr;
      if (this.tempidHp != "tempId" && this.tempidHp != "") {
         if(this.tempidHp != 'tempId' && this.tempidHp != ''){
        searchorderdetails({
          methodTypeStr: this.pageType,
          accountIdStr: this.accountid,
@@ -1364,86 +1094,77 @@
          accountNameStr: this.accountName,
          proLimitAndDateList: this.proLimitAndDate,
          editAbleStr: this.editAble
        })
          .then((result) => {
            if (result.result == "Success") {
              this.consumableorderdetailsRecordsview =
                result.consumableorderdetailsRecordsview;
            }).then(result=>{
               if(result.result == 'Success'){
                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
              this.currentPage = 1;
              this.currentRecord = [];
              this.showCurrentReocrd();
              this.getAllChecked();
              this.showMyToast("搜索成功", result.errorMsg, "success");
                  this.showMyToast('搜索成功',result.errorMsg,'success');
            } else {
              console.log("Error:" + result.errorMsg);
              if (result.errorMsg == "没有搜索到相关数据") {
                this.showMyToast(result.errorMsg, "", "error");
                  if(result.errorMsg == '没有搜索到相关数据'){
                     this.showMyToast(result.errorMsg,'','error');
              } else {
                this.showMyToast("搜索产品失败", result.errorMsg, "error");
                     this.showMyToast('搜索产品失败',result.errorMsg,'error');
              }
            }
          })
          .catch((error) => {
            .catch(error=>{
            console.log("Error:" + error);
            this.showMyToast("搜索产品失败", error, "error");
          });
        this.tempidHp = "tempId";
               this.showMyToast('搜索产品失败',error,'error');
            })
            this.tempidHp = 'tempId';
      }
    } else {
      this.showMyToast("请选择医院", "", "error");
         this.showMyToast('请选择医院','','error');
    }
  }

  //打开合同检索弹窗并初始化
  showSearchCon() {
    initContract({ ctype: this.agencyProType1 })
      .then((result) => {
        if (result.result == "Success") {
      .then(result=>{
         if(result.result == 'Success'){
          this.showConPop = true;
          this.contractList = result.attList;
          for (var i in this.contractList) {
            if (this.contractList[i].State_Master__c) {
              this.contractList[i]["StateMaster"] =
                this.contractList[i].State_Master__r.Name;
                  this.contractList[i]['StateMaster'] = this.contractList[i].State_Master__r.Name;
            }
          }
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("初始化检索合同页面失败", result.errorMsg, "error");
            this.showMyToast('初始化检索合同页面失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
      .catch(error=>{
        console.log("Error:" + error);
        this.showMyToast("初始化检索合同页面失败", error, "error");
      });
         this.showMyToast('初始化检索合同页面失败',error,'error');
      })
  }

  //检索合同
  searchCon() {
    searchContract({
      searchName: this.searchNameCon,
      accountId: this.accountid,
      ctype: this.agencyProType1,
      OSHFLGStr: this.OSHFLG
    })
      .then((result) => {
        if (result.result == "Success") {
      searchContract({searchName:this.searchNameCon, accountId:this.accountid, ctype:this.agencyProType1,OSHFLGStr : this.OSHFLG})
      .then(result=>{
         if(result.result == 'Success'){
          this.contractList = result.attList;
          for (var i in this.contractList) {
            if (this.contractList[i].State_Master__c) {
              this.contractList[i]["StateMaster"] =
                this.contractList[i].State_Master__r.Name;
                  this.contractList[i]['StateMaster'] = this.contractList[i].State_Master__r.Name;
            }
          }
        } else {
          console.log("Error:" + result.errorMsg);
          this.showMyToast("搜索失败", result.errorMsg, "error");
            this.showMyToast('搜索失败',result.errorMsg,'error');
        }
      })
      .catch((error) => {
      .catch(error=>{
        console.log("Error:" + error);
        this.showMyToast("搜索失败", error, "error");
      });
         this.showMyToast('搜索失败',error,'error');
      })
  }

  searchNameConChange(event) {
@@ -1453,8 +1174,8 @@
  //关闭弹窗
  closeContractPop() {
    this.showConPop = false;
    this.chooseContract = "";
    this.chooseContractId = "";
      this.chooseContract = '';
      this.chooseContractId = '';
  }

  //选择合同
@@ -1470,24 +1191,19 @@
    const row = event.detail.row;
    this.chooseContractId = row.Id;
    this.chooseContract = row.Name;
    console.log("row.Id:" + row.Id);
    console.log("row.Name:" + row.Name);
      console.log('row.Id:'+row.Id);
      console.log('row.Name:'+row.Name);
    this.confirmContract();
  }

  //确认选择合同
  confirmContract() {
    if (this.chooseContract != "" && this.chooseContract != null) {
      if(this.chooseContract != '' && this.chooseContract != null){
      this.contractId = this.chooseContractId;
      this.tempidPp = this.chooseContractId;
      this.contractName = this.chooseContract;
      this.closeContractPop();
      if (
        this.tempidPp != "tempId" &&
        this.tempidPp != "" &&
        this.contractId != "" &&
        this.pageType == "promotionorder"
      ) {
         if(this.tempidPp != 'tempId' && this.tempidPp != '' && this.contractId != '' && this.pageType == 'promotionorder'){
        searchorderdetails({
          methodTypeStr: this.pageType,
          accountIdStr: this.accountid,
@@ -1497,54 +1213,50 @@
          accountNameStr: this.accountName,
          proLimitAndDateList: this.proLimitAndDate,
          editAbleStr: this.editAble
        })
          .then((result) => {
            if (result.result == "Success") {
              this.consumableorderdetailsRecordsview =
                result.consumableorderdetailsRecordsview;
            }).then(result=>{
               if(result.result == 'Success'){
                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
              this.currentPage = 1;
              this.currentRecord = [];
              this.showCurrentReocrd();
              this.getAllChecked();
              this.showMyToast("搜索成功", result.errorMsg, "success");
                  this.showMyToast('搜索成功',result.errorMsg,'success');
            } else {
              console.log("Error:" + result.errorMsg);
              if (result.errorMsg == "没有搜索到相关数据") {
                this.showMyToast(result.errorMsg, "", "error");
                  if(result.errorMsg == '没有搜索到相关数据'){
                     this.showMyToast(result.errorMsg,'','error');
              } else {
                this.showMyToast("搜索产品失败", result.errorMsg, "error");
                     this.showMyToast('搜索产品失败',result.errorMsg,'error');
              }
            }
          })
          .catch((error) => {
            .catch(error=>{
            console.log("Error:" + error);
            this.showMyToast("搜索产品失败", error, "error");
          });
        this.tempidPp = "tempId";
               this.showMyToast('搜索产品失败',error,'error');
            })
            this.tempidPp = 'tempId';
      }
    } else {
      this.showMyToast("请选择合同", "", "error");
         this.showMyToast('请选择合同','','error');
    }
  }

  showMyToast(title, message, variant) {
    console.log("show custom message");
    var iconName = "";
    var content = "";
    if (variant == "success") {
      iconName = "utility:check";
      console.log('show custom message');
      var iconName = '';
      var content = '';
      if(variant == 'success'){
         iconName = 'utility:check';
    } else {
      iconName = "utility:error";
         iconName = 'utility:error';
    }
    if (message != "") {
      content =
        "<h2><strong>" + title + "<strong/></h2><h5>" + message + "</h5>";
      if(message != ''){
         content = '<h2><strong>'+title+'<strong/></h2><h5>'+message+'</h5>';
    } else {
      content = "<h2><strong>" + title + "<strong/></h2>";
         content = '<h2><strong>'+title+'<strong/></h2>';
    }
    this.template
      .querySelector("c-common-toast")
      .showToast(variant, content, iconName, 10000);
      this.template.querySelector('c-common-toast').
      showToast(variant,content,iconName,10000);
    // var mode;
    // if(this.isNoteStay){
    //     mode ='sticky';
@@ -1564,11 +1276,8 @@
  showCurrentReocrd() {
    var startIndex = 0;
    var endIndex = 0;
    console.log("len:" + this.consumableorderdetailsRecordsview.length);
    if (
      this.consumableorderdetailsRecordsview != null &&
      this.consumableorderdetailsRecordsview.length > 0
    ) {
      console.log('len:'+this.consumableorderdetailsRecordsview.length);
      if(this.consumableorderdetailsRecordsview != null && this.consumableorderdetailsRecordsview.length > 0){
      var currentRecord = [];
      var currentCount = 0;
      var mu = this.consumableorderdetailsRecordsview.length % this.pageSize;
@@ -1581,14 +1290,14 @@
      } else {
        currentCount = this.pageSize;
      }
      console.log("this.totalPage:" + this.totalPage);
      console.log("this.pageSize:" + this.pageSize);
      console.log("mu:" + mu);
      console.log("currentCount:" + currentCount);
         console.log('this.totalPage:'+this.totalPage);
         console.log('this.pageSize:'+this.pageSize);
         console.log('mu:'+mu);
         console.log('currentCount:'+currentCount);
      startIndex = (this.currentPage - 1) * this.pageSize;
      endIndex = parseInt(startIndex) + parseInt(currentCount) - 1;
      console.log("startIndex:" + startIndex);
      console.log("endIndex:" + endIndex);
         console.log('startIndex:'+startIndex);
         console.log('endIndex:'+endIndex);
      if (this.editAble) {
        for (var i in this.currentRecord) {
          if (this.currentRecord[i].check) {
@@ -1599,10 +1308,7 @@
      for (var i = startIndex; i <= endIndex; i++) {
        var count = 0;
        for (var j in this.currentRecord) {
          if (
            this.consumableorderdetailsRecordsview[i].recordId ==
            this.currentRecord[j].recordId
          ) {
               if(this.consumableorderdetailsRecordsview[i].recordId == this.currentRecord[j].recordId){
            count++;
          }
        }
@@ -1629,15 +1335,9 @@

  get totalPage() {
    if (this.consumableorderdetailsRecordsview.length % this.pageSize == 0) {
      return Math.trunc(
        this.consumableorderdetailsRecordsview.length / this.pageSize
      );
         return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize);
    } else {
      return (
        Math.trunc(
          this.consumableorderdetailsRecordsview.length / this.pageSize
        ) + 1
      );
         return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize) + 1;
    }
  }

@@ -1671,7 +1371,7 @@

  //page size change
  pageSizeChange(event) {
    console.log("pagesize:" + event.detail);
      console.log('pagesize:'+event.detail);
    this.pageSize = event.detail;
    this.currentPage = 1;
    this.currentRecord = [];

 force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.html

@@ -1,11 +1,10 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
    <c-common-toast></c-common-toast>
    <template if:true={isShowSpinner}>
        <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
    </template>

    <c-common-toast></c-common-toast>
    <template if:false={isShowAccountInfo}>
        <div class="outerBorderCss">
            <div style="padding: 5px">
@@ -95,7 +94,7 @@
                                <lightning-datatable key-field="id" data={pageRecords} columns={columns}
                                    hide-checkbox-column default-sort-direction={defaultSortDirection}
                                    sorted-direction={sortDirection} sorted-by={sortedBy} onsort={onHandleSort}
                                    class="wrapped-header-datatable">
                                    class="wrapped-header-datatable grayBackground">
                                </lightning-datatable>
                                <c-paginator onprevious={handlePrevious} onnext={handleNext}
                                    onpageschange={handlePageschange} onfirst={handleFirst} onlast={handleLast}
@@ -233,10 +232,10 @@
                                    <lightning-layout-item size="1">
                                    </lightning-layout-item>
                                    <lightning-layout-item size="4">
                                        <lightning-input type="text" label="OCSM分类(医院)"
                                        <!-- <lightning-input type="text" label="OCSM分类(医院)"
                                            value={accountDataInfo.oCMCategory} variant="label-inline" read-only style="
                                                border-bottom: 1px solid #dde4e9;
                                            "></lightning-input>
                                            "></lightning-input> -->
                                    </lightning-layout-item>
                                    <lightning-layout-item size="1">
                                    </lightning-layout-item>
@@ -381,4 +380,5 @@
            </div>
        </div>
    </template>
    
</template>

 force-app/main/default/lwc/lexConsumableAccount/lexConsumableAccount.js

@@ -14,34 +14,40 @@
        fieldName: "NameUrl",
        hideDefaultActions: true,
        wrapText: true,
        initialWidth: 345,
        initialWidth: 200,
        sortable: true,
        type: "url",
        typeAttributes: {
            label: {
                fieldName: "Name",
            },
            target:"_blank"
        },
    },
    // {
    //     label: "省",
    //     fieldName: "StateMasterUrl",
    //     hideDefaultActions: true,
    //     wrapText: true,
    //     sortable: true,
    //     type: "url",
    //     typeAttributes: {
    //         label: {
    //             fieldName: "StateMasterName",
    //         },
    //         target: "_blank",
    //     },
    // },
    {
        label: "省",
        fieldName: "StateMasterUrl",
        fieldName: "StateMasterName",
        hideDefaultActions: true,
        initialWidth: 80,
        wrapText: true,
        sortable: true,
        type: "url",
        typeAttributes: {
            label: {
                fieldName: "StateMasterName",
            },
            target: "_blank",
        },
    },
    {
        label: "销售本部医院",
        fieldName: "Salesdepartment_HP__c",
        initialWidth: 115,
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
@@ -59,7 +65,6 @@
            month: "numeric",
            year: "numeric",
        },
        initialWidth: 100,
    },
    {
        label: "有效/无效",
@@ -67,45 +72,49 @@
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
        initialWidth: 91,
    },
    {
        label: "客户记录类型",
        fieldName: "RecordTypeName",
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
        initialWidth: 130,
    },
    // {
    //     label: "客户记录类型",
    //     fieldName: "RecordTypeName",
    //     hideDefaultActions: true,
    //     sortable: true,
    //     wrapText: true,
    //     initialWidth: 130,
    // },
    {
        label: "政府等级",
        fieldName: "Grade__c",
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
        initialWidth: 86,
    },
    {
        label: "OCSM分类(医院)",
        fieldName: "OCM_Category__c",
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
        initialWidth: 150,
    },
    // {
    //     label: "OCSM分类(医院)",
    //     fieldName: "OCM_Category__c",
    //     hideDefaultActions: true,
    //     sortable: true,
    //     wrapText: true,
    // },
    // {
    //     label: "市",
    //     fieldName: "CityMasterNameUrl",
    //     hideDefaultActions: true,
    //     sortable: true,
    //     wrapText: true,
    //     type: "url",
    //     typeAttributes: {
    //         label: {
    //             fieldName: "CityMasterName",
    //         },
    //         target: "_blank",
    //     },
    // },
    {
        label: "市",
        fieldName: "CityMasterNameUrl",
        fieldName: "CityMasterName",
        hideDefaultActions: true,
        sortable: true,
        wrapText: true,
        type: "url",
        typeAttributes: {
            label: {
                fieldName: "CityMasterName",
            },
            target: "_blank",
        },
    },
    {
        label: "县/区",
@@ -126,28 +135,33 @@
const topColumns = [
    {
        label: "客户名",
        fieldName: "NameUrl",
        hideDefaultActions: true,
        fieldName : "accountName",
        wrapText: true,
        type: "url",
        type: "customShowAccountUrl",
        typeAttributes: {
            label: {
                fieldName: "Name",
            accountName: { fieldName: "accountName" },
            accountUrl: { fieldName: "accountUrl" },
            isDisable: { fieldName: "isDisable" },
            },
        },
    },
    // {
    //     label: "市",
    //     fieldName: "CityMasterName",
    //     hideDefaultActions: true,
    //     wrapText: true,
    //     type: "customShowAccountUrl",
    //     typeAttributes: {
    //         accountName: { fieldName: "CityMasterName" },
    //         accountUrl: { fieldName: "CityMasterNameUrl" },
    //         isDisable: { fieldName: "isDisable" },
    //     },
    // },
    {
        label: "市",
        fieldName: "CityMasterNameUrl",
        fieldName: "CityMasterName",
        hideDefaultActions: true,
        wrapText: true,
        type: "url",
        typeAttributes: {
            label: {
                fieldName: "CityMasterName",
            },
            target: "_blank",
        },
    },
    {
        label: "县/区",
@@ -179,7 +193,7 @@
export default class LexConsumableAccount extends LightningElement {
    columns = columns;
    topColumns = topColumns;
    @track isShowSpinner = true;
    @track isShowSpinner = false;
    @track pageRecords = [];
    @track accountId = "";
    @track agencyProType = "";
@@ -189,14 +203,14 @@
            label: "01. åŒ»é™¢_Hospital",
            value: "01. åŒ»é™¢_Hospital",
        },
        {
            label: "61. åŒ»é™¢_Hospital草案中的医院",
            value: "61. åŒ»é™¢_Hospital草案中的医院",
        },
        {
            label: "62. åŒ»é™¢_Hospital申请中的医院",
            value: "62. åŒ»é™¢_Hospital申请中的医院",
        },
        // {
        //     label: "61. åŒ»é™¢_Hospital草案中的医院",
        //     value: "61. åŒ»é™¢_Hospital草案中的医院",
        // },
        // {
        //     label: "62. åŒ»é™¢_Hospital申请中的医院",
        //     value: "62. åŒ»é™¢_Hospital申请中的医院",
        // },
        {
            label: "63. åŒ»é™¢_Hospital上周创建的医院",
            value: "63. åŒ»é™¢_Hospital上周创建的医院",
@@ -291,6 +305,7 @@
    }

    connectedCallback() {
        this.isShowSpinner = true;
        this.AccId = this.getQueryString("AccId");
        this.AccId = this.AccId == null ? "" : this.AccId;
        if (this.AccId != "") {
@@ -301,41 +316,29 @@
                r = JSON.parse(JSON.stringify(r));
                console.log("r = " + JSON.stringify(r));
                if (r.status == "Success") {
                    console.log('r.entity.obj = ' + JSON.stringify(r.entity.obj))
                    this.accountDataInfo.name = r.entity.obj.Name;
                    this.accountDataInfo.ownerName =
                        r.entity.obj.Owner == null ? "" : r.entity.obj.Owner.Name;
                    this.accountDataInfo.ownerName = r.entity.obj.Owner == null ? "" : r.entity.obj.Owner.Name;
                    this.accountDataInfo.site = r.entity.obj.site;
                    this.accountDataInfo.isActive = r.entity.obj.Is_Active__c;
                    this.accountDataInfo.aliasName2 = r.entity.obj.Alias_Name2__c;
                    this.accountDataInfo.banOnUseReason =
                        r.entity.obj.Ban_On_Use_Reason__c;
                    this.accountDataInfo.banOnUseReason = r.entity.obj.Ban_On_Use_Reason__c;
                    this.accountDataInfo.grade = r.entity.obj.Grade__c;
                    this.accountDataInfo.attributeType = r.entity.obj.Attribute_Type__c;
                    this.accountDataInfo.oCMCategory = r.entity.obj.OCM_Category__c;
                    this.accountDataInfo.specialityType =
                        r.entity.obj.Speciality_Type__c;
                    this.accountDataInfo.stateMasterName =
                        r.entity.obj.State_Master__r == null
                            ? ""
                            : r.entity.obj.State_Master__r.Name;
                    this.accountDataInfo.specialityType = r.entity.obj.Speciality_Type__c;
                    this.accountDataInfo.stateMasterName = r.entity.obj.State_Master__r == null ? "" : r.entity.obj.State_Master__r.Name;
                    this.accountDataInfo.phone = r.entity.obj.Phone;
                    this.accountDataInfo.cityMasterName =
                        r.entity.obj.City_Master__r == null
                            ? ""
                            : r.entity.obj.City_Master__r.Name;
                    this.accountDataInfo.cityMasterName = r.entity.obj.City_Master__r == null ? "" : r.entity.obj.City_Master__r.Name;
                    this.accountDataInfo.phoneCall = r.entity.obj.PhoneCall__c;
                    this.accountDataInfo.town = r.entity.obj.Town__c;
                    this.accountDataInfo.fax = r.entity.obj.Fax;
                    this.accountDataInfo.street = r.entity.obj.Street__c;
                    this.accountDataInfo.postalCode = r.entity.obj.Postal_Code__c;
                    this.accountDataInfo.address = r.entity.obj.Address__c;
                    this.accountDataInfo.parentName =
                        r.entity.obj.Parent == null ? "" : r.entity.obj.Parent.Name;
                    console.log(
                        "this.accountDataInfo = " + JSON.stringify(this.accountDataInfo)
                    );
                    this.printUrl =
                        "/lexconsumableaccountinfoprint?AccId=" + this.AccId;
                    this.accountDataInfo.parentName = r.entity.obj.Parent == null ? "" : r.entity.obj.Parent.Name;
                    console.log('this.accountDataInfo = ' + JSON.stringify(this.accountDataInfo))
                    this.printUrl = "/lexconsumableaccountinfoprint?AccId=" + this.AccId;
                    this.isShowAccountInfo = true;
                    this.isShowSpinner = false;
                } else {
@@ -372,7 +375,8 @@
                    this.agencyProTypestr = r.entity.agencyProTypestr;
                    console.log("this.agencyProTypestr = " + this.agencyProTypestr);
                    for (var i in this.pageRecords) {
                        this.pageRecords[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
                        this.pageRecords[i]["Is_Active__c"] = this.pageRecords[i].Is_Active__c.replace('効','效');
                        this.pageRecords[i]["NameUrl"] = "/s/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
                        this.pageRecords[i]["StateMasterName"] = this.pageRecords[i].State_Master__r.Name;
                        this.pageRecords[i]["StateMasterUrl"] = "/" + this.pageRecords[i].State_Master__c;
                        this.pageRecords[i]["CityMasterName"] = this.pageRecords[i].City_Master__r.Name;
@@ -393,9 +397,12 @@
                    );
                    console.log('9/3 = ' + this.keepTwoDecimalStr(this.amend(9, 3, '/').toFixed(2)));
                    let total = 100;
                    try {
                    for (var i in this.topAccountData) {
                        console.log('i = ' + i);
                        this.topAccountData[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
                            this.topAccountData[i]["accountName"] = this.topAccountData[i].Name;
                            this.topAccountData[i]["accountUrl"] = "/s/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
                            this.topAccountData[i]["isDisable"] = false;
                        this.topAccountData[i]["StateMasterName"] = this.topAccountData[i].State_Master__r.Name;
                        this.topAccountData[i]["StateMasterUrl"] = "/" + this.topAccountData[i].State_Master__c;
                        this.topAccountData[i]["CityMasterName"] = this.topAccountData[i].City_Master__r.Name;
@@ -407,11 +414,14 @@
                        this.topAccountData[i]["proportion"] = number + '%';
                    }

                    // //其他
                        console.log('this.topAccountData = ' + JSON.stringify(this.topAccountData));

                        //其他
                    if (total != 100) {
                        this.topAccountData.push({
                            Name: '...',
                            NameUrl: '/lexconsumableaccount',
                                accountName: '...',
                                accountUrl: '/s/lexconsumableaccount',
                                isDisable: true,
                            proportion: total.toFixed(2) + '%',
                            CityMasterName: '...',
                            CityMasterNameUrl: '/lexconsumableaccount',
@@ -427,6 +437,10 @@
                        this.showMyToast(title, '无数据', 'Error');
                    }
                    this.isShowSpinner = false;
                    } catch (error) {
                        console.log('error = ' + error.message)
                    }

                } else {
                    console.log("r = " + JSON.stringify(r));
                    this.showMyToast('Error', r.msg, 'Error');
@@ -525,7 +539,9 @@
                let total = 100;
                for (var i in this.topAccountData) {
                    console.log('i = ' + i);
                    this.topAccountData[i]["NameUrl"] = "/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
                    this.topAccountData[i]["accountName"] = this.topAccountData[i].Name;
                    this.topAccountData[i]["accountUrl"] = "/s/lexconsumableaccount?AccId=" + this.topAccountData[i].Id;
                    this.topAccountData[i]["isDisable"] = false;
                    this.topAccountData[i]["StateMasterName"] = this.topAccountData[i].State_Master__r.Name;
                    this.topAccountData[i]["StateMasterUrl"] = "/" + this.topAccountData[i].State_Master__c;
                    this.topAccountData[i]["CityMasterName"] = this.topAccountData[i].City_Master__r.Name;
@@ -540,8 +556,9 @@
                // //其他
                if (total != 100) {
                    this.topAccountData.push({
                        Name: '...',
                        NameUrl: '/lexconsumableaccount',
                        accountName: '...',
                        accountUrl: '/s/lexconsumableaccount',
                        isDisable: true,
                        proportion: total.toFixed(2) + '%',
                        CityMasterName: '...',
                        CityMasterNameUrl: '/lexconsumableaccount',
@@ -597,18 +614,13 @@
                    this.pageRecords = r.entity.pageRecords;
                    console.log("this.pageRecords = " + JSON.stringify(this.pageRecords));
                    for (var i in this.pageRecords) {
                        this.pageRecords[i]["NameUrl"] =
                            "/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
                        this.pageRecords[i]["StateMasterName"] =
                            this.pageRecords[i].State_Master__r.Name;
                        this.pageRecords[i]["StateMasterUrl"] =
                            "/" + this.pageRecords[i].State_Master__c;
                        this.pageRecords[i]["CityMasterName"] =
                            this.pageRecords[i].City_Master__r.Name;
                        this.pageRecords[i]["CityMasterNameUrl"] =
                            "/" + this.pageRecords[i].City_Master__c;
                        this.pageRecords[i]["RecordTypeName"] =
                            this.pageRecords[i].RecordType.Name;
                        this.pageRecords[i]["Is_Active__c"] = this.pageRecords[i].Is_Active__c.replace('効','效');
                        this.pageRecords[i]["NameUrl"] = "/s/lexconsumableaccount?AccId=" + this.pageRecords[i].Id;
                        this.pageRecords[i]["StateMasterName"] = this.pageRecords[i].State_Master__r.Name;
                        this.pageRecords[i]["StateMasterUrl"] = "/" + this.pageRecords[i].State_Master__c;
                        this.pageRecords[i]["CityMasterName"] = this.pageRecords[i].City_Master__r.Name;
                        this.pageRecords[i]["CityMasterNameUrl"] = "/" + this.pageRecords[i].City_Master__c;
                        this.pageRecords[i]["RecordTypeName"] = this.pageRecords[i].RecordType.Name;
                    }
                    this.isShowSpinner = false;
                } else {

 force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html

@@ -38,29 +38,34 @@
                                    <td style="width:122px;">
                                        <div style="color:#696969;font-size:16px;">消耗品订单名称</div>
                                    </td>
                                    <td style="width: 200px;">
                                    <td >
                                        <lightning-input class="inputFont" type="text" label="消耗品订单名称" value={category1} variant="label-hidden" onchange={category1Change}></lightning-input>
                                    </td>
                                    <td style="width:30px;"></td>
                                    <td style="width: 74px;">
                                        <div style="color:#696969;font-size:16px;">订单日期</div>
                                    </td>
                                    <td style="width: 200px;">
                                    <td >
                                        <lightning-input class="inputFont" type="date" name="orderDate" value={orderDate} label="订单日期" variant="label-hidden"  onchange={orderDateChange}></lightning-input>
                                    </td>
                                    <td style="width:30px;"></td>
                                    <td style="width: 74px;">
                                        <div style="color:#696969;font-size:16px;">订单状态</div>
                                    </td>
                                    <td style="width: 200px;">
                                    <td style="width: 250px;">
                                        <lightning-combobox class="inputFont" name="orderStatus" label="订单状态" value={orderStatus} placeholder="请选择..." options={provinceOpts} variant="label-hidden"  onchange={orderStatusChange}></lightning-combobox>
                                    </td>
                                    <td style="width: 30px;"></td>
                                    <td style="width: 400;">
                                        <!-- <lightning-button style="margin: 5px;" label="搜索" onclick={searchProduct}></lightning-button>
                                        <lightning-button style="margin: 5px;" label="清空" onclick={clear}></lightning-button> -->
                                        <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 30px;height:32px;" onclick={searchProduct}>搜索</button>
                                        <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;" onclick={clear}>清空</button>
                                </tr>
                            </tbody>
                        </table>
                        <p style="height:10px;"></p>
                        <table>
                            <tbody>
                                <tr>
                                    <td></td>
                                    <td style="width:325px;">
                                        <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" style="margin-right: 20px;height:32px;width: 150px;" onclick={searchProduct}>搜索</button>
                                        <button class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" style="height:32px;width: 150px;" onclick={clear}>清空</button>
                                    </td>
                                </tr>
                            </tbody>

 force-app/main/default/lwc/lexCustomDiffReasonComp/lexCustomDiffReasonComp.html

@@ -1,5 +1,6 @@
<template>
    <lightning-input
    style="width:90%;"
    variant="label-hidden"
    type='text'
    value = {DiffReason}

 force-app/main/default/lwc/lexCustomLightningDatatable/customMyDrCheckBox.html

New file
@@ -0,0 +1,10 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
    <c-custom-mydr-comp
        record-id={typeAttributes.recordId}
        is-checked-my-dr={typeAttributes.isCheckedMyDr}
        onunitchange={handleDataChange}
    >
    </c-custom-mydr-comp>
</template>

 force-app/main/default/lwc/lexCustomLightningDatatable/customShipmentNumber.html

@@ -3,6 +3,8 @@
    style="border-color: red;"
    record-id={typeAttributes.recordId}
    shipment-number={typeAttributes.shipmentNumber}
    is-coninvoice={typeAttributes.isConinvoice}
    esd-invoice-pro-not-count={typeAttributes.esdInvoiceProNotCount}
    >

    </c-custom-shipment-number-comp>

 force-app/main/default/lwc/lexCustomLightningDatatable/customaccountUrl.html

New file
@@ -0,0 +1,10 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
    <c-custom-account-url-comp
        account-name={typeAttributes.accountName}
        account-url={typeAttributes.accountUrl}
        is-disable={typeAttributes.isDisable}
    >
    </c-custom-account-url-comp>
</template>

 force-app/main/default/lwc/lexCustomLightningDatatable/customdeleteReason.html

New file
@@ -0,0 +1,8 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
    <c-custom-delete-reason-comp
        record-id={typeAttributes.recordId}
    >
    </c-custom-delete-reason-comp>
</template>

 force-app/main/default/lwc/lexCustomLightningDatatable/lexCustomLightningDatatable.js

@@ -13,6 +13,9 @@
import customOutboundCountTemplate from './customOutboundCount.html';
import customWeeklyReportTemplate from './customWeeklyReport.html';
import customAgencyOppInputTemplate from './customAgencyOppInput.html';
import customMyDrCheckBoxTemplate from './customMyDrCheckBox.html';
import customdeleteReasonTemplate from './customdeleteReason.html';
import customAccountUrlTemplate from './customaccountUrl.html';
import { loadStyle} from 'lightning/platformResourceLoader';
import LexCustomDataTable from '@salesforce/resourceUrl/LexCustomDataTable';

@@ -24,7 +27,7 @@
        },
        customShipment: {
            template: customShipmentNumberTemplate,
            typeAttributes: ['shipmentNumber','recordId'],
            typeAttributes: ['shipmentNumber','recordId','isConinvoice','esdInvoiceProNotCount'],
        },
        customShipmentUnitPrice: {
            template: customShippingUnitPriceTemplate,
@@ -73,6 +76,18 @@
        agencyOppInput:{
            template: customAgencyOppInputTemplate,
            typeAttributes:['inputValue','recordId','fieldName','showType'],
        },
        MyDrCheckBox:{
            template: customMyDrCheckBoxTemplate,
            typeAttributes:['recordId','isCheckedMyDr'],
        },
        deleteReason:{
            template: customdeleteReasonTemplate,
            typeAttributes:['recordId'],
        },
        customShowAccountUrl:{
            template: customAccountUrlTemplate,
            typeAttributes:['accountName','accountUrl','isDisable'],
        }
    };
    constructor() {

 force-app/main/default/lwc/lexInventory/lexInventory.html

@@ -108,7 +108,7 @@
                    <!-- <template if:true={showTable}> -->
                    <div style="padding:10px;">
                        <lightning-datatable key-field="id" data={pageCodeRecords} columns={column}
                            hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable">
                            hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable"  style="word-wrap:break-word; word-break:break-all; ">
                        </lightning-datatable>
                        <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
                            onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}

 force-app/main/default/lwc/lexInventory/lexInventory.js

@@ -112,6 +112,7 @@
        fieldName: "Name__c",
        wrapText: true,
        hideDefaultActions: true,
        // initialWidth: 550
    },
    {
        label: "单位",
@@ -125,13 +126,14 @@
        fieldName: "Bar_Code__c",
        hideDefaultActions: true,
        wrapText: true,
        initialWidth: 500,
        // initialWidth: 300,
    },
    {
        label: "调整原因",
        fieldName: "DiffReason",
        hideDefaultActions: true,
        wrapText: true,
        // initialWidth: 
        
    },
];
@@ -272,7 +274,7 @@
    @track isSummonsFlag;
    //展开栏
    activeSections = ["dataExpand"];
    columnHeader = ["消耗品名称", "单位", "barCode", "调整原因"];
    columnHeader = ["消耗品名称", "单位", "BarCode", "调整原因"];
    //确认一览
    @track eSetId = "";
    @track EditAble = false;
@@ -521,17 +523,17 @@
    getSelectedRows(event) {
            let selectedRowsEvent = event.detail.selectedRows;
            this.selectedRows = [];
            for (var i in selectedRowsEvent) {
                this.selectedRows.push(selectedRowsEvent[i].ProdId+this.data[i]["boxPiece"]);
            for (var i in this.data) {
                for (var j in selectedRowsEvent) {
                    if (this.data[i].ProdId+this.data[i]["boxPiece"] == selectedRowsEvent[j].ProdId+ selectedRowsEvent[j]["boxPiece"]) {
                        this.selectedRows.push(selectedRowsEvent[j].ProdId+this.data[i]["boxPiece"])
            }
        const selectedRows = event.detail.selectedRows;
        console.log("this.selectedRows = " + JSON.stringify(selectedRows));
        for (var i in selectedRows) {
            this.selectedRows.push(selectedRows[i].ProdId+this.data[i]["boxPiece"]);
        }

            // for (var i in selectedRowsEvent) {
            //     this.selectedRows.push(selectedRowsEvent[i].ProdId+this.data[i]["boxPiece"]);
            // }
    }

    }
    //导出为csv
    exportData() {
        // Prepare a html table
@@ -539,23 +541,25 @@
        // Add styles for the table
        doc += '<style>';
        doc += 'table, th, td {';
        doc += '    border: 1px solid black;';
        doc += '    border: 1px solid;';
        doc += '    border-collapse: collapse;';
        doc += '    font-weight: normal;';
        doc += '    text-align: left;';
        doc += '}';
        doc += '</style>';
        // Add all the Table Headers
        doc += '<tr>';
        this.columnHeader.forEach(element => {
            doc += '<th>' + element + '</th>'
            doc += '<th style="font-weight: bold";>' + element + '</th>'
        });
        doc += '</tr>';
        // Add the data rows
        this.codPageRecords.forEach(record => {
            doc += '<tr>';
            doc += '<th>' + record.Name__c + '</th>';
            doc += '<th>' + record.Box_Piece__c + '</th>';
            doc += '<th>' + record.Bar_Code__c + '</th>';
            doc += '<th>' + record.DiffReason + '</th>';
            doc += '<td>' + record.Name__c + '</td>';
            doc += '<td>' + record.Box_Piece__c + '</td>';
            doc += '<td>' + record.Bar_Code__c + '</td>';
            doc += '<td>' + record.DiffReason + '</td>';
            doc += '</tr>';
        });
        doc += '</table>';

 force-app/main/default/lwc/lexLookup/lexLookup.html

@@ -64,12 +64,12 @@
                                                    disable-linkify>
                                                </lightning-formatted-rich-text>
                                            </span>
                                            <span lwc:if={item.result.subtitleFormatted}
                                            <!-- <span lwc:if={item.result.subtitleFormatted}
                                                class="slds-listbox__option-meta slds-listbox__option-meta_entity">
                                                <lightning-formatted-rich-text value={item.result.subtitleFormatted}
                                                    disable-linkify>
                                                </lightning-formatted-rich-text>
                                            </span>
                                            </span> -->
                                        </span>
                                    </div>
                                </li>

 force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.css

New file
@@ -0,0 +1,3 @@
.This{
    
}

 force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.html

New file
@@ -0,0 +1,84 @@
<!-- sldsValidatorIgnore -->
<!-- sldsValidatorIgnore -->
<template>
    <template if:true={isDoctor}>
        <!-- å±•ç¤º -->
        <section role="dialog" tabindex="-1" aria-modal="true" aria-labelledby="modal-heading-01"
            class="slds-modal slds-fade-in-open slds-modal_medium">
            <div class="slds-modal__container">
                <div class="slds-scrollable">
                    <button class="slds-button slds-button_icon slds-modal__close slds-button_icon-inverse">
                        <svg class="slds-button__icon slds-button__icon_large" aria-hidden="true">
                            <use xlink:href="/assets/icons/utility-sprite/svg/symbols.svg#close"></use>
                        </svg>
                        <span class="slds-assistive-text">Cancel and close</span>
                    </button>
                    <div class="slds-modal__header">
                        <h1 id="modal-heading-01" class="slds-modal__title slds-hyphenate">新建客户人员</h1>
                    </div>
                    <div class="slds-modal__content" id="modal-content-id-1">
                        <lightning-card class="slds-text-align_center">
                            <template if:true={isShowSpinner}>
                                <lightning-spinner size="large" alternative-text="Loading"
                                    style="height: 100%;"></lightning-spinner>
                            </template>
                            <lightning-record-edit-form object-api-name={sobjectType} record-type-id={recordTypeId}
                                record-id={recordId} onsubmit={handleSubmit} onsuccess={handleSuccess}
                                onerror={handleError}>
                                <template for:each={layout} for:item="layoutSection">
                                    <lightning-accordion lwc:if={layoutSection.editHeading} class="greyyyy"
                                        active-section-name={sectionName} allow-multiple-sections-open
                                        key={layoutSection.name}>
                                        <lightning-accordion-section name={layoutSection.label}
                                            label={layoutSection.label}>
                                            <lightning-layout multiple-rows="true">
                                                <template for:each={layoutSection.layoutColumns}
                                                    for:item="layoutColumns">
                                                    <lightning-layout-item class="hehe-layoutItem" size="6"
                                                        key={layoutColumns.index}>
                                                        <template for:each={layoutColumns.layoutItems}
                                                            for:item="layoutField">
                                                            <template if:false={layoutField.isDisable}>
                                                                <template if:false={layoutField.isModify}>
                                                                    <lightning-input-field
                                                                        field-name={layoutField.field}
                                                                        value={layoutField.value}
                                                                        required={layoutField.isRequired}
                                                                        data-field={layoutField.field}
                                                                        key={layoutField.field}>
                                                                    </lightning-input-field>
                                                                </template>
                                                                <template if:true={layoutField.isModify}>
                                                                    <lightning-input label={layoutField.fieldLabel}
                                                                        value={layoutField.value}
                                                                        required={layoutField.isRequired}
                                                                        data-field={layoutField.field}
                                                                        variant="label-inline" onchange={dataChange}
                                                                        key={layoutField.field}>
                                                                    </lightning-input>
                                                                </template>
                                                            </template>
                                                        </template>
                                                    </lightning-layout-item>
                                                </template>
                                            </lightning-layout>
                                        </lightning-accordion-section>

                                    </lightning-accordion>
                                </template>
                            </lightning-record-edit-form>
                        </lightning-card>
                    </div>
                </div>
                <div class="slds-modal__footer">
                    <div class="slds-text-align_center">
                        <lightning-button label="保存" type="submit" onsubmit={handleSubmit}
                            class="slds-m-right_x-small"></lightning-button>
                        <lightning-button label="取消" onclick={cancel} class="slds-m-right_x-small"></lightning-button>
                    </div>
                </div>
            </div>
        </section>
    </template>
    <div class="slds-backdrop slds-backdrop_open"></div>
</template>

 force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js

New file
@@ -0,0 +1,425 @@
import { LightningElement, api, track, wire } from 'lwc';
import { CurrentPageReference } from 'lightning/navigation';
import initData from '@salesforce/apex/LexNewAndEditContactPIPLController.initData';
import { NavigationMixin } from 'lightning/navigation';
import { AWSService } from 'c/piUtils';
import { ShowToastEvent } from 'lightning/platformShowToastEvent';

export default class LexNewAndEditContactPIPL extends NavigationMixin(LightningElement) {
    sobjectType = 'Contact';

    @api recordId;
    @track recordTypeId = '';
    @wire(CurrentPageReference) pageRef;
    @track recordData = {};
    @track title = '';
    @track isShowSpinner = true;
    @track layout = [];
    @track isDoctor = true;


    @track staticResource;
    @track staticResourceContact;
    @track piFieldsMap;
    @track abstractData = '';
    @track data = {};
    @track piplData = {};
    @track isNewMode = false;
    @track isCloneMode = false;
    @track isEditMode = false;
    @track sectionName = [];
    @track AWSToSobjectMap = {};
    @track AWSDataId = '';
    @track txId = '';
    @track isShowSearchAccount = false;
    @track hospitalId = '';
    @track contactId = '';
    AWSService;

    @track modifyObj = {};
    modifyArray = ['LastName'];

    connectedCallback() {
        console.log('enter connectedCallback');
        this.AWSService = new AWSService();
        if (!this.recordId || this.isCloneMode) {
            this.title = '新建客户人员';
            this.isNewMode = true;
        }
        if (this.recordId) {
            this.title = '编辑客户人员';
            this.isEditMode = true;
        }
        if (this.pageRef && this.pageRef.state) {
            this.recordTypeId = this.pageRef.state.recordTypeId;
            console.log('this.recordTypeId = ' + this.recordTypeId);
        }
        console.log('recordId = ' + this.recordId + ' recordTypeId = ' + this.recordTypeId + ' sobjectType = ' + this.sobjectType);
        initData({
            rid: this.recordId,
            recordTypeId: this.recordTypeId,
            sobjectType: this.sobjectType
        }).then((r) => {
            r = JSON.parse(JSON.stringify(r));
            if (r.status == 'Success') {
                this.isDoctor = r.entity.isDoctor;
                console.log('this.isDoctor = ' + this.isDoctor);
                if(this.isEditMode){
                    this.recordTypeId = r.entity.recordTypeId;
                }
                console.log('this.recordTypeId = ' + this.recordTypeId);
                debugger
                //如果不是医院类型，使用标准页面
                if (!this.isDoctor) {
                    if(this.isNewMode)
                        this.RedirectStandardNewPage();
                    if(this.isEditMode)
                        this.RedirectStandardEditPage();
                    return
                }
                this.AWSDataId = r.entity.AWSDataId;
                let layout = JSON.parse(r.entity.layout);
                console.log('layout = ' + JSON.stringify(layout));
                console.log('layout = ' + typeof layout);

                let index = 1;
                this.sectionName = layout.map(s => s.label);
                for (let s of layout) {
                    for (let c of s.layoutColumns) {
                        c['index'] = index++;
                        if (c.layoutItems) {
                            for (let item of c.layoutItems) {
                                item['isDisable'] = item.behavior == 'Readonly' ? true : false;
                                item['isRequired'] = item.behavior == 'Required' ? true : false;
                                item['isModify'] = false;
                                if (item['field'] == 'Name') {
                                    item.field = 'LastName';
                                    item.fieldLabel = '姓名'
                                    item['isModify'] = true;
                                    if (this.isEditMode) {
                                        item['value'] = this.recordData.LastName
                                    }
                                }
                            }
                        }
                    }
                }
                this.layout = layout;
                console.log('this.layout = ' + JSON.stringify(this.layout));
                this.AWSToSobjectMap = JSON.parse(JSON.stringify(r.entity.AWSToSobjectNonEncryptedMap));
                this.staticResource = JSON.parse(r.entity.staticResource);
                

                //编辑
                if (this.isEditMode) {
                    //解密客户的加密字段
                    this.querySobjectFromAWS();
                }
                this.isShowSpinner = false;
            } else {
                this.showToast('Error', r.msg);
            }
        })
    }

    querySobjectFromAWS() {
        debugger
        var that = this;
        this.AWSService.query(this.staticResource.queryUrl, this.AWSDataId, function (data) {
            console.log('queryLeadFromAWSIFS data = ' + JSON.stringify(data));
            if (data.object) {
                for (let s of that.layout) {
                    for (let lc of s.layoutColumns) {
                        if(lc.layoutItems){
                            for (let c of lc.layoutItems) {
                                for (let f in that.AWSToSobjectMap) {
                                    if (data.object.hasOwnProperty(f) && c['field'] == that.AWSToSobjectMap[f]) {
                                        c['value'] = data.object[f] == null ? '' : data.object[f];
                                        if (c['field'] == 'LastName') {
                                            that.modifyObj['LastName'] = data.object[f] == null ? '' : data.object[f];
                                        }
                                    }
                                }
                            }
                        }
                    }
                }
                // for (var s of that.layout) {
                //     for (var c of s.layoutFields) {
                //         for (let f in that.AWSToSobjectMap) {
                //             if (data.object.hasOwnProperty(f) && c['fieldAPI'] == that.AWSToSobjectMap[f]) {
                //                 c['value'] = data.object[f] == null ? '' : data.object[f];
                //                 if (c['fieldAPI'] == 'LastName') {
                //                     that.modifyObj['LastName'] = data.object[f] == null ? '' : data.object[f];
                //                 }
                //             }
                //         }
                //     }
                // }
            }
        }, this.staticResource.token)
    }


    dataChange(event) {
        let fieldName = event.target.getAttribute("data-field");
        let value = event.detail.value;
        console.log("fieldName = " + fieldName + " value = " + event.detail.value);
        switch (fieldName) {
            case "LastName":
                this.modifyObj[fieldName] = value;
                break;
        }
    }

    handleSubmit(event) {
        this.isShowSpinner = true;
        //1. Get Sobject Information from Form
        console.log('handleSubmit');
        event.preventDefault();
        const fields = event.detail.fields;
        console.log('this.modifyObj = ' + JSON.stringify(this.modifyObj));
        Object.assign(fields, this.modifyObj);
        console.log('fields = ' + JSON.stringify(fields));

        debugger
        //2. select cannot actively select redaction option
        let validationResultMessage = this.validateFieldValueFormate(fields);
        console.log(validationResultMessage);
        if (validationResultMessage) {
            this.showToast('Error', validationResultMessage);
            return
        }

        //3. Check Required Field
        let checkRequiredFieldMsgResult = this.checkRequiredFieldMsg(fields);
        console.log('checkRequiredFieldMsgResult = ' + checkRequiredFieldMsgResult);
        if (checkRequiredFieldMsgResult != '') {
            this.showToast('Error', checkRequiredFieldMsgResult + '需要进行填写');
            return
        }

        //4. Prepare the payload for New PI API To AWS - To Do
        let payloadForNewPI = this.getPIPayload(fields);
        console.log('payloadForNewPI = ' + payloadForNewPI);

        //5. PI To AWS
        //新建
        if (this.isNewMode) {
            this.NewPIToAWS(payloadForNewPI, fields);
        }
        //编辑
        if (this.isEditMode) {
            this.UpdatePIToAWS(payloadForNewPI, fields);
        }
    }

    //验证字段
    validateFieldValueFormate(fields) {
        let error_msg = '';
        let b = false;
        for (var key in fields) {
            if (fields[key] == "*****")
                b = true;
        }
        if (b)
            error_msg = '下拉框不能主动选择密文选项';
        return error_msg;
    }

    //验证required字段需要进行填写
    checkRequiredFieldMsg(fields) {
        let msg = '';
        try {
            for (let s of this.layout) {
                for (let lc of s.layoutColumns) {
                    if (lc.layoutItems) {
                        for (let c of lc.layoutItems) {
                            if (!c.isDisable && c.isRequired && (fields[c.field] == null || fields[c.field] == '')) {
                                msg += ';' + c.fieldLabel;
                            }
                        }
                    }
                }
            }
        } catch (err) {
            this.showToast('Error',err.message);
        }
        msg = msg.substring(1);
        return msg;
    }

    //获取PI字段
    getPIPayload(sobjJsonLwc) {
        console.log()
        let leadPayloadList = [];
        let leadPIData = {};

        for (let f in this.AWSToSobjectMap) {
            if (sobjJsonLwc.hasOwnProperty(this.AWSToSobjectMap[f])) {
                leadPIData[f] = sobjJsonLwc[this.AWSToSobjectMap[f]]
            }
            else {
                console.log(this.AWSToSobjectMap[f] + 'is not in sobjJsonLwc');
            }
        }

        leadPIData.medicalStaffFullName = leadPIData.lastName;
        leadPIData.sfRecordId = '';
        console.log('Sobject PI Data x :' + leadPIData);
        leadPayloadList.push(leadPIData);
        console.log('leadPayloadList = ' + JSON.stringify(leadPayloadList));
        return JSON.stringify(leadPayloadList);
    }

    //新建保存ToAWS
    NewPIToAWS(payloadForNewPI, fields) {
        this.AWSService.post(this.staticResource.newUrl, payloadForNewPI, (result) => {
            if (result && result.object) {
                console.log('result = ' + JSON.stringify(result));
                for (let f in this.AWSToSobjectMap) {
                    if (result.object[0].hasOwnProperty(f)) {
                        fields[this.AWSToSobjectMap[f]] = result.object[0][f];
                        console.log('this.AWSToSobjectMap[f] = ' + this.AWSToSobjectMap[f]);
                        console.log('fields[this.AWSToSobjectMap[f]] = ' + fields[this.AWSToSobjectMap[f]]);
                    }
                    else {
                        console.log(f + 'is not in result.object[0]');
                    }
                }
                fields['AWS_Data_Id__c'] = result.object[0].dataId;
                this.txId = result.txId;
                //保存到后端
                this.template.querySelector('lightning-record-edit-form').submit(fields);
            } else {
                console.log('result = ' + JSON.stringify(result));
            }
        }, this.staticResource.token);
    }

    //编辑保存ToAWS
    UpdatePIToAWS(payloadForNewPI, fields) {
        let obj = JSON.parse(payloadForNewPI);
        obj[0].dataId = this.AWSDataId;
        let payloadForNewPIJson = JSON.stringify(obj);
        this.AWSService.post(this.staticResource.updateUrl, payloadForNewPIJson, (result) => {
            if (result && result.object) {
                console.log('result = ' + JSON.stringify(result));
                for (let f in this.AWSToSobjectMap) {
                    if (result.object[0].hasOwnProperty(f)) {
                        fields[this.AWSToSobjectMap[f]] = result.object[0][f];
                        console.log('this.AWSToSobjectMap[f] = ' + this.AWSToSobjectMap[f]);
                        console.log('fields[this.AWSToSobjectMap[f]] = ' + fields[this.AWSToSobjectMap[f]]);
                    }
                    else {
                        console.log(f + 'is not in result.object[0]');
                    }
                }
                fields['AWS_Data_Id__c'] = this.AWSDataId;
                this.txId = result.txId;
                console.log('this.txId = ' + this.txId);
                console.log('PI After fields = ' + JSON.stringify(fields));
                if (fields.RecordTypeId) {
                    fields['RecordTypeId'] = fields.RecordTypeId.substring(1, fields.RecordTypeId.length - 1);
                }
                //保存到后端
                console.log('update submit = ' + JSON.stringify(fields));
                this.template.querySelector('lightning-record-edit-form').submit(fields);
            } else {
                console.log('result = ' + JSON.stringify(result));
            }
        }, this.staticResource.token);
    }

    //提交保存成功
    handleSuccess(event) {
        let updatedRecord = event.detail.id;
        console.log('onsuccess: ', updatedRecord);
        console.log('confirmTrans');
        let that = this;
        this.AWSService.confirm(true, updatedRecord, this.txId, this.staticResource.token, this.staticResource.transactionUrl, function (result) {
            console.log('result = ' + JSON.stringify(result))
            that.showToast('Success', '保存成功');
            console.log('updatedRecord = ' + updatedRecord)
            that[NavigationMixin.Navigate]({
                type: 'standard__recordPage',
                attributes: {
                    actionName: "view",
                    recordId: updatedRecord,
                    objectApiName: that.sobjectType
                }
            });
        });
    }

    //提交保存失败
    handleError(event) {
        event.preventDefault();
        event.stopImmediatePropagation();
        this.showToast("Error", event.detail.detail);
        this.AWSService.confirm(false, '', this.txId, this.staticResource.token, this.staticResource.transactionUrl, function (result) {
            console.log('result = ' + JSON.stringify(result))
        });
    }

    //change事件
    dataChange(event) {
        let fieldName = event.target.getAttribute("data-field");
        let value = event.detail.value;
        console.log("fieldName = " + fieldName + " value = " + event.detail.value);
        if (this.modifyArray.indexOf(fieldName) != -1) {
            switch (fieldName) {
                case "LastName":
                    this.modifyObj[fieldName] = value;
                    break;
            }
        }
    }

    //取消
    cancel() {
        console.log('cancel');
        window.history.back();
    }

    //标准新建页面跳转
    RedirectStandardNewPage() {
        this[NavigationMixin.Navigate]({
            type: 'standard__objectPage',
            attributes: {
                objectApiName: 'Contact',
                actionName: 'new'
            },
            state: {
                nooverride: '1',
                recordTypeId: this.recordTypeId
            }
        });
    }

    //标准编辑页面跳转
    RedirectStandardEditPage() {
        this[NavigationMixin.Navigate]({
            type: 'standard__recordPage',
            attributes: {
                objectApiName: 'Contact',
                recordId: this.recordId,
                actionName: 'edit',
            },
            state: {
                nooverride: '1',
            }
        });
    }

    //显示信息
    showToast(type, msg) {
        this.isShowSpinner = false;
        const event = new ShowToastEvent({
            title: type,
            variant: type,
            message: msg
        });
        this.dispatchEvent(event);
    }
}

Diff truncated after the above file
force-app/main/default/lwc/lexNewAndEditContactPIPL/lexNewAndEditContactPIPL.js-meta.xml
force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.js
force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.js
force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.js
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.css
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.js
force-app/main/default/lwc/lexTopPage/lexTopPage.js
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.js
force-app/main/default/networks/Consumable系统.network-meta.xml
force-app/main/default/networks/Partner Sales.network-meta.xml
force-app/main/default/networks/消耗品管理系统.network-meta.xml
force-app/main/default/networks/电子签收系统.network-meta.xml
force-app/main/default/objects/LicenceReminderDate__c/LicenceReminderDate__c.object-meta.xml
force-app/main/default/objects/LicenceReminderDate__c/fields/ReminderDays__c.field-meta.xml
force-app/main/default/objects/NoteStay__c/NoteStay__c.object-meta.xml
force-app/main/default/objects/NoteStay__c/fields/IsStay__c.field-meta.xml
force-app/main/default/sites/Consumable.site-meta.xml
force-app/main/default/sites/Partner_Sales.site-meta.xml
force-app/main/default/sites/Site.site-meta.xml
force-app/main/default/sites/Site2.site-meta.xml
force-app/main/default/sites/extsurvey.site-meta.xml
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger
force-app/main/default/triggers/ConsumableOrderDetail2Trigger.trigger-meta.xml
force-app/main/default/triggers/ConsumableOrderTrigger.trigger
force-app/main/default/triggers/ContentDocumentLink.trigger
force-app/main/default/triggers/ContentDocumentTrigger.trigger
manifest/package.xml