From dcd1d3017647f5f821b12be2328416d7c34617a3 Mon Sep 17 00:00:00 2001
From: buli <137736985@qq.com>
Date: 星期五, 09 六月 2023 11:34:47 +0800
Subject: [PATCH] backup0609

---
 force-app/main/default/experiences/Partner21/views/仪表板関連リスト.json                                        |   45 
 force-app/main/default/experiences/Consumable1/views/createRecord.json                                  |   23 
 force-app/main/default/experiences/Site3/routes/error.json                                              |   10 
 force-app/main/default/experiences/Partner21/routes/仪表板関連リスト.json                                       |    9 
 force-app/main/default/experiences/Consumable1/routes/reportBuilder.json                                |    6 
 .sf/orgs/00D6D00000043GHUAY/localSourceTracking/HEAD                                                    |    1 
 force-app/main/default/experiences/Consumable1/routes/contactSupport.json                               |    6 
 manifest/LEXC04packagecommdeploy.xml                                                                    |    6 
 force-app/main/default/experiences/Partner21/routes/loginError.json                                     |    9 
 force-app/main/default/experiences/Partner21/views/dashboardList.json                                   |   37 
 force-app/main/default/experiences/Partner21/views/userProfile.json                                     |  121 
 force-app/main/default/experiences/Partner21/views/error.json                                           |   57 
 force-app/main/default/experiences/Partner21/views/relatedRecordList.json                               |   45 
 force-app/main/default/experiences/Partner21/routes/groupList.json                                      |    9 
 force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json                               |   66 
 force-app/main/default/experiences/Consumable1/routes/checkPassword.json                                |    6 
 force-app/main/default/experiences/Consumable1/routes/用户List.json                                       |    9 
 force-app/main/default/experiences/Consumable1/views/cICRelatedList.json                                |   45 
 force-app/main/default/experiences/Partner21/views/streamList.json                                      |   27 
 force-app/main/default/experiences/Site3/views/forgotPassword.json                                      |   79 
 force-app/main/default/experiences/Consumable1/routes/error.json                                        |    6 
 force-app/main/default/experiences/Consumable1/routes/userSettings.json                                 |    6 
 force-app/main/default/experiences/Partner21/views/accountManagement.json                               |  153 
 force-app/main/default/experiences/Partner21/views/小组関連リスト.json                                         |   45 
 force-app/main/default/classes/ContactTriggerHandler.cls                                                | 1190 +-
 force-app/main/default/experiences/Consumable1/routes/用户RelatedList.json                                |    9 
 force-app/main/default/experiences/Consumable1/views/报表RelatedList.json                                 |   45 
 force-app/main/default/experiences/Partner21/views/文件関連リスト.json                                         |   45 
 force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json                          |    6 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js                        |    3 
 force-app/main/default/experiences/Consumable1/routes/loginError.json                                   |    6 
 force-app/main/default/experiences/Partner21/routes/fileDetail.json                                     |    9 
 force-app/main/default/aura/CreateTarget/CreateTargetHelper.js                                          | 1226 +-
 force-app/main/default/experiences/Consumable1/views/campaignList.json                                  |   28 
 force-app/main/default/experiences/Partner21/config/loginAppPage.json                                   |    7 
 force-app/main/default/experiences/Site3/routes/register.json                                           |    9 
 force-app/main/default/experiences/Consumable1/routes/小组RelatedList.json                                |    9 
 force-app/main/default/experiences/Partner21/routes/messages.json                                       |    9 
 force-app/main/default/experiences/Site3/config/languages.json                                          |    6 
 force-app/main/default/sites/Site.site-meta.xml                                                         |   33 
 .sf/config.json                                                                                         |    2 
 force-app/main/default/experiences/Consumable1/routes/messages.json                                     |    6 
 force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json                 |   22 
 force-app/main/default/experiences/Consumable1/views/loginError.json                                    |   16 
 force-app/main/default/experiences/Consumable1/views/fileDetail.json                                    |   12 
 force-app/main/default/experiences/Consumable1/routes/流RelatedList.json                                 |    9 
 force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp                                               | 1492 ++-
 force-app/main/default/experiences/Consumable1/views/库存上下限编辑.json                                       |   81 
 force-app/main/default/experiences/Partner21/views/cIC関連リスト.json                                        |   45 
 force-app/main/default/experiences/Consumable1/routes/search.json                                       |    6 
 force-app/main/default/experiences/Partner21/routes/streamList.json                                     |    9 
 force-app/main/default/experiences/Consumable1/routes/fileList.json                                     |    6 
 force-app/main/default/experiences/Consumable1/routes/库存.json                                           |   10 
 force-app/main/default/experiences/Partner21/routes/reportBuilder.json                                  |    9 
 force-app/main/default/experiences/Consumable1/views/库存.json                                            |   81 
 force-app/main/default/experiences/Consumable1/views/home.json                                          |   46 
 force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json                            |   66 
 force-app/main/default/experiences/Consumable1/routes/cICRelatedList.json                               |    9 
 force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json                                 |    6 
 force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json                                 |   24 
 force-app/main/default/experiences/Partner21/routes/checkPassword.json                                  |    9 
 force-app/main/default/experiences/Partner21/views/fileList.json                                        |   39 
 force-app/main/default/experiences/Partner21/views/questionDetail.json                                  |  105 
 force-app/main/default/experiences/Site3/routes/recordList.json                                         |   10 
 force-app/main/default/experiences/Partner21/views/home.json                                            |  154 
 force-app/main/default/experiences/Consumable1/views/lexTopPage.json                                    |   24 
 force-app/main/default/experiences/Consumable1/views/消耗品订单相关列表.json                                     |   12 
 force-app/main/default/experiences/Consumable1/views/homeFlexible.json                                  |   28 
 force-app/main/default/experiences/Consumable1/views/login.json                                         |   69 
 force-app/main/default/experiences/Partner21/views/reportList.json                                      |   37 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js                          |  281 
 force-app/main/default/experiences/Partner21/routes/accountManagement.json                              |    9 
 force-app/main/default/experiences/Consumable1/routes/streamList.json                                   |    6 
 force-app/main/default/experiences/Partner21/routes/groupDetail.json                                    |    9 
 force-app/main/default/experiences/Partner21/views/streamDetail.json                                    |   39 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css                               |   63 
 force-app/main/default/experiences/Consumable1/views/cICList.json                                       |   52 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml                      |    5 
 force-app/main/default/experiences/Site3/themes/buildYourOwn.json                                       |  149 
 force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json                                |   22 
 force-app/main/default/experiences/Partner21/views/groupDetail.json                                     |   62 
 force-app/main/default/experiences/Consumable1/routes/lexConsumable.json                                |    6 
 force-app/main/default/experiences/Partner21/views/cICリスト.json                                          |   52 
 force-app/main/default/experiences/Consumable1/routes/reportList.json                                   |    6 
 force-app/main/default/experiences/Site3/routes/checkPassword.json                                      |    9 
 force-app/main/default/experiences/Consumable1/views/dashboardDetail.json                               |   16 
 force-app/main/default/experiences/Partner21/views/报表関連リスト.json                                         |   45 
 force-app/main/default/experiences/Site3/views/奥林巴斯电子签收系统.json                                          |   55 
 force-app/main/default/experiences/Consumable1/views/myAccount.json                                     |   22 
 force-app/main/default/experiences/Partner21/routes/reportList.json                                     |    9 
 force-app/main/default/experiences/Partner21/views/messages.json                                        |   27 
 force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json                              |    6 
 force-app/main/default/experiences/Consumable1/views/groupDetail.json                                   |   16 
 force-app/main/default/experiences/Partner21/routes/cIC関連リスト.json                                       |    9 
 force-app/main/default/experiences/Partner21/views/流関連リスト.json                                          |   27 
 force-app/main/default/experiences/Consumable1/routes/flow.json                                         |    6 
 force-app/main/default/experiences/Consumable1/routes/recordDetail.json                                 |    6 
 force-app/main/default/experiences/Partner21/routes/userSettings.json                                   |    9 
 force-app/main/default/experiences/Partner21/views/reportDetail.json                                    |   57 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.auradoc                           |    6 
 force-app/main/default/experiences/Partner21/routes/createRecord.json                                   |    9 
 force-app/main/default/experiences/Consumable1/routes/caseDetail.json                                   |    6 
 force-app/main/default/experiences/Consumable1/views/流RelatedList.json                                  |   27 
 force-app/main/default/experiences/Consumable1/views/caseDetail.json                                    |   18 
 force-app/main/default/experiences/Consumable1/routes/createRecord.json                                 |    6 
 force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json                                    |   34 
 force-app/main/default/experiences/Consumable1/views/userSettings.json                                  |   12 
 force-app/main/default/experiences/Consumable1/views/小组RelatedList.json                                 |   45 
 force-app/main/default/experiences/Site3/views/recordList.json                                          |   52 
 force-app/main/default/experiences/Partner21/routes/login.json                                          |    9 
 force-app/main/default/experiences/Partner21/config/mainAppPage.json                                    |   10 
 force-app/main/default/experiences/Site3/config/loginAppPage.json                                       |    7 
 force-app/main/default/experiences/Partner21/routes/recordDetail.json                                   |    9 
 force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json                               |    6 
 force-app/main/default/experiences/Consumable1/routes/userProfile.json                                  |    6 
 force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json                                 |   54 
 force-app/main/default/experiences/Partner21/routes/home.json                                           |   10 
 force-app/main/default/experiences/Consumable1/routes/消耗品订单详细信息.json                                    |    6 
 force-app/main/default/experiences/Consumable1/views/reportBuilder.json                                 |   12 
 force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json                            |   22 
 force-app/main/default/experiences/Site3/views/home.json                                                |   45 
 force-app/main/default/experiences/Consumable1/views/questionDetail.json                                |   24 
 force-app/main/default/experiences/Partner21.site-meta.xml                                              |    5 
 force-app/main/default/experiences/Consumable1/routes/recordList.json                                   |    6 
 force-app/main/default/experiences/Partner21/routes/topicCatalog.json                                   |   10 
 force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json                           |    6 
 force-app/main/default/sites/extsurvey.site-meta.xml                                                    |   31 
 force-app/main/default/experiences/Consumable1/routes/cICList.json                                      |    9 
 force-app/main/default/experiences/Partner21/views/checkPassword.json                                   |   67 
 force-app/main/default/experiences/Consumable1/views/lexInventory.json                                  |   26 
 force-app/main/default/experiences/Consumable1/routes/register.json                                     |    6 
 force-app/main/default/experiences/Partner21/routes/register.json                                       |    9 
 force-app/main/default/aura/CreateTarget/CreateTarget.css                                               |   12 
 force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json                                   |    6 
 force-app/main/default/experiences/Partner21/routes/feedDetail.json                                     |    9 
 force-app/main/default/experiences/Site3/views/createRecord.json                                        |   39 
 force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json                          |   66 
 force-app/main/default/experiences/Partner21/routes/学会・培训詳細.json                                        |    9 
 force-app/main/default/experiences/Partner21/views/dashboardDetail.json                                 |   58 
 force-app/main/default/experiences/Site3/routes/loginError.json                                         |    9 
 force-app/main/default/experiences/Consumable1/views/学会・培训RelatedList.json                              |   45 
 force-app/main/default/networks/电子签收系统.network-meta.xml                                                 |   57 
 force-app/main/default/experiences/Partner21/routes/dashboardDetail.json                                |    9 
 force-app/main/default/experiences/Partner21/views/fileDetail.json                                      |   37 
 force-app/main/default/experiences/Consumable1/views/error.json                                         |   22 
 force-app/main/default/experiences/Consumable1/routes/forgotPassword.json                               |    6 
 force-app/main/default/experiences/Consumable1/routes/questionDetail.json                               |    6 
 force-app/main/default/experiences/Site3/views/recordDetail.json                                        |   75 
 force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json                            |    6 
 force-app/main/default/experiences/Consumable1/routes/新建消耗品订单.json                                      |   10 
 force-app/main/default/experiences/Partner21/views/loginError.json                                      |   57 
 force-app/main/default/experiences/Partner21/routes/fileList.json                                       |    9 
 force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json                              |    6 
 force-app/main/default/experiences/Site3/views/register.json                                            |   96 
 force-app/main/default/experiences/Consumable1/views/消耗品订单列表.json                                       |   18 
 force-app/main/default/experiences/Partner21/views/register.json                                        |   96 
 force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json                        |   66 
 force-app/main/default/experiences/Partner21/routes/resources.json                                      |   10 
 force-app/main/default/experiences/Consumable1/views/messages.json                                      |    8 
 force-app/main/default/experiences/Partner21/routes/quipDocsRelatedList.json                            |   10 
 force-app/main/default/experiences/Partner21/routes/小组関連リスト.json                                        |    9 
 force-app/main/default/sites/Partner2.site-meta.xml                                                     |   34 
 force-app/main/default/experiences/Partner21/themes/partnerCentral.json                                 |  180 
 force-app/main/default/experiences/Partner21/views/feedDetail.json                                      |   39 
 force-app/main/default/experiences/Consumable1/views/search.json                                        |   12 
 force-app/main/default/experiences/Consumable1/routes/lexTopPage.json                                   |    8 
 force-app/main/default/experiences/Partner21/views/forgotPassword.json                                  |   79 
 force-app/main/default/experiences/Consumable1/views/contactSupport.json                                |   20 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js                      |  309 
 force-app/main/default/experiences/Consumable1/views/accountManagement.json                             |   32 
 force-app/main/default/classes/LexConInvoicedetailsController.cls                                       |  850 +
 force-app/main/default/experiences/Consumable1/views/forgotPassword.json                                |   24 
 force-app/main/default/experiences/Site3/routes/relatedRecordList.json                                  |   10 
 force-app/main/default/experiences/Consumable1/views/userProfile.json                                   |   28 
 force-app/main/default/experiences/Partner21/routes/myAccount.json                                      |    9 
 force-app/main/default/experiences/Partner21/views/contactSupport.json                                  |  106 
 force-app/main/default/experiences/Consumable1/routes/学会・培训Detail.json                                  |    9 
 force-app/main/default/experiences/Partner21/views/login.json                                           |   84 
 force-app/main/default/experiences/Partner21/views/flow.json                                            |   40 
 force-app/main/default/experiences/Consumable1/views/reportDetail.json                                  |   16 
 force-app/main/default/experiences/Consumable1/routes/消耗品订单相关列表.json                                    |    6 
 force-app/main/default/experiences/Site3/routes/forgotPassword.json                                     |    9 
 force-app/main/default/experiences/Consumable1/routes/login.json                                        |    6 
 force-app/main/default/sites/Consumable.site-meta.xml                                                   |    6 
 force-app/main/default/experiences/Consumable1/views/recordDetail.json                                  |   18 
 force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json                                |    8 
 force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json                           |   56 
 force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json                           |   12 
 force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json                           |    8 
 force-app/main/default/experiences/Consumable1/routes/myAccount.json                                    |    6 
 force-app/main/default/experiences/Consumable1/routes/streamDetail.json                                 |    6 
 force-app/main/default/experiences/Consumable1/config/languages.json                                    |    2 
 force-app/main/default/experiences/Consumable1/views/topicCatalog.json                                  |   18 
 force-app/main/default/experiences/Consumable1/views/topicDetail.json                                   |   22 
 manifest/LEXC02packagelexcommunityupdate.xml                                                            |   20 
 force-app/main/default/experiences/Partner21/views/用户関連リスト.json                                         |   45 
 force-app/main/default/experiences/Partner21/routes/topicDetail.json                                    |    9 
 force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json                              |    6 
 force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp                               |  220 
 force-app/main/default/experiences/Partner21/routes/flow.json                                           |   10 
 force-app/main/default/experiences/Consumable1/config/mainAppPage.json                                  |    4 
 force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json                            |   24 
 force-app/main/default/experiences/Consumable1/views/lexConsumable.json                                 |   22 
 force-app/main/default/experiences/Partner21/views/学会・培训詳細.json                                         |   76 
 force-app/main/default/experiences/Partner21/routes/用户リスト.json                                          |    9 
 force-app/main/default/experiences/Partner21/config/languages.json                                      |    6 
 force-app/main/default/experiences/Partner21/views/topicDetail.json                                     |   93 
 force-app/main/default/experiences/Site3/config/mainAppPage.json                                        |   10 
 force-app/main/default/experiences/Site3/views/search.json                                              |   59 
 force-app/main/default/experiences/Consumable1/views/仪表板RelatedList.json                                |   45 
 force-app/main/default/experiences/Partner21/routes/questionDetail.json                                 |    9 
 force-app/main/default/experiences/Partner21/views/用户リスト.json                                           |   27 
 force-app/main/default/experiences/Partner21/views/campaignList.json                                    |  150 
 force-app/main/default/experiences/Consumable1/routes/lexInventory.json                                 |   10 
 force-app/main/default/experiences/Consumable1/views/用户List.json                                        |   27 
 force-app/main/default/experiences/Consumable1/routes/库存上下限编辑.json                                      |   10 
 force-app/main/default/experiences/Site3/views/relatedRecordList.json                                   |   45 
 force-app/main/default/experiences/Partner21/routes/search.json                                         |   10 
 force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json                            |    6 
 force-app/main/default/experiences/Consumable1/variations/defaultNavigationMenuComponentProperties.json |   17 
 force-app/main/default/sites/Site2.site-meta.xml                                                        |   32 
 force-app/main/default/aura/WeeklyReport/WeeklyReportController.js                                      |  575 
 force-app/main/default/experiences/Consumable1/views/feedDetail.json                                    |   12 
 force-app/main/default/experiences/Consumable1/views/checkPassword.json                                 |   28 
 force-app/main/default/experiences/Consumable1/views/groupList.json                                     |   14 
 force-app/main/default/experiences/Consumable1/routes/报表RelatedList.json                                |    9 
 force-app/main/default/experiences/Site3/routes/home.json                                               |   10 
 force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json                                  |   24 
 force-app/main/default/experiences/Partner21/routes/学会・培训関連リスト.json                                     |    9 
 force-app/main/default/experiences/Partner21/routes/流関連リスト.json                                         |    9 
 force-app/main/default/experiences/Partner21/views/userSettings.json                                    |   60 
 force-app/main/default/experiences/Site3/routes/奥林巴斯电子签收系统.json                                         |   10 
 force-app/main/default/experiences/Partner21/routes/cICリスト.json                                         |    9 
 force-app/main/default/experiences/Site3/views/error.json                                               |   57 
 force-app/main/default/experiences/Partner21/routes/文件関連リスト.json                                        |    9 
 force-app/main/default/experiences/Consumable1/views/resources.json                                     |   20 
 force-app/main/default/experiences/Consumable1/views/register.json                                      |   20 
 force-app/main/default/experiences/Partner21/views/quipDocsRelatedList.json                             |   39 
 force-app/main/default/experiences/Partner21/views/学会・培训関連リスト.json                                      |   45 
 force-app/main/default/networks/Consumable系统.network-meta.xml                                           |   12 
 force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json                             |   66 
 force-app/main/default/experiences/Consumable1/views/消耗品订单详细信息.json                                     |   20 
 force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json                           |   40 
 force-app/main/default/experiences/Partner21/routes/streamDetail.json                                   |    9 
 force-app/main/default/networks/消耗品管理系统.network-meta.xml                                                |   72 
 force-app/main/default/experiences/Consumable1/routes/home.json                                         |    6 
 force-app/main/default/experiences/Consumable1/views/flow.json                                          |   19 
 force-app/main/default/experiences/Consumable1/views/recordList.json                                    |   31 
 force-app/main/default/experiences/Partner21/routes/reportDetail.json                                   |    9 
 force-app/main/default/experiences/Consumable1/views/学会・培训Detail.json                                   |   76 
 force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json                           |    6 
 force-app/main/default/experiences/Partner21/routes/contactSupport.json                                 |   10 
 force-app/main/default/experiences/Partner21/routes/mDFAndCoop.json                                     |    9 
 force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json                               |   66 
 force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls-meta.xml                          |    5 
 force-app/main/default/experiences/Partner21/views/search.json                                          |   59 
 force-app/main/default/experiences/Consumable1/routes/学会・培训RelatedList.json                             |    9 
 force-app/main/default/experiences/Consumable1/views/streamDetail.json                                  |   12 
 force-app/main/default/experiences/Site3.site-meta.xml                                                  |    5 
 force-app/main/default/experiences/Partner21/views/reportBuilder.json                                   |   39 
 force-app/main/default/experiences/Consumable1/routes/accountManagement.json                            |    6 
 force-app/main/default/experiences/Consumable1/views/用户RelatedList.json                                 |   45 
 force-app/main/default/experiences/Partner21/routes/campaignList.json                                   |    9 
 force-app/main/default/experiences/Consumable1/routes/仪表板RelatedList.json                               |    9 
 force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json                           |    6 
 force-app/main/default/experiences/Partner21/routes/forgotPassword.json                                 |    9 
 force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json                       |    6 
 force-app/main/default/experiences/Partner21/views/recordList.json                                      |   52 
 force-app/main/default/experiences/Consumable1/routes/topicCatalog.json                                 |    6 
 force-app/main/default/experiences/Consumable1/themes/partnerCentral.json                               |   62 
 force-app/main/default/experiences/Partner21/routes/error.json                                          |   10 
 force-app/main/default/experiences/Partner21/routes/dashboardList.json                                  |    9 
 force-app/main/default/experiences/Consumable1/config/consumable系统.json                                 |    8 
 force-app/main/default/experiences/Consumable1/views/relatedRecordList.json                             |   12 
 force-app/main/default/experiences/Partner21/views/topicCatalog.json                                    |   73 
 force-app/main/default/experiences/Consumable1/routes/dashboardList.json                                |    6 
 force-app/main/default/experiences/Partner21/config/partner2.json                                       |   11 
 force-app/main/default/experiences/Consumable1/routes/消耗品订单列表.json                                      |    6 
 force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js                                          | 5141 ++++++-----
 force-app/main/default/experiences/Site3/views/checkPassword.json                                       |   67 
 manifest/package.xml                                                                                    |    9 
 force-app/main/default/experiences/Partner21/routes/relatedRecordList.json                              |   10 
 .sf/orgs/00D6D00000043GHUAY/localSourceTracking/config                                                  |    7 
 force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls                                   |  798 +
 force-app/main/default/experiences/Site3/config/电子签收系统.json                                             |   11 
 force-app/main/default/experiences/Partner21/routes/recordList.json                                     |   10 
 force-app/main/default/experiences/Consumable1/routes/resources.json                                    |    6 
 force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json                         |    6 
 force-app/main/default/experiences/Consumable1/routes/文件RelatedList.json                                |    9 
 force-app/main/default/experiences/Consumable1/views/reportList.json                                    |   12 
 force-app/main/default/experiences/Consumable1/routes/fileDetail.json                                   |    6 
 force-app/main/default/experiences/Partner21/routes/userProfile.json                                    |    9 
 force-app/main/default/experiences/Partner21/views/myAccount.json                                       |  109 
 force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json                      |   22 
 force-app/main/default/experiences/Partner21/routes/报表関連リスト.json                                        |    9 
 force-app/main/default/experiences/Site3/routes/recordDetail.json                                       |    9 
 force-app/main/default/experiences/Site3/routes/search.json                                             |   10 
 force-app/main/default/experiences/Consumable1/routes/groupList.json                                    |    6 
 force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json                         |   36 
 force-app/main/default/experiences/Partner21/views/groupList.json                                       |   47 
 force-app/main/default/experiences/Partner21/views/mDFAndCoop.json                                      |  198 
 force-app/main/default/experiences/Consumable1/views/fileList.json                                      |   12 
 force-app/main/default/networks/Partner2.network-meta.xml                                               |   57 
 force-app/main/default/experiences/Consumable1/routes/groupDetail.json                                  |    6 
 force-app/main/default/experiences/Consumable1/routes/feedDetail.json                                   |    6 
 force-app/main/default/experiences/Partner21/views/resources.json                                       |   75 
 force-app/main/default/experiences/Partner21/views/recordDetail.json                                    |   76 
 force-app/main/default/experiences/Site3/views/loginError.json                                          |   57 
 force-app/main/default/networks/Partner Sales.network-meta.xml                                          |   60 
 force-app/main/default/sites/Partner_Sales.site-meta.xml                                                |   34 
 force-app/main/default/experiences/Consumable1/config/loginAppPage.json                                 |    2 
 force-app/main/default/experiences/Partner21/routes/caseDetail.json                                     |    9 
 force-app/main/default/experiences/Consumable1/views/文件RelatedList.json                                 |   45 
 force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json                |    6 
 force-app/main/default/experiences/Partner21/views/createRecord.json                                    |   40 
 force-app/main/default/experiences/Consumable1/views/neworder.json                                      |   71 
 force-app/main/default/lwc/lexConsumable/lexConsumable.js                                               | 3012 ++++---
 force-app/main/default/experiences/Site3/routes/login.json                                              |    9 
 force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json                            |   22 
 force-app/main/default/experiences/Partner21/routes/用户関連リスト.json                                        |    9 
 force-app/main/default/experiences/Consumable1/routes/reportDetail.json                                 |    6 
 force-app/main/default/experiences/Consumable1/views/dashboardList.json                                 |   12 
 force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json                     |    6 
 force-app/main/default/experiences/Consumable1/views/streamList.json                                    |    8 
 force-app/main/default/experiences/Consumable1/routes/campaignList.json                                 |    6 
 force-app/main/default/experiences/Consumable1/routes/topicDetail.json                                  |    6 
 force-app/main/default/experiences/Site3/views/login.json                                               |   84 
 force-app/main/default/experiences/Partner21/views/caseDetail.json                                      |   76 
 force-app/main/default/aura/CreateTarget/CreateTarget.cmp                                               |  937 +
 force-app/main/default/experiences/Site3/routes/createRecord.json                                       |    9 
 330 files changed, 17,342 insertions(+), 7,386 deletions(-)

diff --git a/.sf/config.json b/.sf/config.json
index 4c476fc..36f3790 100644
--- a/.sf/config.json
+++ b/.sf/config.json
@@ -1,3 +1,3 @@
 {
-  "target-org": "OlympusProd"
+  "target-org": "DaikinDev"
 }
diff --git a/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/HEAD b/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/HEAD
new file mode 100644
index 0000000..b870d82
--- /dev/null
+++ b/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/HEAD
@@ -0,0 +1 @@
+ref: refs/heads/main
diff --git a/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/config b/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/config
new file mode 100644
index 0000000..d545cda
--- /dev/null
+++ b/.sf/orgs/00D6D00000043GHUAY/localSourceTracking/config
@@ -0,0 +1,7 @@
+[core]
+	repositoryformatversion = 0
+	filemode = false
+	bare = false
+	logallrefupdates = true
+	symlinks = false
+	ignorecase = true
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
index cd40cf4..a093ee6 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.cmp
@@ -1,318 +1,635 @@
-<aura:component controller="CreateTargetCmp" implements="forceCommunity:availableForAllPageTypes,force:hasRecordId" access="global" >
-	<aura:handler name="init" value="{!this}" action="{!c.doInit}"/>
-	<aura:attribute name="recordId" type="Id" />
-	<aura:attribute name="hospital" type="string" default=""/>
-	<aura:attribute name="test" type="string" default="1"/>
-	<aura:handler event="force:refreshView" action="{!c.isRefreshed}" />
-	<aura:attribute name="hospitalId" type="string" default=""/>
-	<aura:attribute name="GIAmount" type="string" default="0.00"/>
-	<aura:attribute name="BFAmount" type="string" default="0.00"/>
-	<aura:attribute name="ETAmount" type="string" default="0.00"/>
-	<aura:attribute name="GSAmount" type="string" default="0.00"/>
-	<aura:attribute name="UROAmount" type="string" default="0.00"/>
-	<aura:attribute name="GYNAmount" type="string" default="0.00"/>
-	<aura:attribute name="ENTAmount" type="string" default="0.00"/>
-	<aura:attribute name="OTHAmount" type="string" default="0.00"/>
-	<aura:attribute name="OCMTerm" type="string" default=""/>
-	<aura:attribute name="button_text" type="string" default="鏂板缓"/>
-	<aura:handler name="change" value="{!v.record.Agency_Hospital__c}" action="{!c.hosChange}"/>
-	<aura:attribute name="hospitalList" type="sobject[]" />
-	<aura:attribute name="record" type="Agency_Opportunity__c" default="{'sobjectType':'Agency_Opportunity__c'}"/>
-    <aura:handler name="change" value="{!v.recordET.Product_Category1__c}" action="{!c.productcategoryETChange1}"/>
-    <aura:handler name="change" value="{!v.recordET.Product_Category2__c}" action="{!c.productcategoryETChange2}"/>
-    <aura:handler name="change" value="{!v.recordET.Product_Category3__c}" action="{!c.productcategoryETChange3}"/>
-	
+<aura:component
+  controller="CreateTargetCmp"
+  implements="forceCommunity:availableForAllPageTypes,force:hasRecordId"
+  access="global"
+>
+  <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
+  <aura:attribute name="recordId" type="Id" />
+  <aura:attribute name="hospital" type="string" default="" />
+  <aura:attribute name="test" type="string" default="1" />
+  <aura:handler event="force:refreshView" action="{!c.isRefreshed}" />
+  <aura:attribute name="hospitalId" type="string" default="" />
+  <aura:attribute name="GIAmount" type="string" default="0.00" />
+  <aura:attribute name="BFAmount" type="string" default="0.00" />
+  <aura:attribute name="ETAmount" type="string" default="0.00" />
+  <aura:attribute name="GSAmount" type="string" default="0.00" />
+  <aura:attribute name="UROAmount" type="string" default="0.00" />
+  <aura:attribute name="GYNAmount" type="string" default="0.00" />
+  <aura:attribute name="ENTAmount" type="string" default="0.00" />
+  <aura:attribute name="OTHAmount" type="string" default="0.00" />
+  <aura:attribute name="OCMTerm" type="string" default="" />
+  <aura:attribute name="button_text" type="string" default="鏂板缓" />
+  <aura:handler
+    name="change"
+    value="{!v.record.Agency_Hospital__c}"
+    action="{!c.hosChange}"
+  />
+  <aura:attribute name="hospitalList" type="sobject[]" />
+  <aura:attribute
+    name="record"
+    type="Agency_Opportunity__c"
+    default="{'sobjectType':'Agency_Opportunity__c'}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordET.Product_Category1__c}"
+    action="{!c.productcategoryETChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordET.Product_Category2__c}"
+    action="{!c.productcategoryETChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordET.Product_Category3__c}"
+    action="{!c.productcategoryETChange3}"
+  />
 
-    <aura:handler name="change" value="{!v.recordBF.Product_Category1__c}" action="{!c.productcategoryBFChange1}"/>
-    <aura:handler name="change" value="{!v.recordBF.Product_Category2__c}" action="{!c.productcategoryBFChange2}"/>
-    <aura:handler name="change" value="{!v.recordBF.Product_Category3__c}" action="{!c.productcategoryBFChange3}"/>
-    <aura:handler name="change" value="{!v.recordGS.Product_Category1__c}" action="{!c.productcategoryGSChange1}"/>
-    <aura:handler name="change" value="{!v.recordGS.Product_Category2__c}" action="{!c.productcategoryGSChange2}"/>
-    <aura:handler name="change" value="{!v.recordGS.Product_Category3__c}" action="{!c.productcategoryGSChange3}"/>
-    <aura:handler name="change" value="{!v.recordURO.Product_Category1__c}" action="{!c.productcategoryUROChange1}"/>
-    <aura:handler name="change" value="{!v.recordURO.Product_Category2__c}" action="{!c.productcategoryUROChange2}"/>
-    <aura:handler name="change" value="{!v.recordURO.Product_Category3__c}" action="{!c.productcategoryUROChange3}"/>
-    <aura:handler name="change" value="{!v.recordGYN.Product_Category1__c}" action="{!c.productcategoryGYNChange1}"/>
-    <aura:handler name="change" value="{!v.recordGYN.Product_Category2__c}" action="{!c.productcategoryGYNChange2}"/>
-    <aura:handler name="change" value="{!v.recordGYN.Product_Category3__c}" action="{!c.productcategoryGYNChange3}"/>
-    <aura:handler name="change" value="{!v.recordENT.Product_Category1__c}" action="{!c.productcategoryENTChange1}"/>
-    <aura:handler name="change" value="{!v.recordENT.Product_Category2__c}" action="{!c.productcategoryENTChange2}"/>
-    <aura:handler name="change" value="{!v.recordENT.Product_Category3__c}" action="{!c.productcategoryENTChange3}"/>
-    <aura:handler name="change" value="{!v.recordOTH.Product_Category1__c}" action="{!c.productcategoryOTHChange1}"/>
-    <aura:handler name="change" value="{!v.recordOTH.Product_Category2__c}" action="{!c.productcategoryOTHChange2}"/>
-    <aura:handler name="change" value="{!v.recordOTH.Product_Category3__c}" action="{!c.productcategoryOTHChange3}"/>
-	<div class="button_area">
-		<ui:button label="{!v.button_text}" press="{!c.toggle_report}"/>
-    </div>
-    <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">
-	            <button class="slds-button slds-modal__close slds-button--icon-inverse" title="Close" onclick="{!c.toggle_report}">
-	                <lightning:icon class="close_icn" iconName="utility:close" size="medium" alternativeText="Indicates approval"/>
-	                <span class="slds-assistive-text">Close</span>
-	            </button>
-	            <h2 id="headerTarget" class="slds-text-heading--medium">鐩爣({!v.OCMTerm})</h2>
-	        </div>
-	        <div class="slds-modal__content slds-grow slds-p-around--medium">
-	            <div class="slds-box slds-theme--shade ">
-	            	<fieldset class="slds-form--compound">
-						<div class="slds-form-element__group">
-							<div class="slds-form-element__row">
-							    <div class="slds-form-element slds-size--1-of-2">
-							    	<label class="slds-form-element__label" for="input-hos">鍖婚櫌</label>
-							        <force:inputField value="{!v.record.Agency_Hospital__c}" aura:id="input-hos"/>
-							    </div>
-						    </div>
-						    <!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
+  <aura:handler
+    name="change"
+    value="{!v.recordBF.Product_Category1__c}"
+    action="{!c.productcategoryBFChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordBF.Product_Category2__c}"
+    action="{!c.productcategoryBFChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordBF.Product_Category3__c}"
+    action="{!c.productcategoryBFChange3}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGS.Product_Category1__c}"
+    action="{!c.productcategoryGSChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGS.Product_Category2__c}"
+    action="{!c.productcategoryGSChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGS.Product_Category3__c}"
+    action="{!c.productcategoryGSChange3}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordURO.Product_Category1__c}"
+    action="{!c.productcategoryUROChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordURO.Product_Category2__c}"
+    action="{!c.productcategoryUROChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordURO.Product_Category3__c}"
+    action="{!c.productcategoryUROChange3}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGYN.Product_Category1__c}"
+    action="{!c.productcategoryGYNChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGYN.Product_Category2__c}"
+    action="{!c.productcategoryGYNChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordGYN.Product_Category3__c}"
+    action="{!c.productcategoryGYNChange3}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordENT.Product_Category1__c}"
+    action="{!c.productcategoryENTChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordENT.Product_Category2__c}"
+    action="{!c.productcategoryENTChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordENT.Product_Category3__c}"
+    action="{!c.productcategoryENTChange3}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordOTH.Product_Category1__c}"
+    action="{!c.productcategoryOTHChange1}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordOTH.Product_Category2__c}"
+    action="{!c.productcategoryOTHChange2}"
+  />
+  <aura:handler
+    name="change"
+    value="{!v.recordOTH.Product_Category3__c}"
+    action="{!c.productcategoryOTHChange3}"
+  />
+  <div class="button_area">
+    <ui:button label="{!v.button_text}" press="{!c.toggle_report}" />
+  </div>
+  <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">
+        <button
+          class="slds-button slds-modal__close slds-button--icon-inverse"
+          title="Close"
+          onclick="{!c.toggle_report}"
+        >
+          <lightning:icon
+            class="close_icn"
+            iconName="utility:close"
+            size="medium"
+            alternativeText="Indicates approval"
+          />
+          <span class="slds-assistive-text">Close</span>
+        </button>
+        <h2 id="headerTarget" class="slds-text-heading--medium">
+          鐩爣({!v.OCMTerm})
+        </h2>
+      </div>
+      <div class="slds-modal__content slds-grow slds-p-around--medium">
+        <div class="slds-box slds-theme--shade">
+          <fieldset class="slds-form--compound">
+            <div class="slds-form-element__group">
+              <div class="slds-form-element__row">
+                <div class="slds-form-element slds-size--1-of-2">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >鍖婚櫌</label
+                  >
+                  <force:inputField
+                    value="{!v.record.Agency_Hospital__c}"
+                    aura:id="input-hos"
+                  />
+                </div>
+              </div>
+              <!-- <h4 class="slds-section__title">璁块棶鐩爣</h4>
 						    <div class="slds-form-element__row">
 							    <div class="slds-form-element slds-size-1-of-2">
 							    	<label class="slds-form-element__label" for="input-target">鐩爣鍖婚櫌</label>
 							        <force:inputField value="{!v.record2.TargetHospital__c}" aura:id="input-target"/>
 								</div>
 							</div> -->
-							<h4 class="slds-section__title">浜у搧鐩爣</h4>
-						    <div class="slds-form-element__row">
-								<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">娑堝寲绉�</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_GI1" class="slds-select" change="{!c.productcategoryGIChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GI4_1" class="slds-select"/>
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_GI2" class="slds-select" change="{!c.productcategoryGIChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GI4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_GI3" class="slds-select" change="{!c.productcategoryGIChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GI4_3" class="slds-select"/>
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">ET鑰楁潗</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_ET1" class="slds-select" change="{!c.productcategoryETChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ET4_1" class="slds-select"/>
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_ET2" class="slds-select" change="{!c.productcategoryETChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ET4_2" class="slds-select"/>
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_ET3" class="slds-select" change="{!c.productcategoryETChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ET4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">鍛煎惛绉�</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_BF1" class="slds-select" change="{!c.productcategoryBFChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_BF4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_BF2" class="slds-select" change="{!c.productcategoryBFChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_BF4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_BF3" class="slds-select" change="{!c.productcategoryBFChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_BF4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">鏅绉�</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_GS1" class="slds-select" change="{!c.productcategoryGSChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GS4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_GS2" class="slds-select" change="{!c.productcategoryGSChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GS4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_GS3" class="slds-select" change="{!c.productcategoryGSChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GS4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">娉屽翱绉�</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_URO1" class="slds-select" change="{!c.productcategoryUROChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_URO4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_URO2" class="slds-select" change="{!c.productcategoryUROChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_URO4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_URO3" class="slds-select" change="{!c.productcategoryUROChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_URO4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">濡囩</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_GYN1" class="slds-select" change="{!c.productcategoryGYNChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GYN4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_GYN2" class="slds-select" change="{!c.productcategoryGYNChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GYN4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_GYN3" class="slds-select" change="{!c.productcategoryGYNChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_GYN4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">鑰抽蓟鍠夌</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_ENT1" class="slds-select" change="{!c.productcategoryENTChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ENT4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_ENT2" class="slds-select" change="{!c.productcategoryENTChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ENT4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_ENT3" class="slds-select" change="{!c.productcategoryENTChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_ENT4_3" class="slds-select" />
-							    </div>
-						    </div>
-						    <div class="slds-form-element__row">
-						    	<div class="slds-size--1-of-7 slds-grid--align-center">
-									<div style="margin-top: 32px;">鍏朵粬</div>
-								</div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎1</label>
-							    	<ui:inputSelect aura:id="select_OTH1" class="slds-select" change="{!c.productcategoryOTHChange1}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_OTH4_1" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎2</label>
-							    	<ui:inputSelect aura:id="select_OTH2" class="slds-select" change="{!c.productcategoryOTHChange2}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_OTH4_2" class="slds-select" />
-							    </div>
-							    <div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">浜у搧鍖哄垎3</label>
-							    	<ui:inputSelect aura:id="select_OTH3" class="slds-select" change="{!c.productcategoryOTHChange3}"/>
-							    </div>
-								<div class="slds-form-element slds-size--1-of-7">
-							    	<label class="slds-form-element__label" for="input-hos">閲戦鐩爣(涓嶅惈绋�)</label>
-							    	<ui:inputText aura:id="select_OTH4_3" class="slds-select" />
-							    </div>
-						    </div>
-						</div>
-					</fieldset>
-	            </div>
-	        </div>
-	        <div class="slds-modal__footer slds-grid slds-grid--align-spread">
-	        	<div class="slds-order--1" />
-	        	<ui:button aura:id="save_button" label="淇濆瓨" class="slds-button slds-button--brand slds-order--2" press="{!c.createTarget}"/>
-	        	<div class="slds-order--3" />
-	        </div>
-    	</div>
+              <h4 class="slds-section__title">浜у搧鐩爣</h4>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">娑堝寲绉�</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GI1"
+                    class="slds-select"
+                    change="{!c.productcategoryGIChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GI4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GI2"
+                    class="slds-select"
+                    change="{!c.productcategoryGIChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GI4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GI3"
+                    class="slds-select"
+                    change="{!c.productcategoryGIChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GI4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">ET鑰楁潗</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ET1"
+                    class="slds-select"
+                    change="{!c.productcategoryETChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ET4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ET2"
+                    class="slds-select"
+                    change="{!c.productcategoryETChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ET4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ET3"
+                    class="slds-select"
+                    change="{!c.productcategoryETChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ET4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">鍛煎惛绉�</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_BF1"
+                    class="slds-select"
+                    change="{!c.productcategoryBFChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_BF4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_BF2"
+                    class="slds-select"
+                    change="{!c.productcategoryBFChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_BF4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_BF3"
+                    class="slds-select"
+                    change="{!c.productcategoryBFChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_BF4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">鏅绉�</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GS1"
+                    class="slds-select"
+                    change="{!c.productcategoryGSChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GS4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GS2"
+                    class="slds-select"
+                    change="{!c.productcategoryGSChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GS4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GS3"
+                    class="slds-select"
+                    change="{!c.productcategoryGSChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GS4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">娉屽翱绉�</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_URO1"
+                    class="slds-select"
+                    change="{!c.productcategoryUROChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_URO4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_URO2"
+                    class="slds-select"
+                    change="{!c.productcategoryUROChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_URO4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_URO3"
+                    class="slds-select"
+                    change="{!c.productcategoryUROChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_URO4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">濡囩</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GYN1"
+                    class="slds-select"
+                    change="{!c.productcategoryGYNChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GYN4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GYN2"
+                    class="slds-select"
+                    change="{!c.productcategoryGYNChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GYN4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_GYN3"
+                    class="slds-select"
+                    change="{!c.productcategoryGYNChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_GYN4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">鑰抽蓟鍠夌</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ENT1"
+                    class="slds-select"
+                    change="{!c.productcategoryENTChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ENT4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ENT2"
+                    class="slds-select"
+                    change="{!c.productcategoryENTChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ENT4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_ENT3"
+                    class="slds-select"
+                    change="{!c.productcategoryENTChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_ENT4_3" class="slds-select" />
+                </div>
+              </div>
+              <div class="slds-form-element__row">
+                <div class="slds-size--1-of-7 slds-grid--align-center">
+                  <div style="margin-top: 32px">鍏朵粬</div>
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎1</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_OTH1"
+                    class="slds-select"
+                    change="{!c.productcategoryOTHChange1}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_OTH4_1" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎2</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_OTH2"
+                    class="slds-select"
+                    change="{!c.productcategoryOTHChange2}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_OTH4_2" class="slds-select" />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >浜у搧鍖哄垎3</label
+                  >
+                  <ui:inputSelect
+                    aura:id="select_OTH3"
+                    class="slds-select"
+                    change="{!c.productcategoryOTHChange3}"
+                  />
+                </div>
+                <div class="slds-form-element slds-size--1-of-7">
+                  <label class="slds-form-element__label" for="input-hos"
+                    >閲戦鐩爣(涓嶅惈绋�)</label
+                  >
+                  <ui:inputText aura:id="select_OTH4_3" class="slds-select" />
+                </div>
+              </div>
+            </div>
+          </fieldset>
+        </div>
+      </div>
+      <div class="slds-modal__footer slds-grid slds-grid--align-spread">
+        <div class="slds-order--1" />
+        <ui:button
+          aura:id="save_button"
+          label="淇濆瓨"
+          class="slds-button slds-button--brand slds-order--2"
+          press="{!c.createTarget}"
+        />
+        <div class="slds-order--3" />
+      </div>
     </div>
-    <div aura:id="modal_bg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-</aura:component>
\ No newline at end of file
+  </div>
+  <div
+    aura:id="modal_bg"
+    class="disp_none slds-backdrop slds-backdrop--open"
+  ></div>
+</aura:component>
diff --git a/force-app/main/default/aura/CreateTarget/CreateTarget.css b/force-app/main/default/aura/CreateTarget/CreateTarget.css
index 9365600..f79adff 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTarget.css
+++ b/force-app/main/default/aura/CreateTarget/CreateTarget.css
@@ -1,6 +1,12 @@
 .THIS.button_area {
-    text-align: right;
+  text-align: right;
 }
 .THIS.disp_none {
-    display: none;
-}
\ No newline at end of file
+  display: none;
+}
+.THIS select {
+  --lwc-lineHeightButton: 36px;
+  --lwc-heightInput: 36px;
+  min-height: 0px !important;
+  height: 36px !important;
+}
diff --git a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
index e28ad09..993e1af 100644
--- a/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
+++ b/force-app/main/default/aura/CreateTarget/CreateTargetHelper.js
@@ -1,579 +1,689 @@
 ({
-    doinit : function(component, event, helper) {
-        component.set("v.OCMTerm", this.getOCMTerm());
-        if (component.get("v.recordId")) {
-            component.set("v.button_text", "缂栬緫");
-            var recordId = component.get("v.recordId");
-            var action = component.get("c.getHospital");
-            action.setParams({"recordId": recordId});
-            action.setCallback(this, function(response) {
-            var state = response.getState();
-                if(state === "SUCCESS") {
-                    var ah = response.getReturnValue();
-                    var select_ah = ah.Id;
-                    var select_ah_name = ah.Name;
-                    
-                    component.set('v.record.Agency_Hospital__c', select_ah);
-                    // alert(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v.values')));
-                    if ($A.get("$Browser.formFactor") == 'DESKTOP') {
-                        var values = [{
-                            type: 'Agency_Hospital_Link__c',
-                            id: select_ah,
-                            label: select_ah_name, 
-                            icon : {
-                                url:'/img/icon/t4v35/custom/custom24_120.png',
-                                backgroundColor:'dc71d1',
-                                alt:'Agency_Hospital_Link__c'
-                            }
-                        }];
-                        component.find('input-hos').get("v.body")[0].set('v.values', values);
-                    } else {
-                        component.find('input-hos').get("v.body")[0].set('v.selectedLabel', select_ah_name);
-                    }
-                    
-                } else if (state === "ERROR") {
-                    var errors = response.getError();
-                    var toastEvent = $A.get("e.force:showToast");
-                    toastEvent.setParams({
-                        "title": "閿欒",
-                        "type":"error",
-                        "message": errors[0].message
-                    });
-                    toastEvent.fire();
-                    
+  doinit: function (component, event, helper) {
+    component.set("v.OCMTerm", this.getOCMTerm());
+    if (component.get("v.recordId")) {
+      component.set("v.button_text", "缂栬緫");
+      var recordId = component.get("v.recordId");
+      var action = component.get("c.getHospital");
+      action.setParams({ recordId: recordId });
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        console.log("state1:" + state);
+        if (state === "SUCCESS") {
+          var ah = response.getReturnValue();
+          var select_ah = ah.Id;
+          var select_ah_name = ah.Name;
+          console.log("select_ah:" + select_ah);
+          let agencyHosp = component.get("v.record");
+          agencyHosp.Agency_Hospital__c = select_ah;
+          // alert(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v.values')));
+          console.log("flag0");
+          if ($A.get("$Browser.formFactor") == "DESKTOP") {
+            console.log("flag1");
+            var values = [
+              {
+                type: "Agency_Hospital_Link__c",
+                id: select_ah,
+                label: select_ah_name,
+                icon: {
+                  url: "/img/icon/t4v35/custom/custom24_120.png",
+                  backgroundColor: "dc71d1",
+                  alt: "Agency_Hospital_Link__c"
                 }
-            });
-            $A.enqueueAction(action);
-        }
-
-        var action = component.get("c.getProductList");
-        action.setCallback(this, function(response) {
-            var state = response.getState();
-            if(state === "SUCCESS") {
-                var opts = response.getReturnValue();
-                // alert(JSON.stringify(opts["GI"]));
-                component.find("select_GI1").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
-                component.find("select_GI2").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
-                component.find("select_GI3").set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
-
-                component.find("select_GS1").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
-                component.find("select_GS2").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
-                component.find("select_GS3").set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
-
-                component.find("select_GYN1").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
-                component.find("select_GYN2").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
-                component.find("select_GYN3").set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
-
-                component.find("select_URO1").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
-                component.find("select_URO2").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
-                component.find("select_URO3").set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
-
-                component.find("select_ENT1").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
-                component.find("select_ENT2").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
-                component.find("select_ENT3").set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
-
-                component.find("select_OTH1").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
-                component.find("select_OTH2").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
-                component.find("select_OTH3").set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
-
-                component.find("select_ET1").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
-                component.find("select_ET2").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
-                component.find("select_ET3").set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
-
-                component.find("select_BF1").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-                component.find("select_BF2").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-                component.find("select_BF3").set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
-            } else if (state === "ERROR") {
-                var errors = response.getError();
-                var toastEvent = $A.get("e.force:showToast");
-                toastEvent.setParams({
-                    "title": "閿欒",
-                    "type":"error",
-                    "message": errors[0].message
-                });
-                toastEvent.fire();
-                
+              }
+            ];
+            if (
+              component.find("input-hos").get("v.body") &&
+              component.find("input-hos").get("v.body").length > 0
+            ) {
+              component
+                .find("input-hos")
+                .get("v.body")[0]
+                .set("v.values", values);
             }
-        });
-        $A.enqueueAction(action);
-    },
-
-	toggle_report : function(component, event, helper) {
-        var modal_window = component.find('modal_window');
-        var modal_bg = component.find('modal_bg');
-        $A.util.toggleClass(modal_window, 'disp_none');
-        $A.util.toggleClass(modal_bg, 'disp_none');
-
-        if ($A.util.hasClass(modal_window, 'disp_none') && !component.get("v.recordId")) {
-            $A.get('e.force:refreshView').fire();
+          } else {
+            console.log("flag2");
+            if (
+              component.find("input-hos").get("v.body") &&
+              component.find("input-hos").get("v.body").length > 0
+            ) {
+              component
+                .find("input-hos")
+                .get("v.body")[0]
+                .set("v.selectedLabel", select_ah_name);
+            }
+          }
+        } else if (state === "ERROR") {
+          var errors = response.getError();
+          var toastEvent = $A.get("e.force:showToast");
+          toastEvent.setParams({
+            title: "閿欒",
+            type: "error",
+            message: errors[0].message
+          });
+          toastEvent.fire();
         }
-    },
+      });
+      $A.enqueueAction(action);
+    }
 
-    productcategoryChange : function(component, event, helper, dept, index) {
-        var cmpId = 'select_'+dept;
-        var myId;
-        var o1Id;
-        var o2Id;
-        if (index == 1) {
-            myId = cmpId + '1';
-            o1Id = cmpId + '2';
-            o2Id = cmpId + '3';
-        } else if (index == 2){
-            myId = cmpId + '2';
-            o1Id = cmpId + '1';
-            o2Id = cmpId + '3';
-        } else {
-            myId = cmpId + '3';
-            o1Id = cmpId + '1';
-            o2Id = cmpId + '2';
-        }
+    var action = component.get("c.getProductList");
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      console.log("state2:" + state);
+      if (state === "SUCCESS") {
+        var opts = response.getReturnValue();
+        // alert(JSON.stringify(opts["GI"]));
+        component
+          .find("select_GI1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+        component
+          .find("select_GI2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
+        component
+          .find("select_GI3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GI"])));
 
-        var product_category_id = component.find(myId).get('v.value');
-        var pcId1 = component.find(o1Id).get('v.value');
-        var pcId2 = component.find(o2Id).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(myId).set('v.value','');
-        }
-    },
+        component
+          .find("select_GS1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+        component
+          .find("select_GS2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
+        component
+          .find("select_GS3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GS"])));
 
-    selectHos : function(component, event, helper) {
+        component
+          .find("select_GYN1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+        component
+          .find("select_GYN2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
+        component
+          .find("select_GYN3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["GYN"])));
 
-    	var accid = component.get("v.record.Agency_Hospital__c");
-    	var action = component.get("c.getDeptAmount");
-    	action.setParams({ "hospitalId" : accid });
-    	action.setCallback(this, function(response) {
-    		var state = response.getState();
-    		if (state === "SUCCESS") {
-    			var amountMap = response.getReturnValue();
-                var GIProduct_Category1 = '';
-                var GIProduct_Category2 = '';
-                var GIProduct_Category3 = '';
-                var GIAim_Price__c1 = '';
-                var GIAim_Price__c2 = '';
-                var GIAim_Price__c3 = '';
-                if (amountMap.GI.length > 0) {
-                    GIProduct_Category1 = amountMap.GI[0].Product_Category__c;
-                    if (amountMap.GI.length > 1) {
-                        GIProduct_Category2 = amountMap.GI[1].Product_Category__c;
-                    }
-                    if (amountMap.GI.length > 2) {
-                        GIProduct_Category3 = amountMap.GI[2].Product_Category__c;
-                    }
-                    GIAim_Price__c1 = amountMap.GI[0].Aim_Price__c;
-                    GIAim_Price__c2 = amountMap.GI[1].Aim_Price__c;
-                    GIAim_Price__c3 = amountMap.GI[2].Aim_Price__c;
-                    console.warn(GIAim_Price__c1+"-"+GIAim_Price__c2+"-"+GIAim_Price__c3);
+        component
+          .find("select_URO1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+        component
+          .find("select_URO2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
+        component
+          .find("select_URO3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["URO"])));
 
-                }
-                component.find('select_GI1').set('v.value',GIProduct_Category1);
-                component.find('select_GI2').set('v.value',GIProduct_Category2);
-                component.find('select_GI3').set('v.value',GIProduct_Category3);
-                component.find('select_GI4_1').set('v.value',GIAim_Price__c1);
-                component.find('select_GI4_2').set('v.value',GIAim_Price__c2);
-                component.find('select_GI4_3').set('v.value',GIAim_Price__c3);
+        component
+          .find("select_ENT1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+        component
+          .find("select_ENT2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
+        component
+          .find("select_ENT3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ENT"])));
 
+        component
+          .find("select_OTH1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
+        component
+          .find("select_OTH2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
+        component
+          .find("select_OTH3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["OTH"])));
 
-                var ETProduct_Category1 = '';
-                var ETProduct_Category2 = '';
-                var ETProduct_Category3 = '';
-                var ETAim_Price__c1 = '';
-                var ETAim_Price__c2 = '';
-                var ETAim_Price__c3 = '';
-                if (amountMap.ET.length > 0) {
-                    ETProduct_Category1 = amountMap.ET[0].Product_Category__c;
-                    if (amountMap.ET.length > 1) {
-                        ETProduct_Category2 = amountMap.ET[1].Product_Category__c;
-                    }
-                    if (amountMap.ET.length > 2) {
-                        ETProduct_Category3 = amountMap.ET[2].Product_Category__c;
-                    }
-                    ETAim_Price__c1 = amountMap.ET[0].Aim_Price__c;
-                    ETAim_Price__c2 = amountMap.ET[1].Aim_Price__c;
-                    ETAim_Price__c3 = amountMap.ET[2].Aim_Price__c;
-                } 
-                component.find('select_ET1').set('v.value',ETProduct_Category1);
-                component.find('select_ET2').set('v.value',ETProduct_Category2);
-                component.find('select_ET3').set('v.value',ETProduct_Category3);
-                component.find('select_ET4_1').set('v.value',ETAim_Price__c1);
-                component.find('select_ET4_2').set('v.value',ETAim_Price__c2);
-                component.find('select_ET4_3').set('v.value',ETAim_Price__c3);
+        component
+          .find("select_ET1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+        component
+          .find("select_ET2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
+        component
+          .find("select_ET3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["ET"])));
 
-
-                var BFProduct_Category1 = '';
-                var BFProduct_Category2 = '';
-                var BFProduct_Category3 = '';
-                var BFAim_Price__c1 = '';
-                var BFAim_Price__c2 = '';
-                var BFAim_Price__c3 = '';
-                if (amountMap.BF.length > 0) {
-                    BFProduct_Category1 = amountMap.BF[0].Product_Category__c;
-                    if (amountMap.BF.length > 1) {
-                        BFProduct_Category2 = amountMap.BF[1].Product_Category__c;
-                    }
-                    if (amountMap.BF.length > 2) {
-                        BFProduct_Category3 = amountMap.BF[2].Product_Category__c;
-                    }
-                    BFAim_Price__c1 = amountMap.BF[0].Aim_Price__c;
-                    BFAim_Price__c2 = amountMap.BF[1].Aim_Price__c;
-                    BFAim_Price__c3 = amountMap.BF[2].Aim_Price__c;
-                } 
-                component.find('select_BF1').set('v.value',BFProduct_Category1);
-                component.find('select_BF2').set('v.value',BFProduct_Category2);
-                component.find('select_BF3').set('v.value',BFProduct_Category3);
-                component.find('select_BF4_1').set('v.value',BFAim_Price__c1);
-                component.find('select_BF4_2').set('v.value',BFAim_Price__c2);
-                component.find('select_BF4_3').set('v.value',BFAim_Price__c3);
-               
-
-                var OTHProduct_Category1 = '';
-                var OTHProduct_Category2 = '';
-                var OTHProduct_Category3 = '';
-                var OTHAim_Price__c1 = '';
-                var OTHAim_Price__c2 = '';
-                var OTHAim_Price__c3 = '';
-                if (amountMap.OTH.length > 0) {
-
-                    OTHProduct_Category1 = amountMap.OTH[0].Product_Category__c;
-                    if (amountMap.OTH.length > 1) {
-                        OTHProduct_Category2 = amountMap.OTH[1].Product_Category__c;
-                    }
-                    if (amountMap.OTH.length > 2) {
-                        OTHProduct_Category3 = amountMap.OTH[2].Product_Category__c;
-                    }
-                    OTHAim_Price__c1 = amountMap.OTH[0].Aim_Price__c;
-                    OTHAim_Price__c2 = amountMap.OTH[1].Aim_Price__c;
-                    OTHAim_Price__c3 = amountMap.OTH[2].Aim_Price__c;
-                } 
-                component.find('select_OTH1').set('v.value',OTHProduct_Category1);
-                component.find('select_OTH2').set('v.value',OTHProduct_Category2);
-                component.find('select_OTH3').set('v.value',OTHProduct_Category3);
-                component.find('select_OTH4_1').set('v.value',OTHAim_Price__c1);
-                component.find('select_OTH4_2').set('v.value',OTHAim_Price__c2);
-                component.find('select_OTH4_3').set('v.value',OTHAim_Price__c3);
-                
-                var GSProduct_Category1 = '';
-                var GSProduct_Category2 = '';
-                var GSProduct_Category3 = '';
-                var GSPAim_Price__c1 = '';
-                var GSPAim_Price__c2 = '';
-                var GSPAim_Price__c3 = '';
-                if (amountMap.GS.length > 0) {
-                    GSProduct_Category1 = amountMap.GS[0].Product_Category__c;
-                    if (amountMap.GS.length > 1) {
-                        GSProduct_Category2 = amountMap.GS[1].Product_Category__c;
-                    }
-                    if (amountMap.GS.length > 2) {
-                        GSProduct_Category3 = amountMap.GS[2].Product_Category__c;
-                    }
-                    GSPAim_Price__c1 = amountMap.GS[0].Aim_Price__c;
-                    GSPAim_Price__c2 = amountMap.GS[1].Aim_Price__c;
-                    GSPAim_Price__c3= amountMap.GS[2].Aim_Price__c;
-                } 
-                component.find('select_GS1').set('v.value',GSProduct_Category1);
-                component.find('select_GS2').set('v.value',GSProduct_Category2);
-                component.find('select_GS3').set('v.value',GSProduct_Category3);
-                component.find('select_GS4_1').set('v.value',GSPAim_Price__c1);
-                component.find('select_GS4_2').set('v.value',GSPAim_Price__c2);
-                component.find('select_GS4_3').set('v.value',GSPAim_Price__c3);
-                
-                var UROProduct_Category1 = '';
-                var UROProduct_Category2 = '';
-                var UROProduct_Category3 = '';
-                var UROAim_Price__c1 = '';
-                var UROAim_Price__c2 = '';
-                var UROAim_Price__c3 = '';
-                if (amountMap.URO.length > 0) {
-
-                    UROProduct_Category1 = amountMap.URO[0].Product_Category__c;
-                    if (amountMap.URO.length > 1) {
-                        UROProduct_Category2 = amountMap.URO[1].Product_Category__c;
-                    }
-                    if (amountMap.URO.length > 2) {
-                        UROProduct_Category3 = amountMap.URO[2].Product_Category__c;
-                    }
-                    UROAim_Price__c1 = amountMap.URO[0].Aim_Price__c;
-                    UROAim_Price__c2 = amountMap.URO[1].Aim_Price__c;
-                    UROAim_Price__c3 = amountMap.URO[2].Aim_Price__c;
-                } 
-                component.find('select_URO1').set('v.value',UROProduct_Category1);
-                component.find('select_URO2').set('v.value',UROProduct_Category2);
-                component.find('select_URO3').set('v.value',UROProduct_Category3);
-                component.find('select_URO4_1').set('v.value',UROAim_Price__c1);
-                component.find('select_URO4_2').set('v.value',UROAim_Price__c2);
-                component.find('select_URO4_3').set('v.value',UROAim_Price__c3);
-
-               
-                var GYNProduct_Category1 = '';
-                var GYNProduct_Category2 = '';
-                var GYNProduct_Category3 = '';
-                var GYNAim_Price__c1 = '';
-                var GYNAim_Price__c2 = '';
-                var GYNAim_Price__c3 = '';
-                if (amountMap.GYN.length > 0) {
-
-                    GYNProduct_Category1 = amountMap.GYN[0].Product_Category__c;
-                    if (amountMap.GYN.length > 1) {
-                        GYNProduct_Category2 = amountMap.GYN[1].Product_Category__c;
-                    }
-                    if (amountMap.GYN.length > 2) {
-                        GYNProduct_Category3 = amountMap.GYN[2].Product_Category__c;
-                    }
-                    GYNAim_Price__c1= amountMap.GYN[0].Aim_Price__c;
-                    GYNAim_Price__c2 = amountMap.GYN[1].Aim_Price__c;
-                    GYNAim_Price__c3 = amountMap.GYN[2].Aim_Price__c;
-                } 
-                component.find('select_GYN1').set('v.value',GYNProduct_Category1);
-                component.find('select_GYN2').set('v.value',GYNProduct_Category2);
-                component.find('select_GYN3').set('v.value',GYNProduct_Category3);
-                component.find('select_GYN4_1').set('v.value',GYNAim_Price__c1);
-                component.find('select_GYN4_2').set('v.value',GYNAim_Price__c2);
-                component.find('select_GYN4_3').set('v.value',GYNAim_Price__c3);
-
-                
-                var ENTProduct_Category1 = '';
-                var ENTProduct_Category2 = '';
-                var ENTProduct_Category3 = '';
-                var ENTAim_Price__c1 = '';
-                var ENTAim_Price__c2 = '';
-                var ENTAim_Price__c3 = '';
-                if (amountMap.ENT.length > 0) {
-
-                    ENTProduct_Category1 = amountMap.ENT[0].Product_Category__c;
-                    if (amountMap.ENT.length > 1) {
-                        ENTProduct_Category2 = amountMap.ENT[1].Product_Category__c;
-                    }
-                    if (amountMap.ENT.length > 2) {
-                        ENTProduct_Category3 = amountMap.ENT[2].Product_Category__c;
-                    }
-                    ENTAim_Price__c1 = amountMap.ENT[0].Aim_Price__c;
-                    ENTAim_Price__c2 = amountMap.ENT[1].Aim_Price__c;
-                    ENTAim_Price__c3 = amountMap.ENT[2].Aim_Price__c;
-                } 
-                component.find('select_ENT1').set('v.value',ENTProduct_Category1);
-                component.find('select_ENT2').set('v.value',ENTProduct_Category2);
-                component.find('select_ENT3').set('v.value',ENTProduct_Category3);
-                component.find('select_ENT4_1').set('v.value',ENTAim_Price__c1);
-                component.find('select_ENT4_2').set('v.value',ENTAim_Price__c2);
-                component.find('select_ENT4_3').set('v.value',ENTAim_Price__c3);
-
-    		}
-    	});
-		$A.enqueueAction(action);
-        console.log(JSON.stringify(component.find('input-hos').get("v.body")[0].get('v')));
-    },
-
-    getOCMTerm : function() {
-        var today = new Date();
-        var year = today.getFullYear();
-        var month = today.getMonth();
-
-        if (month < 3) year -= 1;
-        var thisYearOCMPeriod = String(year - 1867) + 'P';
-
-        return thisYearOCMPeriod;
-    },
-
-    createTarget : function(component, event, helper) {
-    	var action = component.get("c.createSFTarget");
-    	// alert(component.get("v.GIAmount"));
-
-
-
-        var  p1_1 = component.find('select_GI4_1').get('v.value') ; 
-        var  p1_2 = component.find('select_GI4_2').get('v.value') ;
-        var  p1_3 = component.find('select_GI4_3').get('v.value') ;
-
-        if (p1_1 == undefined || p1_1 == "") {
-            p1_1 = 0;
-        }
-        if (p1_2 == undefined || p1_2 == "") {
-            p1_2 = 0;
-        }
-        if (p1_3 == undefined || p1_3 == "") {
-            p1_3 = 0;
-        }
-        console.warn(p1_1+"-"+p1_2+"-"+p1_3);
-
-        var  p2_1 = component.find('select_ET4_1').get('v.value') ; 
-        var  p2_2 = component.find('select_ET4_2').get('v.value') ;
-        var  p2_3 = component.find('select_ET4_3').get('v.value') ;
-        if (p2_1 == undefined || p2_1 == "") {
-            p2_1 = 0;
-        }
-        if (p2_2 == undefined || p2_2 == "") {
-            p2_2 = 0;
-        }
-        if (p2_3 == undefined || p2_3 == "") {
-            p2_3 = 0;
-        }
-
-
-        var  p3_1 = component.find('select_BF4_1').get('v.value') ; 
-        var  p3_2 = component.find('select_BF4_2').get('v.value') ;
-        var  p3_3 = component.find('select_BF4_3').get('v.value') ;
-        if (p3_1 == undefined || p3_1 == "") {
-            p3_1 = 0;
-        }
-        if (p3_2 == undefined || p3_2 == "") {
-            p3_2 = 0;
-        }
-        if (p3_3 == undefined || p3_3 == "") {
-            p3_3 = 0;
-        }
-
-
-
-        var  p4_1 = component.find('select_OTH4_1').get('v.value') ; 
-        var  p4_2 = component.find('select_OTH4_2').get('v.value') ;
-        var  p4_3 = component.find('select_OTH4_3').get('v.value') ;
-        if (p4_1 == undefined || p4_1 == "") {
-            p4_1 = 0;
-        }
-        if (p4_2 == undefined || p4_2 == "") {
-            p4_2 = 0;
-        }
-        if (p4_3 == undefined || p4_3 == "") {
-            p4_3 = 0;
-        }
-
-
-
-        var  p5_1 = component.find('select_GS4_1').get('v.value') ; 
-        var  p5_2 = component.find('select_GS4_2').get('v.value') ;
-        var  p5_3 = component.find('select_GS4_3').get('v.value') ;
-        if (p5_1 == undefined || p5_1 == "") {
-            p5_1 = 0;
-        }
-        if (p5_2 == undefined || p5_2 == "") {
-            p5_2 = 0;
-        }
-        if (p5_3 == undefined || p5_3 == "") {
-            p5_3 = 0;
-        }
-
-
-
-        var  p6_1 = component.find('select_URO4_1').get('v.value') ; 
-        var  p6_2 = component.find('select_URO4_2').get('v.value') ;
-        var  p6_3 = component.find('select_URO4_3').get('v.value') ;
-        if (p6_1 == undefined || p6_1 == "") {
-            p6_1 = 0;
-        }
-        if (p6_2 == undefined || p6_2 == "") {
-            p6_2 = 0;
-        }
-        if (p6_3 == undefined || p6_3 == "") {
-            p6_3 = 0;
-        }
-
-        var  p7_1 = component.find('select_GYN4_1').get('v.value') ; 
-        var  p7_2 = component.find('select_GYN4_2').get('v.value') ;
-        var  p7_3 = component.find('select_GYN4_3').get('v.value') ;
-        if (p7_1 == undefined || p7_1 == "") {
-            p7_1 = 0;
-        }
-        if (p7_2 == undefined || p7_2 == "") {
-            p7_2 = 0;
-        }
-        if (p7_3 == undefined || p7_3 == "") {
-            p7_3 = 0;
-        }
-
-
-
-        var  p8_1 = component.find('select_ENT4_1').get('v.value') ; 
-        var  p8_2 = component.find('select_ENT4_2').get('v.value') ;
-        var  p8_3 = component.find('select_ENT4_3').get('v.value') ;
-        if (p8_1 == undefined || p8_1 == "") {
-            p8_1 = 0;
-        }
-        if (p8_2 == undefined || p8_2 == "") {
-            p8_2 = 0;
-        }
-        if (p8_3 == undefined || p8_3 == "") {
-            p8_3 = 0;
-        }
-
-
-       
-       
-    	action.setParams({ 
-    						"hospitalId" : component.get("v.record.Agency_Hospital__c"), 
-    						"GIProduct" : [component.find('select_GI1').get('v.value'),component.find('select_GI2').get('v.value'),component.find('select_GI3').get('v.value'),p1_1,p1_2,p1_3], 
-    						"ETProduct" : [component.find('select_ET1').get('v.value'),component.find('select_ET2').get('v.value'),component.find('select_ET3').get('v.value'),p2_1, p2_2,p2_3 ], 
-    						"BFProduct" : [component.find('select_BF1').get('v.value'),component.find('select_BF2').get('v.value'),component.find('select_BF3').get('v.value'),p3_1 ,p3_2 ,p3_3 ],
-    						"OTHProduct" : [component.find('select_OTH1').get('v.value'),component.find('select_OTH2').get('v.value'),component.find('select_OTH3').get('v.value'),p4_1,p4_2 ,p4_3],
-    						"GSProduct" : [component.find('select_GS1').get('v.value'),component.find('select_GS2').get('v.value'),component.find('select_GS3').get('v.value'),p5_1,p5_2,p5_3],
-    						"UROProduct" : [component.find('select_URO1').get('v.value'),component.find('select_URO2').get('v.value'),component.find('select_URO3').get('v.value'),p6_1,p6_2 ,p6_2 ],
-    						"GYNProduct" : [component.find('select_GYN1').get('v.value'),component.find('select_GYN2').get('v.value'),component.find('select_GYN3').get('v.value'),p7_1,p7_2 ,p7_3 ],
-    						"ENTProduct" : [component.find('select_ENT1').get('v.value'),component.find('select_ENT2').get('v.value'),component.find('select_ENT3').get('v.value'),p8_1 ,p8_2 ,p8_3],
-                            "OCMTerm" : component.get("v.OCMTerm")
-    					});
-    	action.setCallback(this, function(response) {
-            console.warn(response);
-    		var state = response.getState();
-    		if (state === "SUCCESS") {
-    			var modal_window = component.find('modal_window');
-		        var modal_bg = component.find('modal_bg');
-		        $A.util.toggleClass(modal_window, 'disp_none');
-		        $A.util.toggleClass(modal_bg, 'disp_none');
-
-    			var toastEvent = $A.get("e.force:showToast");
-                toastEvent.setParams({
-                    "title": "鎴愬姛",
-                    "type":"success",
-                    "message": "淇濆瓨鎴愬姛"
-                });
-                toastEvent.fire();
-
-                $A.get('e.force:refreshView').fire();
-    		} else if (state === "INCOMPLETE") {
-    			var toastEvent = $A.get("e.force:showToast");
-                toastEvent.setParams({
-                    "title": "鏈畬鎴�!",
-                    "type":"error",
-                    "message": "鏈畬鎴�"
-                });
-                toastEvent.fire();
-    		} else if (state === "ERROR") {
-    			var errors = response.getError();
-    			var toastEvent = $A.get("e.force:showToast");
-                toastEvent.setParams({
-                    "title": "閿欒",
-                    "type":"error",
-                    "message": errors[0].message
-                });
-                toastEvent.fire();
-    			
-    		}
-		});
-		$A.enqueueAction(action);
-    },
-
-    warning : function(message) {
+        component
+          .find("select_BF1")
+          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+        component
+          .find("select_BF2")
+          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+        component
+          .find("select_BF3")
+          .set("v.options", JSON.parse(JSON.stringify(opts["BF"])));
+      } else if (state === "ERROR") {
+        var errors = response.getError();
         var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-            "title": "璀﹀憡!",
-            "message": message,
-            "type":"warning",
-            "duration" : "10000"
+          title: "閿欒",
+          type: "error",
+          message: errors[0].message
         });
         toastEvent.fire();
-    },
-    
-    error : function(message) {
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  toggle_report: function (component, event, helper) {
+    var modal_window = component.find("modal_window");
+    var modal_bg = component.find("modal_bg");
+    $A.util.toggleClass(modal_window, "disp_none");
+    $A.util.toggleClass(modal_bg, "disp_none");
+
+    if (
+      $A.util.hasClass(modal_window, "disp_none") &&
+      !component.get("v.recordId")
+    ) {
+      $A.get("e.force:refreshView").fire();
+    }
+  },
+
+  productcategoryChange: function (component, event, helper, dept, index) {
+    var cmpId = "select_" + dept;
+    var myId;
+    var o1Id;
+    var o2Id;
+    if (index == 1) {
+      myId = cmpId + "1";
+      o1Id = cmpId + "2";
+      o2Id = cmpId + "3";
+    } else if (index == 2) {
+      myId = cmpId + "2";
+      o1Id = cmpId + "1";
+      o2Id = cmpId + "3";
+    } else {
+      myId = cmpId + "3";
+      o1Id = cmpId + "1";
+      o2Id = cmpId + "2";
+    }
+
+    var product_category_id = component.find(myId).get("v.value");
+    var pcId1 = component.find(o1Id).get("v.value");
+    var pcId2 = component.find(o2Id).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(myId).set("v.value", "");
+    }
+  },
+
+  selectHos: function (component, event, helper) {
+    var accid = component.get("v.record.Agency_Hospital__c");
+    var action = component.get("c.getDeptAmount");
+    action.setParams({ hospitalId: accid });
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state === "SUCCESS") {
+        var amountMap = response.getReturnValue();
+        var GIProduct_Category1 = "";
+        var GIProduct_Category2 = "";
+        var GIProduct_Category3 = "";
+        var GIAim_Price__c1 = "";
+        var GIAim_Price__c2 = "";
+        var GIAim_Price__c3 = "";
+        if (amountMap.GI.length > 0) {
+          GIProduct_Category1 = amountMap.GI[0].Product_Category__c;
+          if (amountMap.GI.length > 1) {
+            GIProduct_Category2 = amountMap.GI[1].Product_Category__c;
+          }
+          if (amountMap.GI.length > 2) {
+            GIProduct_Category3 = amountMap.GI[2].Product_Category__c;
+          }
+          GIAim_Price__c1 = amountMap.GI[0].Aim_Price__c;
+          GIAim_Price__c2 = amountMap.GI[1].Aim_Price__c;
+          GIAim_Price__c3 = amountMap.GI[2].Aim_Price__c;
+          console.warn(
+            GIAim_Price__c1 + "-" + GIAim_Price__c2 + "-" + GIAim_Price__c3
+          );
+        }
+        component.find("select_GI1").set("v.value", GIProduct_Category1);
+        component.find("select_GI2").set("v.value", GIProduct_Category2);
+        component.find("select_GI3").set("v.value", GIProduct_Category3);
+        component.find("select_GI4_1").set("v.value", GIAim_Price__c1);
+        component.find("select_GI4_2").set("v.value", GIAim_Price__c2);
+        component.find("select_GI4_3").set("v.value", GIAim_Price__c3);
+
+        var ETProduct_Category1 = "";
+        var ETProduct_Category2 = "";
+        var ETProduct_Category3 = "";
+        var ETAim_Price__c1 = "";
+        var ETAim_Price__c2 = "";
+        var ETAim_Price__c3 = "";
+        if (amountMap.ET.length > 0) {
+          ETProduct_Category1 = amountMap.ET[0].Product_Category__c;
+          if (amountMap.ET.length > 1) {
+            ETProduct_Category2 = amountMap.ET[1].Product_Category__c;
+          }
+          if (amountMap.ET.length > 2) {
+            ETProduct_Category3 = amountMap.ET[2].Product_Category__c;
+          }
+          ETAim_Price__c1 = amountMap.ET[0].Aim_Price__c;
+          ETAim_Price__c2 = amountMap.ET[1].Aim_Price__c;
+          ETAim_Price__c3 = amountMap.ET[2].Aim_Price__c;
+        }
+        component.find("select_ET1").set("v.value", ETProduct_Category1);
+        component.find("select_ET2").set("v.value", ETProduct_Category2);
+        component.find("select_ET3").set("v.value", ETProduct_Category3);
+        component.find("select_ET4_1").set("v.value", ETAim_Price__c1);
+        component.find("select_ET4_2").set("v.value", ETAim_Price__c2);
+        component.find("select_ET4_3").set("v.value", ETAim_Price__c3);
+
+        var BFProduct_Category1 = "";
+        var BFProduct_Category2 = "";
+        var BFProduct_Category3 = "";
+        var BFAim_Price__c1 = "";
+        var BFAim_Price__c2 = "";
+        var BFAim_Price__c3 = "";
+        if (amountMap.BF.length > 0) {
+          BFProduct_Category1 = amountMap.BF[0].Product_Category__c;
+          if (amountMap.BF.length > 1) {
+            BFProduct_Category2 = amountMap.BF[1].Product_Category__c;
+          }
+          if (amountMap.BF.length > 2) {
+            BFProduct_Category3 = amountMap.BF[2].Product_Category__c;
+          }
+          BFAim_Price__c1 = amountMap.BF[0].Aim_Price__c;
+          BFAim_Price__c2 = amountMap.BF[1].Aim_Price__c;
+          BFAim_Price__c3 = amountMap.BF[2].Aim_Price__c;
+        }
+        component.find("select_BF1").set("v.value", BFProduct_Category1);
+        component.find("select_BF2").set("v.value", BFProduct_Category2);
+        component.find("select_BF3").set("v.value", BFProduct_Category3);
+        component.find("select_BF4_1").set("v.value", BFAim_Price__c1);
+        component.find("select_BF4_2").set("v.value", BFAim_Price__c2);
+        component.find("select_BF4_3").set("v.value", BFAim_Price__c3);
+
+        var OTHProduct_Category1 = "";
+        var OTHProduct_Category2 = "";
+        var OTHProduct_Category3 = "";
+        var OTHAim_Price__c1 = "";
+        var OTHAim_Price__c2 = "";
+        var OTHAim_Price__c3 = "";
+        if (amountMap.OTH.length > 0) {
+          OTHProduct_Category1 = amountMap.OTH[0].Product_Category__c;
+          if (amountMap.OTH.length > 1) {
+            OTHProduct_Category2 = amountMap.OTH[1].Product_Category__c;
+          }
+          if (amountMap.OTH.length > 2) {
+            OTHProduct_Category3 = amountMap.OTH[2].Product_Category__c;
+          }
+          OTHAim_Price__c1 = amountMap.OTH[0].Aim_Price__c;
+          OTHAim_Price__c2 = amountMap.OTH[1].Aim_Price__c;
+          OTHAim_Price__c3 = amountMap.OTH[2].Aim_Price__c;
+        }
+        component.find("select_OTH1").set("v.value", OTHProduct_Category1);
+        component.find("select_OTH2").set("v.value", OTHProduct_Category2);
+        component.find("select_OTH3").set("v.value", OTHProduct_Category3);
+        component.find("select_OTH4_1").set("v.value", OTHAim_Price__c1);
+        component.find("select_OTH4_2").set("v.value", OTHAim_Price__c2);
+        component.find("select_OTH4_3").set("v.value", OTHAim_Price__c3);
+
+        var GSProduct_Category1 = "";
+        var GSProduct_Category2 = "";
+        var GSProduct_Category3 = "";
+        var GSPAim_Price__c1 = "";
+        var GSPAim_Price__c2 = "";
+        var GSPAim_Price__c3 = "";
+        if (amountMap.GS.length > 0) {
+          GSProduct_Category1 = amountMap.GS[0].Product_Category__c;
+          if (amountMap.GS.length > 1) {
+            GSProduct_Category2 = amountMap.GS[1].Product_Category__c;
+          }
+          if (amountMap.GS.length > 2) {
+            GSProduct_Category3 = amountMap.GS[2].Product_Category__c;
+          }
+          GSPAim_Price__c1 = amountMap.GS[0].Aim_Price__c;
+          GSPAim_Price__c2 = amountMap.GS[1].Aim_Price__c;
+          GSPAim_Price__c3 = amountMap.GS[2].Aim_Price__c;
+        }
+        component.find("select_GS1").set("v.value", GSProduct_Category1);
+        component.find("select_GS2").set("v.value", GSProduct_Category2);
+        component.find("select_GS3").set("v.value", GSProduct_Category3);
+        component.find("select_GS4_1").set("v.value", GSPAim_Price__c1);
+        component.find("select_GS4_2").set("v.value", GSPAim_Price__c2);
+        component.find("select_GS4_3").set("v.value", GSPAim_Price__c3);
+
+        var UROProduct_Category1 = "";
+        var UROProduct_Category2 = "";
+        var UROProduct_Category3 = "";
+        var UROAim_Price__c1 = "";
+        var UROAim_Price__c2 = "";
+        var UROAim_Price__c3 = "";
+        if (amountMap.URO.length > 0) {
+          UROProduct_Category1 = amountMap.URO[0].Product_Category__c;
+          if (amountMap.URO.length > 1) {
+            UROProduct_Category2 = amountMap.URO[1].Product_Category__c;
+          }
+          if (amountMap.URO.length > 2) {
+            UROProduct_Category3 = amountMap.URO[2].Product_Category__c;
+          }
+          UROAim_Price__c1 = amountMap.URO[0].Aim_Price__c;
+          UROAim_Price__c2 = amountMap.URO[1].Aim_Price__c;
+          UROAim_Price__c3 = amountMap.URO[2].Aim_Price__c;
+        }
+        component.find("select_URO1").set("v.value", UROProduct_Category1);
+        component.find("select_URO2").set("v.value", UROProduct_Category2);
+        component.find("select_URO3").set("v.value", UROProduct_Category3);
+        component.find("select_URO4_1").set("v.value", UROAim_Price__c1);
+        component.find("select_URO4_2").set("v.value", UROAim_Price__c2);
+        component.find("select_URO4_3").set("v.value", UROAim_Price__c3);
+
+        var GYNProduct_Category1 = "";
+        var GYNProduct_Category2 = "";
+        var GYNProduct_Category3 = "";
+        var GYNAim_Price__c1 = "";
+        var GYNAim_Price__c2 = "";
+        var GYNAim_Price__c3 = "";
+        if (amountMap.GYN.length > 0) {
+          GYNProduct_Category1 = amountMap.GYN[0].Product_Category__c;
+          if (amountMap.GYN.length > 1) {
+            GYNProduct_Category2 = amountMap.GYN[1].Product_Category__c;
+          }
+          if (amountMap.GYN.length > 2) {
+            GYNProduct_Category3 = amountMap.GYN[2].Product_Category__c;
+          }
+          GYNAim_Price__c1 = amountMap.GYN[0].Aim_Price__c;
+          GYNAim_Price__c2 = amountMap.GYN[1].Aim_Price__c;
+          GYNAim_Price__c3 = amountMap.GYN[2].Aim_Price__c;
+        }
+        component.find("select_GYN1").set("v.value", GYNProduct_Category1);
+        component.find("select_GYN2").set("v.value", GYNProduct_Category2);
+        component.find("select_GYN3").set("v.value", GYNProduct_Category3);
+        component.find("select_GYN4_1").set("v.value", GYNAim_Price__c1);
+        component.find("select_GYN4_2").set("v.value", GYNAim_Price__c2);
+        component.find("select_GYN4_3").set("v.value", GYNAim_Price__c3);
+
+        var ENTProduct_Category1 = "";
+        var ENTProduct_Category2 = "";
+        var ENTProduct_Category3 = "";
+        var ENTAim_Price__c1 = "";
+        var ENTAim_Price__c2 = "";
+        var ENTAim_Price__c3 = "";
+        if (amountMap.ENT.length > 0) {
+          ENTProduct_Category1 = amountMap.ENT[0].Product_Category__c;
+          if (amountMap.ENT.length > 1) {
+            ENTProduct_Category2 = amountMap.ENT[1].Product_Category__c;
+          }
+          if (amountMap.ENT.length > 2) {
+            ENTProduct_Category3 = amountMap.ENT[2].Product_Category__c;
+          }
+          ENTAim_Price__c1 = amountMap.ENT[0].Aim_Price__c;
+          ENTAim_Price__c2 = amountMap.ENT[1].Aim_Price__c;
+          ENTAim_Price__c3 = amountMap.ENT[2].Aim_Price__c;
+        }
+        component.find("select_ENT1").set("v.value", ENTProduct_Category1);
+        component.find("select_ENT2").set("v.value", ENTProduct_Category2);
+        component.find("select_ENT3").set("v.value", ENTProduct_Category3);
+        component.find("select_ENT4_1").set("v.value", ENTAim_Price__c1);
+        component.find("select_ENT4_2").set("v.value", ENTAim_Price__c2);
+        component.find("select_ENT4_3").set("v.value", ENTAim_Price__c3);
+      }
+    });
+    $A.enqueueAction(action);
+    console.log(
+      JSON.stringify(component.find("input-hos").get("v.body")[0].get("v"))
+    );
+  },
+
+  getOCMTerm: function () {
+    var today = new Date();
+    var year = today.getFullYear();
+    var month = today.getMonth();
+
+    if (month < 3) year -= 1;
+    var thisYearOCMPeriod = String(year - 1867) + "P";
+
+    return thisYearOCMPeriod;
+  },
+
+  createTarget: function (component, event, helper) {
+    var action = component.get("c.createSFTarget");
+    // alert(component.get("v.GIAmount"));
+
+    var p1_1 = component.find("select_GI4_1").get("v.value");
+    var p1_2 = component.find("select_GI4_2").get("v.value");
+    var p1_3 = component.find("select_GI4_3").get("v.value");
+
+    if (p1_1 == undefined || p1_1 == "") {
+      p1_1 = 0;
+    }
+    if (p1_2 == undefined || p1_2 == "") {
+      p1_2 = 0;
+    }
+    if (p1_3 == undefined || p1_3 == "") {
+      p1_3 = 0;
+    }
+    console.warn(p1_1 + "-" + p1_2 + "-" + p1_3);
+
+    var p2_1 = component.find("select_ET4_1").get("v.value");
+    var p2_2 = component.find("select_ET4_2").get("v.value");
+    var p2_3 = component.find("select_ET4_3").get("v.value");
+    if (p2_1 == undefined || p2_1 == "") {
+      p2_1 = 0;
+    }
+    if (p2_2 == undefined || p2_2 == "") {
+      p2_2 = 0;
+    }
+    if (p2_3 == undefined || p2_3 == "") {
+      p2_3 = 0;
+    }
+
+    var p3_1 = component.find("select_BF4_1").get("v.value");
+    var p3_2 = component.find("select_BF4_2").get("v.value");
+    var p3_3 = component.find("select_BF4_3").get("v.value");
+    if (p3_1 == undefined || p3_1 == "") {
+      p3_1 = 0;
+    }
+    if (p3_2 == undefined || p3_2 == "") {
+      p3_2 = 0;
+    }
+    if (p3_3 == undefined || p3_3 == "") {
+      p3_3 = 0;
+    }
+
+    var p4_1 = component.find("select_OTH4_1").get("v.value");
+    var p4_2 = component.find("select_OTH4_2").get("v.value");
+    var p4_3 = component.find("select_OTH4_3").get("v.value");
+    if (p4_1 == undefined || p4_1 == "") {
+      p4_1 = 0;
+    }
+    if (p4_2 == undefined || p4_2 == "") {
+      p4_2 = 0;
+    }
+    if (p4_3 == undefined || p4_3 == "") {
+      p4_3 = 0;
+    }
+
+    var p5_1 = component.find("select_GS4_1").get("v.value");
+    var p5_2 = component.find("select_GS4_2").get("v.value");
+    var p5_3 = component.find("select_GS4_3").get("v.value");
+    if (p5_1 == undefined || p5_1 == "") {
+      p5_1 = 0;
+    }
+    if (p5_2 == undefined || p5_2 == "") {
+      p5_2 = 0;
+    }
+    if (p5_3 == undefined || p5_3 == "") {
+      p5_3 = 0;
+    }
+
+    var p6_1 = component.find("select_URO4_1").get("v.value");
+    var p6_2 = component.find("select_URO4_2").get("v.value");
+    var p6_3 = component.find("select_URO4_3").get("v.value");
+    if (p6_1 == undefined || p6_1 == "") {
+      p6_1 = 0;
+    }
+    if (p6_2 == undefined || p6_2 == "") {
+      p6_2 = 0;
+    }
+    if (p6_3 == undefined || p6_3 == "") {
+      p6_3 = 0;
+    }
+
+    var p7_1 = component.find("select_GYN4_1").get("v.value");
+    var p7_2 = component.find("select_GYN4_2").get("v.value");
+    var p7_3 = component.find("select_GYN4_3").get("v.value");
+    if (p7_1 == undefined || p7_1 == "") {
+      p7_1 = 0;
+    }
+    if (p7_2 == undefined || p7_2 == "") {
+      p7_2 = 0;
+    }
+    if (p7_3 == undefined || p7_3 == "") {
+      p7_3 = 0;
+    }
+
+    var p8_1 = component.find("select_ENT4_1").get("v.value");
+    var p8_2 = component.find("select_ENT4_2").get("v.value");
+    var p8_3 = component.find("select_ENT4_3").get("v.value");
+    if (p8_1 == undefined || p8_1 == "") {
+      p8_1 = 0;
+    }
+    if (p8_2 == undefined || p8_2 == "") {
+      p8_2 = 0;
+    }
+    if (p8_3 == undefined || p8_3 == "") {
+      p8_3 = 0;
+    }
+
+    action.setParams({
+      hospitalId: component.get("v.record.Agency_Hospital__c"),
+      GIProduct: [
+        component.find("select_GI1").get("v.value"),
+        component.find("select_GI2").get("v.value"),
+        component.find("select_GI3").get("v.value"),
+        p1_1,
+        p1_2,
+        p1_3
+      ],
+      ETProduct: [
+        component.find("select_ET1").get("v.value"),
+        component.find("select_ET2").get("v.value"),
+        component.find("select_ET3").get("v.value"),
+        p2_1,
+        p2_2,
+        p2_3
+      ],
+      BFProduct: [
+        component.find("select_BF1").get("v.value"),
+        component.find("select_BF2").get("v.value"),
+        component.find("select_BF3").get("v.value"),
+        p3_1,
+        p3_2,
+        p3_3
+      ],
+      OTHProduct: [
+        component.find("select_OTH1").get("v.value"),
+        component.find("select_OTH2").get("v.value"),
+        component.find("select_OTH3").get("v.value"),
+        p4_1,
+        p4_2,
+        p4_3
+      ],
+      GSProduct: [
+        component.find("select_GS1").get("v.value"),
+        component.find("select_GS2").get("v.value"),
+        component.find("select_GS3").get("v.value"),
+        p5_1,
+        p5_2,
+        p5_3
+      ],
+      UROProduct: [
+        component.find("select_URO1").get("v.value"),
+        component.find("select_URO2").get("v.value"),
+        component.find("select_URO3").get("v.value"),
+        p6_1,
+        p6_2,
+        p6_2
+      ],
+      GYNProduct: [
+        component.find("select_GYN1").get("v.value"),
+        component.find("select_GYN2").get("v.value"),
+        component.find("select_GYN3").get("v.value"),
+        p7_1,
+        p7_2,
+        p7_3
+      ],
+      ENTProduct: [
+        component.find("select_ENT1").get("v.value"),
+        component.find("select_ENT2").get("v.value"),
+        component.find("select_ENT3").get("v.value"),
+        p8_1,
+        p8_2,
+        p8_3
+      ],
+      OCMTerm: component.get("v.OCMTerm")
+    });
+    action.setCallback(this, function (response) {
+      console.warn(response);
+      var state = response.getState();
+      if (state === "SUCCESS") {
+        var modal_window = component.find("modal_window");
+        var modal_bg = component.find("modal_bg");
+        $A.util.toggleClass(modal_window, "disp_none");
+        $A.util.toggleClass(modal_bg, "disp_none");
+
         var toastEvent = $A.get("e.force:showToast");
         toastEvent.setParams({
-            "title": "閿欒!",
-            "message": message,
-            "type":"error",
-            "duration" : "10000"
+          title: "鎴愬姛",
+          type: "success",
+          message: "淇濆瓨鎴愬姛"
         });
         toastEvent.fire();
-    },
 
-})
\ No newline at end of file
+        $A.get("e.force:refreshView").fire();
+      } else if (state === "INCOMPLETE") {
+        var toastEvent = $A.get("e.force:showToast");
+        toastEvent.setParams({
+          title: "鏈畬鎴�!",
+          type: "error",
+          message: "鏈畬鎴�"
+        });
+        toastEvent.fire();
+      } else if (state === "ERROR") {
+        var errors = response.getError();
+        var toastEvent = $A.get("e.force:showToast");
+        toastEvent.setParams({
+          title: "閿欒",
+          type: "error",
+          message: errors[0].message
+        });
+        toastEvent.fire();
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  warning: function (message) {
+    var toastEvent = $A.get("e.force:showToast");
+    toastEvent.setParams({
+      title: "璀﹀憡!",
+      message: message,
+      type: "warning",
+      duration: "10000"
+    });
+    toastEvent.fire();
+  },
+
+  error: function (message) {
+    var toastEvent = $A.get("e.force:showToast");
+    toastEvent.setParams({
+      title: "閿欒!",
+      message: message,
+      type: "error",
+      duration: "10000"
+    });
+    toastEvent.fire();
+  }
+});
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.auradoc b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.auradoc
new file mode 100644
index 0000000..d0d6eb5
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.auradoc
@@ -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>
\ No newline at end of file
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
new file mode 100644
index 0000000..8d41f3d
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp
@@ -0,0 +1,220 @@
+<!--
+  @description       : 
+  @author            : ChangeMeIn@UserSettingsUnder.SFDoc
+  @group             : 
+  @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:attribute name="recordId" type="Id" default="" />
+  <aura:attribute name="recordTypeId" type="Id" default="" />
+  <aura:attribute name="ac_name" type="string" />
+  <aura:attribute name="title" type="string" />
+  <aura:handler name="init" value="{!this}" action="{!c.doInit}" />
+  <aura:attribute name="layout" type="LayoutDescriberHelper.LayoutWrapper" />
+  <aura:attribute name="record_data" type="Map" />
+  <aura:attribute name="section_names" type="List" />
+  <aura:attribute name="showSpinner" type="Boolean" default="False" />
+  <aura:attribute name="showSpinner2" type="Boolean" default="False" />
+  <aura:attribute name="staticResource" type="Map" />
+  <aura:attribute name="pi_fields_map" type="Map" />
+  <aura:attribute name="isClone" type="Boolean" default="False" />
+  <ltng:require scripts="{! $Resource.AWSService+'/AWSService.js' }" />
+  <ltng:require scripts="{! $Resource.jquery183minjs }" />
+  <aura:attribute name="isModalOpen" type="boolean" default="false" />
+  <aura:attribute name="searchKeyWord" type="string" default="" />
+  <aura:attribute name="contactAWSIds" type="List" />
+  <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}"
+  />
+
+  <div class="{! v.container_class}">
+    <!-- header -->
+    <header class="slds-modal__header">
+      <h2 id="modal-heading-01" class="slds-modal__title slds-hyphenate">
+        {!v.title}
+      </h2>
+    </header>
+
+    <div class="slds-modal__content slds-p-around_medium">
+      <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"
+        >
+          <aura:iteration items="{!v.layout}" var="section">
+            <aura:if isTrue="{! section.editHeading }">
+              <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>
+                    <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: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>
+            </aura:if>
+          </aura:iteration>
+        </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>
+    </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"
+      >
+        <aura:renderIf isTrue="{!v.login}">
+          <div class="slds-spinner_container height100vh">
+            <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>
+        </aura:renderIf>
+
+        <div class="slds-modal__container">
+          <!-- Modal/Popup Box Header Starts here-->
+          <header class="slds-modal__header">
+            <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"
+            >
+              鎼滅储瀹㈡埛浜哄憳
+            </h2>
+          </header>
+
+          <!--Modal Body Start here-->
+          <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}"
+                />
+              </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"
+                />
+              </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}"
+                />
+              </lightning:layoutItem>
+            </lightning:layout>
+            <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"
+            >
+              <c:NewAgencyContact2 />
+            </section>
+          </aura:if>
+        </div>
+      </section>
+      <div class="slds-backdrop slds-backdrop_open"></div>
+    </aura:if>
+  </div>
+</aura:component>
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml
new file mode 100644
index 0000000..2c30e5a
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.cmp-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<AuraDefinitionBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <apiVersion>54.0</apiVersion>
+    <description>A Lightning Component Bundle</description>
+</AuraDefinitionBundle>
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
new file mode 100644
index 0000000..fd6b83a
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunity.css
@@ -0,0 +1,63 @@
+.THIS {
+}
+
+.THIS .name {
+  margin-right: 0.5cm;
+}
+
+.THIS .wh {
+  width: 670px;
+  height: 500px;
+}
+
+.THIS .slds-modal__container {
+  max-width: 70rem !important;
+  width: 90% !important;
+}
+
+.THIS .modal-body {
+  height: 500px !important;
+  max-height: 500px !important;
+}
+
+.THIS table {
+  border-collapse: collapse;
+  border-spacing: 0;
+  width: 98%;
+  margin-left: 5px;
+  /* border: 1px solid #000000; */
+  text-align: center;
+}
+.THIS tr {
+  /* border: 1px solid #000000; */
+  text-align: center;
+}
+.THIS td {
+  /* border: 1px solid #000000; */
+  text-align: center;
+}
+
+.THIS th {
+  /* border: 1px solid #000000; */
+  text-align: center;
+}
+
+.THIS.backgroundInverse {
+  position: relative;
+  background-color: #16325c;
+  height: 80px;
+}
+
+.THIS.exampleHolder {
+  position: relative;
+  display: inline-block;
+  margin-left: 15px;
+  width: 55px;
+  vertical-align: middle;
+  white-space: nowrap;
+}
+
+.THIS .searchButton {
+  margin-top: 20px;
+  margin-left: 20px;
+}
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
new file mode 100644
index 0000000..88b3795
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityController.js
@@ -0,0 +1,309 @@
+({
+  doInit: function (component, event, helper) {
+    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");
+    if (!record_type_id && pageref) {
+      record_type_id = pageref.state.recordTypeId
+        ? pageref.state.recordTypeId
+        : "";
+    }
+
+    let isClone = component.get("v.isClone");
+    if (!rid || isClone) {
+      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") + "缁忛攢鍟嗚浠�");
+    }
+    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",
+      {
+        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") {
+          var rv = data.getReturnValue();
+          console.log(rv);
+          if (rv.IsSuccess) {
+            debugger;
+            let layout = JSON.parse(rv.Data.layout);
+            let fields = rv.Data.fields;
+            let staticResource = JSON.parse(rv.Data.staticResource);
+            let section_names = [];
+            // let awsData = rv.Data.awsDataIds;
+            section_names = layout.map((s) => s.label);
+            component.set("v.section_names", section_names);
+
+            let m = {};
+            for (let f of staticResource.PIDetails) {
+              m[f.SF_Field_API_Name__c] = f;
+            }
+            component.set("v.pi_fields_map", m);
+
+            if (rv.Data && rv.Data.data) {
+              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);
+
+              if (rv.Data.data.Agency_Contact__r) {
+                if (rv.Data.data.Agency_Contact__r.AWS_Data_Id__c) {
+                  helper.AwsGet(
+                    staticResource.queryUrl,
+                    {
+                      dataId: rv.Data.data.Agency_Contact__r.AWS_Data_Id__c
+                    },
+                    function (data) {
+                      console.log("data = " + data);
+                      if (data.object) {
+                        component.set("v.ac_name", data.object.name);
+                      }
+                    },
+                    staticResource.token
+                  );
+                }
+              }
+
+              // }, staticResource.token);
+            } else {
+              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
+                    ) {
+                      item.value = pid;
+                    }
+                  }
+                }
+              }
+              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"
+            });
+          }
+        } 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 url = staticResource.newUrl;
+    let payloadPi = {};
+    if (record_id && !isClone) {
+      url = staticResource.updateUrl;
+      payloadPi["dataId"] = component.get("v.record_data").AWS_Data_Id__c;
+    }
+    let layout = component.get("v.layout");
+
+    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;
+          }
+
+          if (item.behavior == "Required" && !item.value) {
+            let fs = component.find("field");
+            for (let fi in fs) {
+              let f = fs[fi];
+              if (!f.get("v.value")) {
+                f.reset();
+              }
+            }
+            return;
+          }
+        }
+      }
+    }
+
+    component.set("v.showSpinner", true);
+    debugger;
+    let data = {};
+    if (record_id && !isClone) {
+      data.Id = record_id;
+    }
+    for (let s of layout) {
+      for (let c of s.layoutColumns) {
+        for (let item of c.layoutItems) {
+          if (item.field && item.behavior != "Readonly") {
+            data[item.field] = item.value;
+          }
+        }
+      }
+    }
+    let x = 1;
+    helper.CallBackAction(
+      component,
+      "Save",
+      {
+        data: data,
+        transId: "1",
+        recordTypeId: record_type_id
+      },
+      function (data) {
+        component.set("v.showSpinner", false);
+        if (data.getState() == "SUCCESS") {
+          var rv = data.getReturnValue();
+          console.log(rv);
+          var sfId = null;
+          if (rv.IsSuccess) {
+            sfId = rv.Data.recordId;
+            helper.ShowToast({
+              message: "鎴愬姛",
+              type: "success"
+            });
+            if (record_id) {
+              $A.get("e.force:closeQuickAction").fire();
+              $A.get("e.force:refreshView").fire();
+            } else {
+              var sObjectEvent = $A.get("e.force:navigateToSObject");
+              sObjectEvent.setParams({
+                recordId: sfId
+              });
+              sObjectEvent.fire();
+            }
+          } else {
+            helper.ShowToast({
+              message: rv.Message,
+              type: "error"
+            });
+          }
+        } else {
+          helper.ShowToast({
+            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);
+    helper.resetTable();
+    helper.preparePayloadForSearchAgencyContact(component, event, helper);
+  },
+  initContactTable: function (component, event, helper) {
+    let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
+    let contactInfoList = [];
+    let awsDataIds = [];
+    let data = component.get("v.result");
+    if (data.object) {
+      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.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 = "";
+          contactInfoList.push(contactInfo);
+        }
+      }
+    }
+    let AWSIdToSFIdMapValue = {};
+  },
+  openModel: function (component, event, helper) {
+    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);
+            helper.ShowToast({
+              message: "璇峰厛閫夋嫨缁忛攢鍟嗗尰闄�",
+              type: "warning"
+            });
+            return;
+          }
+        }
+      }
+    }
+    // Set isModalOpen true
+    component.set("v.isModalOpen", true);
+    component.find("button").set("v.disabled", true);
+    helper.preparePayloadForSearchAgencyContact(component, event, helper);
+  },
+
+  closeModel: function (component, event, helper) {
+    // Set isModalOpen false
+    component.set("v.isModalOpen", false);
+  },
+
+  saveDetails: function (component, event, helper) {
+    //do something
+    component.set("v.isModalOpen", false);
+  },
+
+  showNewAgency: function (component, event, helper) {
+    //do something
+    component.set("v.showNewAgencyContact", true);
+  },
+  closeAgencyContact: function (component, event, helper) {
+    var message = event.getParam("showNewAgencyContact");
+    component.set("v.showNewAgencyContact", message);
+    component.find("button").set("v.disabled", true);
+    helper.resetTable();
+    helper.preparePayloadForSearchAgencyContact(component, event, helper);
+  }
+});
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js
new file mode 100644
index 0000000..b861d13
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityHelper.js
@@ -0,0 +1,281 @@
+({
+  CallBackAction: function (component, action_name, para, callback) {
+    var action = component.get(
+      "c." + action_name.trimStart().replace("c.", "")
+    );
+    if (para) {
+      action.setParams(para);
+    }
+    if (callback) {
+      action.setCallback(this, function (data) {
+        callback(data);
+      });
+    }
+
+    $A.enqueueAction(action);
+  },
+  ShowToast: function (paras) {
+    var toastEvent = $A.get("e.force:showToast");
+    toastEvent.setParams(paras);
+    toastEvent.fire();
+  },
+  AwsPost: function (postURL, data, callback, token) {
+    let payloadForNewPI = "";
+    if (typeof data == "string") {
+      payloadForNewPI = data;
+    } else {
+      payloadForNewPI = JSON.stringify(data);
+    }
+
+    AWSService.post(
+      postURL,
+      payloadForNewPI,
+      function (result) {
+        //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+        if (callback) callback(result);
+      },
+      token
+    );
+  },
+  AwsGet: function (url, data, callback, token) {
+    if (typeof data == "string") {
+      url += data;
+    } else {
+      let i = 0;
+      for (let p in data) {
+        url += i++ ? "&" : "?";
+        url += p + "=" + data[p];
+      }
+    }
+
+    AWSService.get(
+      url,
+      function (result) {
+        //this.insertCalloutLog(this.insertModule,postURL,JSON.stringify(payloadForNewPI),JSON.stringify(result),this.successStatus);
+        if (callback) callback(result);
+      },
+      token
+    );
+  },
+  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");
+    table.appendChild(tableBody);
+    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");
+      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");
+      tableBody.appendChild(tr);
+      let contactInfoTemp = contactInfoList[i];
+      for (let j = 0; j < cols.length; j++) {
+        let td = document.createElement("TD");
+        td.width = "75";
+        if (contactInfoTemp.pi) {
+          if (!contactsInfo.hasOwnProperty(contactInfoTemp.AWSDataId)) {
+            continue;
+          }
+          if (j == 0 && contactsInfo[contactInfoTemp.AWSDataId]) {
+            td.id = contactsInfo[contactInfoTemp.AWSDataId].Id;
+          }
+        } else {
+          td.id = contactInfoTemp.sfRecordId;
+        }
+        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);
+          });
+        }
+        tr.appendChild(td);
+      }
+    }
+    myTableDiv.appendChild(table);
+    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");
+    for (let s of layout) {
+      for (let c of s.layoutColumns) {
+        for (let item of c.layoutItems) {
+          if (item.field == "Agency_Contact__c") {
+            item.value = id;
+          }
+        }
+      }
+    }
+    component.set("v.isModalOpen", false);
+  },
+  resetTable: function () {
+    let queryResult = document.getElementById("QueryResult");
+    let table = document.getElementsByTagName("table");
+    if (table.length > 1) {
+      for (var i = 1; i < table.length; i++) {
+        queryResult.removeChild(table[i]);
+      }
+    }
+  },
+  preparePayloadForSearchAgencyContact: function (component, event, helper) {
+    let that = this;
+    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") {
+            agencyHospitalId = item.value;
+          }
+          if (item.field == "Account_Opp__c") {
+            accountId = item.value;
+          }
+        }
+      }
+    }
+    var action = component.get("c.getAWSDataIds");
+    action.setParams({
+      agencyHospitalId: agencyHospitalId,
+      accountId: accountId
+    });
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state == "SUCCESS") {
+        var rv = response.getReturnValue();
+        if (rv.Data.length == 0) {
+          component.find("button").set("v.disabled", false);
+          helper.ShowToast({
+            message: "璇ョ粡閿�鍟嗗尰闄笅闈㈡病鏈夊鎴蜂汉鍛�",
+            type: "warning"
+          });
+          return;
+        }
+        let searchPayload = new Object();
+        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");
+        let url = staticResource.searchUrl;
+        let token = staticResource.token;
+        this.AwsPost(
+          url,
+          searchPayload,
+          function (data) {
+            if (data.success) {
+              let cols = ["Name", "AgencyHospital", "DoctorDivision1", "Type"];
+              let contactInfoList = [];
+              let awsDataIds = [];
+              if (data.object.length == 0) {
+                component.find("button").set("v.disabled", false);
+                that.ShowToast({
+                  message: "娌℃湁鏌ヨ鍒拌瀹㈡埛浜哄憳",
+                  type: "warning"
+                });
+                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.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 = "";
+                  contactInfoList.push(contactInfo);
+                }
+              }
+              //let AWSIdToSFIdMapValue = {};
+              var searchAgencyContacts = component.get(
+                "c.searchAgencyContacts"
+              );
+              searchAgencyContacts.setParams({
+                awsAgencyContactIds: JSON.stringify(awsDataIds),
+                agencyHospitalId: agencyHospitalId,
+                accountId: accountId
+              });
+              searchAgencyContacts.setCallback(this, function (response) {
+                var state = response.getState();
+                if (state == "SUCCESS") {
+                  var rv = response.getReturnValue();
+                  if (rv.IsSuccess) {
+                    let contactsInfo = "";
+                    if (rv.Data) {
+                      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"]];
+                          if (contactFromSF) {
+                            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"
+                                ];
+                            }
+                          }
+                        }
+                      }
+                    }
+                    that.refreshTable(
+                      component,
+                      event,
+                      helper,
+                      cols,
+                      contactInfoList,
+                      contactsInfo
+                    );
+                  }
+                }
+              });
+              $A.enqueueAction(searchAgencyContacts);
+            }
+          },
+          token
+        );
+      }
+    });
+    $A.enqueueAction(action);
+  }
+});
diff --git a/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js
new file mode 100644
index 0000000..aa209d1
--- /dev/null
+++ b/force-app/main/default/aura/NewAgencyOpportunity/NewAgencyOpportunityRenderer.js
@@ -0,0 +1,3 @@
+({
+  // Your renderer method overrides go here
+});
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
index 2685ae9..2eef9b1 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReport.cmp
@@ -1,292 +1,465 @@
-<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: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"/>
-    <aura:attribute name="OCMSale_Price__c_o" type="String"/>
-    <aura:attribute name="StageName__c_o" type="String"/>
-    <aura:attribute name="fieldsmap" type="Map"/>
-    <aura:attribute name="alldata" type="List"/>
-    <aura:attribute name="allselectlist" type="Map"/>
-    <aura:attribute name="doclist" type="List"/>
-    <aura:attribute name="docmap" type="Map"/>
-    <aura:attribute name="login" type="Boolean" default="false"/>
-    <aura:attribute name="loadOpp" type="Boolean" default="false"/>
-    <aura:attribute name="reportPageData" type="Map"/>
-    <aura:attribute name="selectbody" type="String"/>
-    <aura:attribute name="report_date_list" type="Map"/>
-    <aura:attribute name="selected_date" type="String"/>
-    <aura:attribute name="selected_agency_person" type="String"/>
-    <aura:attribute name="agency_report_header" type="String"/>
-    <aura:attribute name="agency_report_header_id" type="String"/>
-    <aura:attribute name="result" type="String" default=""/>
-    <aura:attribute name="hospital" type="string" default=""/>
-    <aura:attribute name="hospitalId" type="string" default=""/>
-    <aura:attribute name="hospitalLinkId" type="string" default=""/>
-    <aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}"/>
-    <aura:attribute name="hospitalList" type="Map" />
-    <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:attribute name="edit_copy_select_report_id" type="String"/>
-    <aura:attribute name="create_agency_report_id" type="String"/>
-    <aura:attribute name="reports" type="List"/>
-    <aura:attribute name="reports_now" type="List"/>
-    <aura:attribute name="reports_now_count" type="Integer"/>
-    <aura:attribute name="mode" type="String"/>
-    <aura:attribute name="select_report_data" type="Map"/>
-    <aura:attribute name="select_report_data_radio" type="Map"/>
-    <aura:attribute name="default_select_doctor_id" type="String"/>
-    <aura:attribute name="default_select_opportunity_id" type="String"/>
-    <aura:attribute name="report_count" type="Integer"/>
-    <aura:attribute name="dialog_type" type="String"/>
-    <aura:attribute name="truthy" type="Boolean" default="false"/>
-    <aura:attribute name="list_message" type="String" default="鎼滅储" />
-    <aura:attribute name="confirm_status" type="Integer" default="0" />
-    <aura:attribute name="modal_confirm_title" type="String" />
-    <aura:attribute name="modal_confirm_text" type="String" />
-    <aura:attribute name="opportunity_cfilter" type="String" />
-    <!-- <aura:handler name="change" value="{!v.data.Product_Category1__c}" action="{!c.productcategoryChange1}"/>
+<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: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" />
+  <aura:attribute name="OCMSale_Price__c_o" type="String" />
+  <aura:attribute name="StageName__c_o" type="String" />
+  <aura:attribute name="fieldsmap" type="Map" />
+  <aura:attribute name="alldata" type="List" />
+  <aura:attribute name="allselectlist" type="Map" />
+  <aura:attribute name="doclist" type="List" />
+  <aura:attribute name="docmap" type="Map" />
+  <aura:attribute name="login" type="Boolean" default="false" />
+  <aura:attribute name="loadOpp" type="Boolean" default="false" />
+  <aura:attribute name="reportPageData" type="Map" />
+  <aura:attribute name="selectbody" type="String" />
+  <aura:attribute name="report_date_list" type="Map" />
+  <aura:attribute name="selected_date" type="String" />
+  <aura:attribute name="selected_agency_person" type="String" />
+  <aura:attribute name="agency_report_header" type="String" />
+  <aura:attribute name="agency_report_header_id" type="String" />
+  <aura:attribute name="result" type="String" default="" />
+  <aura:attribute name="hospital" type="string" default="" />
+  <aura:attribute name="hospitalId" type="string" default="" />
+  <aura:attribute name="hospitalLinkId" type="string" default="" />
+  <aura:handler name="change" value="{!v.hospital}" action="{!c.hosChange}" />
+  <aura:attribute name="hospitalList" type="Map" />
+  <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:attribute name="edit_copy_select_report_id" type="String" />
+  <aura:attribute name="create_agency_report_id" type="String" />
+  <aura:attribute name="reports" type="List" />
+  <aura:attribute name="reports_now" type="List" />
+  <aura:attribute name="reports_now_count" type="Integer" />
+  <aura:attribute name="mode" type="String" />
+  <aura:attribute name="select_report_data" type="Map" />
+  <aura:attribute name="select_report_data_radio" type="Map" />
+  <aura:attribute name="default_select_doctor_id" type="String" />
+  <aura:attribute name="default_select_opportunity_id" type="String" />
+  <aura:attribute name="report_count" type="Integer" />
+  <aura:attribute name="dialog_type" type="String" />
+  <aura:attribute name="truthy" type="Boolean" default="false" />
+  <aura:attribute name="list_message" type="String" default="鎼滅储" />
+  <aura:attribute name="confirm_status" type="Integer" default="0" />
+  <aura:attribute name="modal_confirm_title" type="String" />
+  <aura:attribute name="modal_confirm_text" type="String" />
+  <aura:attribute name="opportunity_cfilter" type="String" />
+  <!-- <aura:handler name="change" value="{!v.data.Product_Category1__c}" action="{!c.productcategoryChange1}"/>
     <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:handler name="change" value="{!v.oppdata.StageName__c}" action="{!c.stageNameChange}"/> -->
+  <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" />
+  <!-- 鎵归噺娣诲姞鍛ㄦ姤 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="tableheaders" type="Object[]" />
-    <aura:attribute name="fileContentData" type="String"/>
-    <aura:attribute name="filename" type="String"/>
-    <!-- It will display 100 records . Change for your requirement-->
-    <aura:attribute name="NumOfRecords" type="Integer" default="1000"/> 
-    <aura:attribute name="showMain" type="Boolean" default="true"/>
-    <!-- PIPL update Yin Mingjie 21/02/2022 start -->
-    <aura:attribute name="AWStoken" type="String"/> 
-    <aura:attribute name="AWSsearch" type="String"/>
-    <aura:attribute name="AWSinsert" type="String"/>
-    <aura:attribute name="AWStransactionURL" type="String"/>
-    <aura:attribute name="AWSDoctor2Map" type="String"/>
-    <aura:attribute name="awsurl" type="Map"/>
-    <aura:attribute name="contactawsurl" type="Map"/>
-    <aura:attribute name="allselectlistAgencyPerson" type="Map"/>
-    <!-- PIPL update Yin Mingjie 21/02/2022 end -->
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 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">
-                <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>
-    </aura:renderIf>
-    
-    <div aura:id="report" id="report" class="contents_wrapper">
-        <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>
-            <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>
-            
-            <!-- 浠g悊搴楁媴褰撹�� -->
-            <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>
-            <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>
-            <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"/>
-                <!-- <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}"/>
-            </div>
-            
-        </div>
+  <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" />
+  <!-- It will display 100 records . Change for your requirement-->
+  <aura:attribute name="NumOfRecords" type="Integer" default="1000" />
+  <aura:attribute name="showMain" type="Boolean" default="true" />
+  <!-- PIPL update Yin Mingjie 21/02/2022 start -->
+  <aura:attribute name="AWStoken" type="String" />
+  <aura:attribute name="AWSsearch" type="String" />
+  <aura:attribute name="AWSinsert" type="String" />
+  <aura:attribute name="AWStransactionURL" type="String" />
+  <aura:attribute name="AWSDoctor2Map" type="String" />
+  <aura:attribute name="awsurl" type="Map" />
+  <aura:attribute name="contactawsurl" type="Map" />
+  <aura:attribute name="allselectlistAgencyPerson" type="Map" />
+  <!-- PIPL update Yin Mingjie 21/02/2022 end -->
+  <!-- 鎵归噺娣诲姞鍛ㄦ姤 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"
+      >
+        <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: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;">
-                <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>
-                        <th class="table_header slds-text-title--caps">
-                            <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>
-                        <th class="table_header slds-text-title--caps">
-                            <!-- PIPL update Yin Mingjie 21/02/2022 start
+  </aura:renderIf>
+
+  <div aura:id="report" id="report" class="contents_wrapper">
+    <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>
+      <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>
+
+      <!-- 浠g悊搴楁媴褰撹�� -->
+      <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>
+      <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>
+      <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"
+        />
+        <!-- <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}"
+        />
+      </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"
+      >
+        <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>
+            <th class="table_header slds-text-title--caps">
+              <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>
+            <th class="table_header slds-text-title--caps">
+              <!-- 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>
-                            
-                        </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>
-                        </th>
-                    </tr>
-                </thead>
-                <tbody>
-                    <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}"/>
-                            </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}">
-                                        {!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">
-                                    {!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>
-                            </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="encrypt">{!item.doctor2__r.Name}</span>
-                                        <span class="decrypt">{!item.doctor2__r.awsdata.name}</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.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>
-                            </td>
-                        </tr>
-                    </aura:iteration>
-                </tbody>
-            </table>
-        </div>
-        <aura:renderIf isTrue="{!v.report_count > 0}">
-            <aura:set attribute="else">
-                <div class="no_data_area">
-                    {!v.list_message}
-                </div>
-            </aura:set>
-        </aura:renderIf>
+              <span class="slds-truncate" title="Name"
+                >{!v.fieldsmap.Agency_Contact__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
+              >
+            </th>
+          </tr>
+        </thead>
+        <tbody>
+          <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}"
+                />
+              </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}"
+                  >
+                    {!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">
+                  {!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>
+              </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="encrypt">{!item.doctor2__r.Name}</span>
+                    <span class="decrypt">{!item.doctor2__r.awsdata.name}</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.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>
+              </td>
+            </tr>
+          </aura:iteration>
+        </tbody>
+      </table>
     </div>
+    <aura:renderIf isTrue="{!v.report_count > 0}">
+      <aura:set attribute="else">
+        <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 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}"/>
+  <!--    <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 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}"
+        />
+      </div>
+      <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}"
+            />
+            <!-- <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}"
+            />
+            <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.cancel}"
+              />
             </div>
-            <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}" />
-                        <!-- <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}"/>
-                        <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.cancel}" /> 
-                        </div>
-                        
-                    </aura:set>
-                </aura:if>
-            </div>
-        </div>
+          </aura:set>
+        </aura:if>
+      </div>
     </div>
-    <div aura:id="modal_importbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺娣诲姞鍛ㄦ姤 end-->
+  </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 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}"/>
+  <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 start-->
+  <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}"
+        />
+      </div>
+      <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"
+            >
+              娲诲姩鏃ュ紑濮嬫棩鏈�
+
+              <lightning:input
+                type="Date"
+                class="slds-input slds-input_bare"
+                aura:id="input-report-date1"
+              />
             </div>
-            <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">
-                            娲诲姩鏃ュ紑濮嬫棩鏈�
-                            
-                            <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">
-                            娲诲姩鏃ョ粨鏉熸棩鏈�
-                            <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"
+            >
+              娲诲姩鏃ョ粨鏉熸棩鏈�
+              <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-around--large slds-align--absolute-center">
-                            <lightning:button label="纭" variant="brand" onclick="{!c.select_repores_date}"
-                                                  />
-                            <lightning:button label="鍙栨秷" variant="brand" 
-                                                  onclick="{!c.close_export}" /> 
-                        </div>
-                    </div>
-                    <!-- <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.close_export}"
+              />
+            </div>
+          </div>
+          <!-- <div>
                         璇疯緭鍏ヨ瀵煎嚭鏃ユ姤鐨勬姤娲诲姩鏃ョ殑寮�濮嬪拰缁撴潫鏃ユ湡
                         <force:inputField  aura:id="input-report-date1"/>鍒�
                         <force:inputField  aura:id="input-report-date2"/>
@@ -295,284 +468,511 @@
                         <lightning:button label="鍙栨秷" variant="brand" 
                                               onclick="{!c.close_export}" /> 
                     </div> -->
-                    <aura:set attribute="else">
-                        <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.close_export}" /> 
-                        </div>
-                        
-                    </aura:set>
-                </aura:if>
+          <aura:set attribute="else">
+            <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.close_export}"
+              />
             </div>
-        </div>
+          </aura:set>
+        </aura:if>
+      </div>
     </div>
-    <div aura:id="modal_exportbg" class="disp_none slds-backdrop slds-backdrop--open"></div>
-    <!-- 鎵归噺瀵煎嚭鍛ㄦ姤 end-->
+  </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 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}"/>
+  <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}"
+        />
+      </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"
+            >
+              娲诲姩鏃�
+              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+              <force:inputField
+                value="{!v.data.Report_Date__c}"
+                aura:id="input-report-date"
+              />
             </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">
-                            娲诲姩鏃�
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <force:inputField value="{!v.data.Report_Date__c}" aura:id="input-report-date"/>
+            <!-- 鍖婚櫌 -->
+            <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"
+                      >
+                        <div class="slds-media__body">
+                          <div class="slds-lookup__result-text">
+                            {!hospital.Hospital_Name_readonly__c}
+                          </div>
                         </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 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">
-                                                <div class="slds-media__body">
-                                                    <div class="slds-lookup__result-text">{!hospital.Hospital_Name_readonly__c}</div>
-                                                </div>
-                                            </span>
-                                        </li>
-                                    </aura:iteration>
-                                </ul>
-                            </div>
-                        </div>
-                        
-                        <!-- 绉戝鍒嗙被 -->
-                        <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}"/>
-                        </div>
-                        
-                        <!-- 鍏堢敓 -->
-                        <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}"/>
-                        </div>
-                        
-                        <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"/>
-                        </div>
-                        
-                        <!-- 鑱屼綅 -->
-                        <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">
-                            {!v.fieldsmap.Purpose_Type__c}
-                            <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">
-                            {!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=""
-                                    object="Agency_Opportunity__c"
-                                    searchField="Name"
-                                    placeholder="鎼滅储缁忛攢鍟嗚浠�..."
-                                    iconName="standard:opportunity"
-                                    subtitleField="Department_Cateogy__c,Agency_Opportunity_No__c,Change_To_Opportunity__r.Name"
-                                    order="StageName__c"
-                                    limit="5"
-                                    loadingMessage="Loading..."
-                                    errorMessage="Invalid input"
-                                    allowNewRecords = "true"
-                                    overrideNewEvent = "true"
-                                    showRecentRecords ="true"
-                                    value="{!v.data.Opportunity__c}"
-                                    filter="{!v.opportunity_cfilter}"
-                                    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">
-                            {!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">
-                            {!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">
-                            {!v.fieldsmap.OCMSale_Price__c}
-                            <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
-                            <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">
-                            {!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=""/>
-                        </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">
-                            {!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}"/>
-                        </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">
-                            {!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}"/>
-                        </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">
-                            {!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}"/>
-                        </div>
-                        <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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">
-                            {!v.fieldsmap.SupportNeeds__c}
-                            <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
-                        </div>
-                        <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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">
-                            {!v.fieldsmap.Result__c}
-                            <ui:inputSelect aura:id="select_result" class="slds-select"/>
-                            <!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
-                        </div>
-                    </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}"/>
-                </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">
-                                <thead>
-                                    <tr class="slds-line-height--reset">
-                                        <th class="table_header slds-text-title--caps">
-                                            <span class="slds-truncate" title="Name"></span>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <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>
-                                        <th class="table_header slds-text-title--caps">
-                                            <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>
-                                        </th>
-                                        <th class="table_header slds-text-title--caps">
-                                            <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">
-                                        <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>
-                                            </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>
-                                            </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>
-                                            </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="encrypt">{!item.doctor2__r.Name}</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>
-                                                </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>
-                                            </td>
-                                        </tr>
-                                    </aura:iteration>
-                                </tbody>
-                            </table>
-                        </div>
-                    </div>
-                </aura:renderIf>
+                      </span>
+                    </li>
+                  </aura:iteration>
+                </ul>
+              </div>
             </div>
-        </div>
-    </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 class="slds-modal__container">
-            <div class="slds-modal__header">
-                <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}" />
-            </div>
-        </div>
-    </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 class="slds-modal__container">
-            <div class="slds-modal__header">
-                <h2 id="headertest" class="slds-text-heading--medium">鏂板缓.瀹㈡埛浜哄憳</h2>
+            <!-- 绉戝鍒嗙被 -->
+            <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}"
+              />
             </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: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 class="customRequired none" aura:id="Input_type__c" fieldName="Type__c"/>
+
+            <!-- 鍏堢敓 -->
+            <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}"
+              />
+            </div>
+
+            <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"
+              />
+            </div>
+
+            <!-- 鑱屼綅 -->
+            <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"
+            >
+              {!v.fieldsmap.Purpose_Type__c}
+              <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"
+            >
+              {!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=""
+                object="Agency_Opportunity__c"
+                searchField="Name"
+                placeholder="鎼滅储缁忛攢鍟嗚浠�..."
+                iconName="standard:opportunity"
+                subtitleField="Department_Cateogy__c,Agency_Opportunity_No__c,Change_To_Opportunity__r.Name"
+                order="StageName__c"
+                limit="5"
+                loadingMessage="Loading..."
+                errorMessage="Invalid input"
+                allowNewRecords="true"
+                overrideNewEvent="true"
+                showRecentRecords="true"
+                value="{!v.data.Opportunity__c}"
+                filter="{!v.opportunity_cfilter}"
+                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"
+            >
+              {!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"
+            >
+              {!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"
+            >
+              {!v.fieldsmap.OCMSale_Price__c}
+              <!-- <ui:inputSelect aura:id="select_opportunity" class="slds-select"/> -->
+              <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"
+            >
+              {!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=""
+              />
+            </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"
+            >
+              {!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}"
+              />
+            </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"
+            >
+              {!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}"
+              />
+            </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"
+            >
+              {!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}"
+              />
+            </div>
+            <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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"
+            >
+              {!v.fieldsmap.SupportNeeds__c}
+              <ui:inputSelect aura:id="SupportNeeds__c" class="slds-select" />
+            </div>
+            <!--SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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"
+            >
+              {!v.fieldsmap.Result__c}
+              <ui:inputSelect aura:id="select_result" class="slds-select" />
+              <!-- <ui:inputText label="缁撴灉" class="bcolor" value="{!v.result}"/> -->
+            </div>
+          </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}"
+          />
+        </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"
+              >
+                <thead>
+                  <tr class="slds-line-height--reset">
+                    <th class="table_header slds-text-title--caps">
+                      <span class="slds-truncate" title="Name"></span>
+                    </th>
+                    <th class="table_header slds-text-title--caps">
+                      <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>
+                    <th class="table_header slds-text-title--caps">
+                      <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
+                      >
+                    </th>
+                    <th class="table_header slds-text-title--caps">
+                      <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"
+                  >
+                    <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>
+                      </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>
+                      </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>
+                      </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="encrypt">{!item.doctor2__r.Name}</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>
+                        </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>
+                      </td>
+                    </tr>
+                  </aura:iteration>
+                </tbody>
+              </table>
+            </div>
+          </div>
+        </aura:renderIf>
+      </div>
+    </div>
+  </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 class="slds-modal__container">
+      <div class="slds-modal__header">
+        <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}"
+        />
+      </div>
+    </div>
+  </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 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: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 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>
-                    <br/>
-                    <br/>
-                    <br/>
-                    <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="鏂板缓" />
-                    </div>
-    			</lightning:recordEditForm>
-            </div>
-        </div>
+          </aura:renderIf>
+          <br />
+          <br />
+          <br />
+          <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="淇濆瓨"
+            />
+          </div>
+        </lightning:recordEditForm>
+      </div>
     </div>
-    
-
-</aura:component>
\ No newline at end of file
+  </div>
+</aura:component>
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
index b4f4562..010e828 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportController.js
@@ -1,271 +1,346 @@
 ({
-    doInit : function(component, event, helper) {
-        if (window.location.href.endsWith("weekly-report")) {
-            helper.doinit(component, event, helper);
-        } else {
-            helper.hideCmp(component, event, helper);
-        }
-    },
+  doInit: function (component, event, helper) {
+    console.log("zhj 鏂版柟妗�");
+    if (window.location.href.endsWith("weekly-report")) {
+      helper.doinit(component, event, helper);
+    } else {
+      helper.hideCmp(component, event, helper);
+    }
+  },
 
-    createAopp : function(component, event, helper) {
-        var addRecordEvent = $A.get('e.force:createRecord');
-        addRecordEvent.setParams({
-            entityApiName: 'Agency_Opportunity__c',
-            recordTypeId: '012100000006KW7'
-        });
-        addRecordEvent.fire();
-    },
-    
-    new_report : function(component, event, helper) {
-        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', '淇濆瓨骞舵柊寤�');
-        helper.copy_button(component, event, helper);
-    },
-    
-    change_report_radio : function(component, event, helper) {
-        helper.change_report_radio(component, event, helper);
-    },
-    
-    edit_button : function(component, event, helper) {
-        component.find('save_button').set('v.label', '淇濆瓨');
-        helper.edit_button(component, event, helper);
-    },
-    
-    createCon : function(component, event, helper) {
-		helper.createCon(component, event, helper);
-    },
+  createAopp: function (component, event, helper) {
+    var addRecordEvent = $A.get("e.force:createRecord");
+    addRecordEvent.setParams({
+      entityApiName: "Agency_Opportunity__c",
+      recordTypeId: "012100000006KW7"
+    });
+    addRecordEvent.fire();
+  },
 
-    showRequiredFields: function(component, event, helper){
-        $A.util.removeClass(component.find("newOpportunityField"), "none");
-        $A.util.removeClass(component.find("newOpportunityField"), "none");
-    },
-    
-    handleSuccess : function(component, event, helper) {
-        helper.handleSuccess(component, event, helper);
-    },
-    
-    handleSubmit : function(component, event, helper) {
-        /*
+  new_report: function (component, event, helper) {
+    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", "淇濆瓨骞舵柊寤�");
+    helper.copy_button(component, event, helper);
+  },
+
+  change_report_radio: function (component, event, helper) {
+    helper.change_report_radio(component, event, helper);
+  },
+
+  edit_button: function (component, event, helper) {
+    component.find("save_button").set("v.label", "淇濆瓨");
+    helper.edit_button(component, event, helper);
+  },
+
+  createCon: function (component, event, helper) {
+    helper.createCon(component, event, helper);
+  },
+
+  showRequiredFields: function (component, event, helper) {
+    $A.util.removeClass(component.find("newOpportunityField"), "none");
+    $A.util.removeClass(component.find("newOpportunityField"), "none");
+  },
+
+  handleSuccess: function (component, event, helper) {
+    helper.handleSuccess(component, event, helper);
+  },
+
+  handleSubmit: function (component, event, helper) {
+    /*
         var params = event.getParams();
         params.fields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
         console.log(params);
         event.setParams(params);
         */
-        event.preventDefault(); // stop form submission
-        // vivek 娣诲姞楠岃瘉 start
-        // helper.handleFormSubmit(component);
-        var showValidationError = false;
-        var fields = component.find("newOpportunityField");
-        var vaildationFailReason = '';
-        // var vaildationFailReason2 = '';
-        // var currentDate = new Date().toJSON().slice(0,10);
-        
-        // PIPL update Yin Mingjie 21/02/2022 start
-        let agencyReport = Object.create(null);
-        // PIPL update Yin Mingjie 21/02/2022 end
+    event.preventDefault(); // stop form submission
+    // vivek 娣诲姞楠岃瘉 start
+    // helper.handleFormSubmit(component);
+    var showValidationError = false;
+    var fields = component.find("newOpportunityField");
+    var vaildationFailReason = "";
+    // var vaildationFailReason2 = '';
+    // var currentDate = new Date().toJSON().slice(0,10);
 
-        fields.forEach(function (field) {
-            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"))){
-                showValidationError = true;
-                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");
-            }
-            // PIPL update Yin Mingjie 21/02/2022 end
-        });
-         
-        if (!showValidationError) {
-            // PIPL update Yin Mingjie 21/02/2022 start
-            /*
+    // PIPL update Yin Mingjie 21/02/2022 start
+    let agencyReport = Object.create(null);
+    // 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"))
+      ) {
+        showValidationError = true;
+        vaildationFailReason = "鍒嗙被涓嶈兘涓虹┖锛�";
+      } else if (
+        field.get("v.fieldName") === "Doctor_Division1__c" &&
+        $A.util.isEmpty(field.get("v.value"))
+      ) {
+        showValidationError = true;
+        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");
+      }
+      // PIPL update Yin Mingjie 21/02/2022 end
+    });
+
+    if (!showValidationError) {
+      // PIPL update Yin Mingjie 21/02/2022 start
+      /*
             var eventFields = event.getParam("fields");
             eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
             component.find('recordEditForm').submit(eventFields);
             */
 
-            var agencyHospitalid = component.get('v.hospitalLinkId');
-            var arr = new Array();
-            arr.push(agencyReport);
-            var data = JSON.stringify(arr);
-            // helper.set_aws_url(component,data,agencyHospitalid);
+      var agencyHospitalid = component.get("v.hospitalLinkId");
+      //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+      debugger;
+      let hospitalName = "";
+      //璋冪敤鍚庣searchAgencyDataId鏂规硶鏌ヨ鍑哄尰闄笅闈㈡墍鏈夊鎴蜂汉鍛榙ataid
+      helper.CallBackAction(
+        component,
+        "searchAgencyDataId",
+        {
+          hospitalId: agencyHospitalid
+        },
+        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) {
+                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 = agencyContactIds.substring(1);
+                agencyReport["agencyContactIds"] = agencyContactIds;
+              } else {
+                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');
-            
-            component.set('v.login',true);
-            helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper);
+              var token = component.get("v.AWStoken");
+              var newUrl = component.get("v.AWSinsert") + "V2";
 
-            // PIPL update Yin Mingjie 21/02/2022 end
-        }else{
-            component.find('OppMessage').setError(vaildationFailReason);
+              component.set("v.login", true);
+              helper.insert_agencycontact(
+                component,
+                token,
+                newUrl,
+                requestData,
+                agencyHospitalid,
+                helper,
+                hospitalName
+              );
+            } else {
+              helper.ShowToast({
+                message: data.message,
+                type: "error"
+              });
+            }
+          } else {
+            helper.ShowToast({
+              message: "searchAgency澶辫触",
+              type: "error"
+            });
+          }
         }
-        // var eventFields = event.getParam("fields");
-        // eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
-        // component.find('recordEditForm').submit(eventFields);
-        // vivek 娣诲姞楠岃瘉 end
-    },
-    
-    createCancel : function(component, event, helper) {
-        helper.createCancel(component, event, helper);
-    },
-    
-    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'));
-    },
+      );
+      //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+      // var arr = new Array();
+      // arr.push(agencyReport);
+      // var data = JSON.stringify(arr);
+      // // helper.set_aws_url(component,data,agencyHospitalid);
 
-    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'));
-    },
-    
-    toggle_report : function(component, event, helper) {
-        helper.toggle_report(component);
-    },
+      // var token = component.get('v.AWStoken');
+      // var newUrl = component.get('v.AWSinsert');
 
-    save_report : function(component, event, helper) {
-        helper.save_report(component, event, helper);
-    },
-    
-    select_date_change : function(component, event, helper) {
-        helper.select_date_change(component, event, helper);
-    },
-    
-    select_agency_change : function(component, event, helper) {
-        helper.select_agency_change(component, event, helper);
-    },
-    
-    hosChange : function(component, event, helper) {
-		var hospital_name = event.getParam("value");
-		if (hospital_name.match(/(\S+\s)+/)) {
-			helper.searchHos(component, event, helper);
-		} else {
-			helper.hideSearch(component, event, helper);
-		}
-    },
-    
-    selectHos : function(component, event, helper) {
-		helper.selectHos(component, event, helper);
-        helper.setOpportunity_cfilter(component);
-    },
-    select_department : function(component, event, helper) {
-        helper.select_department(component, event, helper);
-        helper.setOpportunity_cfilter(component);
-    },
-    select_purpose_type : function(component, event, helper) {
-        helper.select_purpose_type(component, event, helper);
-    },
-    
-    doctor_change : function(component, event, helper) {
-        helper.doctor_change(component, event, helper);
-    },
-    
-    opportunityChange : function(component, event, helper) {
-        helper.opportunityChange(component, event, helper);
-    },
-    
-    productcategoryChange1 : function(component, event, helper) {
-        helper.productcategoryChange1(component, event, helper);
-    },
-    productcategoryChange2 : function(component, event, helper) {
-        helper.productcategoryChange2(component, event, helper);
-    },
-    productcategoryChange3 : function(component, event, helper) {
-        helper.productcategoryChange3(component, event, helper);
-    },
-    stageNameChange : function(component, event, helper) {
-        helper.stageNameChange(component, event, helper);
-    },
-    onDragOver : function(component, event, helper) {
-        event.preventDefault();
-    },
-    
-    onDrop : function(component, event, helper) {
-        event.stopPropagation();
-        event.preventDefault();
-        event.dataTransfer.dropEffect='copy';
-        var files=event.dataTransfer.files;
-        helper.readFile(component,helper,files[0]);
-    },
-    CreateRecord : function(component, event, helper){
-        var files = event.getSource().get("v.files");
-        // var fileInput = component.find("file").getElement();
-        // var file = fileInput.files[0];
-        helper.readFile(component,helper,files[0]);
-    },
+      // component.set('v.login',true);
+      // helper.insert_agencycontact(component,token,newUrl,data,agencyHospitalid,helper);
 
-    processFileContent : function(component,event,helper){
-        helper.saveRecords(component,event,helper);
-    },
-    
-    cancel : function(component,event,helper){
-        component.set("v.showMain",true);
-    },
-
-    import : function(component,event,helper){
-        // component.find('file').click();
-        // console.log('lll'+component.find('file'));
-        helper.showImport(component);
-    },
-    exportDate : function(component,event,helper){
-        var stockData = component.get("v.reports_date");
-        console.log('瀵煎嚭鏁版嵁'+stockData); 
-        var csv = helper.convertArrayOfObjectsToCSV(component,stockData);
-        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] 
-        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){
-        helper.showExport(component);
-    },
-
-    select_repores_date : function(component,event,helper){
-        helper.select_repores_date(component,event,helper);
-        // var stockData = component.get("v.reports_date");
-        // console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
-        // helper.showExportDate(component,stockData);
-        // this.export(component,event,helper);
-    },
-    export : function(component,event,helper){
-        console.log('杩涘叆export');
-        var stockData = component.get("v.reports_date");
-        console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
-        // helper.showExportDate(component,stockData);
-        // helper.showExport(component);
-    },
-    close_import : function(component,event,helper){
-        component.set("v.showMain",true);
-        helper.close_import(component);
-    },
-    close_export : function(component,event,helper){
-        component.set("v.showMain",true);
-        helper.close_export(component);
+      // PIPL update Yin Mingjie 21/02/2022 end
+    } else {
+      component.find("OppMessage").setError(vaildationFailReason);
     }
-})
\ No newline at end of file
+    // var eventFields = event.getParam("fields");
+    // eventFields["Agency_Hospital__c"] = component.get('v.hospitalLinkId');
+    // component.find('recordEditForm').submit(eventFields);
+    // vivek 娣诲姞楠岃瘉 end
+  },
+
+  createCancel: function (component, event, helper) {
+    helper.createCancel(component, event, helper);
+  },
+
+  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")
+    );
+  },
+
+  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")
+    );
+  },
+
+  toggle_report: function (component, event, helper) {
+    helper.toggle_report(component);
+  },
+
+  save_report: function (component, event, helper) {
+    helper.save_report(component, event, helper);
+  },
+
+  select_date_change: function (component, event, helper) {
+    helper.select_date_change(component, event, helper);
+  },
+
+  select_agency_change: function (component, event, helper) {
+    helper.select_agency_change(component, event, helper);
+  },
+
+  hosChange: function (component, event, helper) {
+    var hospital_name = event.getParam("value");
+    if (hospital_name.match(/(\S+\s)+/)) {
+      helper.searchHos(component, event, helper);
+    } else {
+      helper.hideSearch(component, event, helper);
+    }
+  },
+
+  selectHos: function (component, event, helper) {
+    helper.selectHos(component, event, helper);
+    helper.setOpportunity_cfilter(component);
+  },
+  select_department: function (component, event, helper) {
+    helper.select_department(component, event, helper);
+    helper.setOpportunity_cfilter(component);
+  },
+  select_purpose_type: function (component, event, helper) {
+    helper.select_purpose_type(component, event, helper);
+  },
+
+  doctor_change: function (component, event, helper) {
+    helper.doctor_change(component, event, helper);
+  },
+
+  opportunityChange: function (component, event, helper) {
+    helper.opportunityChange(component, event, helper);
+  },
+
+  productcategoryChange1: function (component, event, helper) {
+    helper.productcategoryChange1(component, event, helper);
+  },
+  productcategoryChange2: function (component, event, helper) {
+    helper.productcategoryChange2(component, event, helper);
+  },
+  productcategoryChange3: function (component, event, helper) {
+    helper.productcategoryChange3(component, event, helper);
+  },
+  stageNameChange: function (component, event, helper) {
+    helper.stageNameChange(component, event, helper);
+  },
+  onDragOver: function (component, event, helper) {
+    event.preventDefault();
+  },
+
+  onDrop: function (component, event, helper) {
+    event.stopPropagation();
+    event.preventDefault();
+    event.dataTransfer.dropEffect = "copy";
+    var files = event.dataTransfer.files;
+    helper.readFile(component, helper, files[0]);
+  },
+  CreateRecord: function (component, event, helper) {
+    var files = event.getSource().get("v.files");
+    // var fileInput = component.find("file").getElement();
+    // var file = fileInput.files[0];
+    helper.readFile(component, helper, files[0]);
+  },
+
+  processFileContent: function (component, event, helper) {
+    helper.saveRecords(component, event, helper);
+  },
+
+  cancel: function (component, event, helper) {
+    component.set("v.showMain", true);
+  },
+
+  import: function (component, event, helper) {
+    // component.find('file').click();
+    // console.log('lll'+component.find('file'));
+    helper.showImport(component);
+  },
+  exportDate: function (component, event, helper) {
+    var stockData = component.get("v.reports_date");
+    console.log("瀵煎嚭鏁版嵁" + stockData);
+    var csv = helper.convertArrayOfObjectsToCSV(component, stockData);
+    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]
+    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) {
+    helper.showExport(component);
+  },
+
+  select_repores_date: function (component, event, helper) {
+    helper.select_repores_date(component, event, helper);
+    // var stockData = component.get("v.reports_date");
+    // console.log('鏌ュ嚭鐨勬暟鎹�'+stockData);
+    // helper.showExportDate(component,stockData);
+    // this.export(component,event,helper);
+  },
+  export: function (component, event, helper) {
+    console.log("杩涘叆export");
+    var stockData = component.get("v.reports_date");
+    console.log("鏌ュ嚭鐨勬暟鎹�" + stockData);
+    // helper.showExportDate(component,stockData);
+    // helper.showExport(component);
+  },
+  close_import: function (component, event, helper) {
+    component.set("v.showMain", true);
+    helper.close_import(component);
+  },
+  close_export: function (component, event, helper) {
+    component.set("v.showMain", true);
+    helper.close_export(component);
+  }
+});
diff --git a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
index eed53ef..a656549 100644
--- a/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
+++ b/force-app/main/default/aura/WeeklyReport/WeeklyReportHelper.js
@@ -1,1365 +1,1687 @@
 ({
-    doinit : function(component, event, helper) {
-        this.report_date_list(component, event, helper, 5);
-        component.set('v.login',true);
-        var action = component.get('c.getalldata');
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            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);
-                // PIPL update Yin Mingjie 21/02/2022 start
-                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));
-                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                 component.find('SupportNeeds__c').set('v.options', this.conv_selected(res.allselectlist.SupportNeeds__c));
-                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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
-                
-                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);
-            }
-        });
-        $A.enqueueAction(action);
-    },
-    
-    // PIPL update Yin Mingjie 21/02/2022 start
-    search_contact : function(component, event, helper, resobj) {
-        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 != ''){
-                contactData[resobj[i].awsid] = resobj[i];
-                dataArr.push(resobj[i].awsid);
-            }
-        }
-        let obj= Object.create(null);
-        obj['dataIds'] = dataArr;
-        var payload = JSON.stringify(obj);
-        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'){
-                    if(result.object != null){
-                        this.to_contact_list(result,contactData,component);
-                    }else{
-                        component.set('v.login',false);
-                    }
-                }else{
-                    this.error('AWS search status : ' + result.status);
-                    component.set('v.login',false);
-                }
-            },component);
-            
-        });
-    },
-
-    to_contact_list : function(result,retMap,component) {
-        var resls = result.object;
-        var res = [];
-        var space = {};
-        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;
-            res.push(t);
-        }
-        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');
-        action.setParams({
-            "sobj" : sobject,
-        });
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            if(state == 'SUCCESS'){
-                var result = response.getReturnValue();
-                if(callback)callback(result);
-            }
-            else{
-                this.error('AWS url/token error.');
-                component.set('v.login',false);
-            }
-        });
-        $A.enqueueAction(action);
-    },
-    // PIPL update Yin Mingjie 21/02/2022 end
-
-    select_department : function(component, event, helper) {
-        var dc = component.find("select_department").get("v.value");
-        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';
-            } else {
-                purpose_type = '';
-            }
-        }
-        if (dc != '' || purpose_type != '') {
-
-            var action = component.get('c.getProductList');
-            action.setParams({
-                "dc" : dc,
-                "opdsis" : purpose_type,
-            });
-            action.setCallback(this,function(response){
-                var state = response.getState();
-                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.');
-                }
-            });
-            $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', []);
-        }
-    },
-
-    get_reports : function(component, event, helper, date_str, person_str) {
-        if (!date_str) {
-            return false;
-        }
-        
-        date_str = this.get_date_string(date_str);
-        
-        var action = component.get('c.getReports');
-        action.setParams({
-            "date_str" : date_str,
-            "person_str" : person_str,
-        });
-
-        component.set('v.login',true);
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            if(state == 'SUCCESS'){
-                var res = response.getReturnValue();
-				component.set('v.reports', res.reports);
-                
-                // 20220222 PI鏀归�� by Bright--start
-                let dataIds = [];
-                let dataIds1 = [];
-                let mm = {};
-                let b = false;
-                let b1 = false;
-                for (const rep of res.reports) {
-                    if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
-                        dataIds.push(rep.doctor2__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);
-                    }
-                }
-                let Foo = null;
-                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)) {
-                                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];
-                            }
-                        }
-
-                        $A.getCallback(()=>component.set('v.reports', res.reports))();
-                    }else{
-                        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'){
-                            
-                            for (const m of result.object) {
-                                mm[m.dataId] = m;
-                            }
-                            b = true;
-                            Foo();
-                        }else{
-                            this.error('AWS search status : ' + result.status);
-                        }
-                    },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'){
-                            
-                            for (const m of result.object) {
-                                mm[m.dataId] = m;
-                            }
-                            b1 = true;
-                            Foo();
-                        }else{
-                            this.error('AWS search status : ' + result.status);
-                        }
-                    },component);
-                }else{
-                    b1 = true;
-                }
-                // 20220222 PI鏀归�� by Bright--end
-
-                component.set('v.report_count', res.reports.length);
-
-                // 鏇存柊淇濆瓨寰屻伄select_data鐢�
-                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]);
-                            break;
-                        }
-                    }
-                    component.set('v.update_select_report_data_id', '');
-                }
-                
-                if (res.reports.length > 0) {
-                    component.set('v.list_message', '');
-                } else {
-                    component.set('v.list_message', 'no_data');
-                }
-                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.new_button_disabled(component, event, helper);
-        
-        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 new_label = this.get_agency_person_name(component, select_value);
-        component.set('v.selected_agency_person', new_label);
-        
-        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);
-    },
-    
-    get_agency_person_name : function(component, agency_person_value) {
+  doinit: function (component, event, helper) {
+    this.report_date_list(component, event, helper, 5);
+    component.set("v.login", true);
+    var action = component.get("c.getalldata");
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      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);
         // PIPL update Yin Mingjie 21/02/2022 start
-        var allselectlist = component.get('v.allselectlist.AgencyPerson__c');
-        // var allselectlist = component.get('v.allselectlistAgencyPerson');
+        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
-        var new_label = '';
-        for (var i = 0; i < allselectlist.length; i++) {
-            if (agency_person_value == allselectlist[i].value) {
-                new_label = allselectlist[i].label;
-                break;
-            }
-        }
-        return new_label;
-    },
-    
-    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');
-        if (select_date && select_agency) {
-            component.find('new_button').set('v.disabled', false);
-        } else {
-            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')) {
-            // OPEN
-            $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');
-                }
-                
-                var reports = component.get('v.reports');
-                var Agency_Hospital_text = '';
-                var Agency_Hospital_parent_id = '';
-
-				// 鍖婚櫌鍚�
-                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'];
-                        }
-                    }
-                    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']);
-                }
-                // 鎷滆浜�
-                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']);
-                    this.select_purpose_type(component);
-                }
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                // 鏀彺闇�姹�
-                if (select_data['SupportNeeds__c'] != '') {
-                    this.set_selected(component, 'SupportNeeds__c', select_data['SupportNeeds__c']);
-                }  
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end             
-                // 绲愭灉
-                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');
-                if (report_id != "") {
-                    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++) {
-                        if (report_id == reports[i]["Id"]) {
-                            select_opp = reports[i]["Opportunity__c"];
-                            select_product_category1 = reports[i]["Product_Category1__c"];
-                            select_product_category2 = reports[i]["Product_Category2__c"];
-                            select_product_category3 = reports[i]["Product_Category3__c"];
-                            reportDate = reports[i]["Report_Date__c"];
-                            break;
-                        }
-                    }
-                    
-                    // 璇环
-                    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'
-                                }
-                            }];
-                            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);
-                        }
-                    }
-                    
-                    // 浜у搧鍖哄垎
-                    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_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.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');
-            
-            if (select_report_data !== null) {
-                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_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['Result__c'] === "undefined") {
-                    select_report_data['Result__c'] = "";
-                }
-            }
-            
-            if (component.get('v.mode') == 'new') {
-                var confirm_title = '璀﹀憡!'
-                var confirm_text = '鏀惧純鏂板缓鍛ㄦ姤锛�';
-                
-                if (!Report_Date__c &&
-                    !Agency_Hospital__c &&
-                    !Department_Cateogy__c &&
-                    !doctor2__c &&
-                    !Purpose_Type__c &&
-                    !SupportNeeds__c&&//WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
-                    !Opportunity__c &&
-                    !Product_Category1__c &&
-                    !Product_Category2__c &&
-                    !Product_Category3__c &&
-                    !Result__c)
-                {
-                    this.allclear(component);
-                    $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 = '鏀惧純鏂板缓鍛ㄦ姤锛�';
-                
-                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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
-                    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');
-                } else {
-                    this.close_confirm(component, confirm_title, 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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
-                    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');
-                } 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'); 
-
-        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');
-        } else if (confirm_status == 1) {
-            // 鏄�
-            $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);
-        } 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);
-        }
-    },
-
-    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);
-        // PIPL update Yin Mingjie 21/02/2022 start
-        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);
-        // 閫�
-		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 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);
-        
-        this.new_button_disabled(component, event, helper);
-
-        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);
-
-        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');
-        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);
-                break;
-            }
-        }
-    },
-    
-    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', '缂栬緫');
-
-        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.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.edit_copy_select_report_id', component.get('v.reports')[index].Id);
-        
-        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')){
-            if (op.selected) {
-                doctor2Name = op.label;
-                visitortitle = op.Doctor_Division1__c;
-            }
-        }
-        // 20220222 PI鏀归��  by Bright--end
-
-
-        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') {
-            // 鍛� 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;            
-        } else {
-            // 鍛� Submit_date__c
-            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');
-        }
-        // Agency_Report_Header__c
-        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');
-        
-        // 绉戝 Department_Cateogy__c
-        var Department_Cateogy__c = component.find('select_department').get('v.value');
-        
-        // 鎷滆浜� doctor2__c
-        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');
-          //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-        // 鏀彺闇�姹� SupportNeeds__c
-        var SupportNeeds__c = component.find('SupportNeeds__c').get('v.value');
-        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
-        // 璇环 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_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');
-        
-        // 绲愭灉 Result__c
-        var Result__c = component.find('select_result').get('v.value');
-        
-        // 銉愩儶銉囥兗銈枫儳銉�
-        var error = [];
-        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('娲诲姩鏃ュ繀椤绘槸鏈懆锛�'); }
-        sDate.setDate(sDate.getDate() + 7);
-        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 (!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("缁撴灉 涓嶅瓨鍦�"); }
-        }
-        for (var i = 0; i < error.length; i++) {
-            this.warning(error[i]);
-        }
-        if (error.length > 0) {
-            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
-            // 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,
-                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                 "SupportNeedsc" : SupportNeeds__c,
-                 //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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,
-            });
-            
-            action.setCallback(this,function(response){
-                var state = response.getState();
-                if(state == 'SUCCESS'){
-                    this.success('缂栬緫淇濆瓨鎴愬姛');
-                    var report_id = response.getReturnValue();
-                    component.set('v.create_agency_report_id', report_id);
-                    
-                    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) {
-                            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.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{
-                    // var error = response.getError();
-                    // alert(JSON.stringify(error));
-                    // alert(JSON.stringify(error[0].fieldErrors));
-                    // alert(JSON.stringify(error[0].fieldErrors.next()));
-                    // alert(JSON.stringify(error[0].fieldErrors.next()[0]));
-                    // if (this.error(response.getError()[0].message))
-                    // else () {
-                    //     error[0].fieldErrors[0]
-                    // }
-                    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');
-            debugger;
-            // alert(SupportNeeds__c);
-            action.setParams({
-                "Department_Cateogy" : Department_Cateogy__c,
-                "Purpose_Type" : Purpose_Type__c,
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                "SupportNeedsc" : SupportNeeds__c,
-                //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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,
-            });
-
-            action.setCallback(this,function(response){
-                var state = response.getState();
-                if(state == 'SUCCESS'){
-                    this.success('淇濆瓨鎴愬姛');
-                    var report_id = response.getReturnValue();
-                    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'));
-
-					// 銉€兗銉�銉偊銈c兂銉夈偊鍐呫伄涓�瑕х敤
-                    var action2 = component.get('c.getReportsById');
-                    action2.setParams({
-                        "report_id" : report_id,
-                    });
-                    action2.setCallback(this,function(response){
-                        var state = response.getState();
-                        if(state == 'SUCCESS'){
-                            var res = response.getReturnValue();
-                            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;
-                            }
-
-                            // Save&New鏅傘伄銈︺偅銉炽儔銈﹀唴銉囥兗銈夸竴瑕�
-                            if (res.length > 0) {
-                                // 20220222 PI鏀归��  by Bright--start
-                                res[0].doctor2NameOrigin = doctor2Name;
-                                res[0].visitorTitleOrigin = visitortitle;
-                                // 20220222 PI鏀归��  by Bright--end
-	                            reports_now[reports_now_count] = res[0];
-                                
-                                reports_now.sort(function(a,b) {
-                                    if(a.Name>b.Name) return -1;
-                                    if(a.Name < b.Name) return 1;
-                                    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');
-                            }
-                        }
-                        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{
-                    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);
-                }
-            });
-            $A.enqueueAction(action);
-        }
-    },
-    
-    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')));
+        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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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(res.allselectlist.SupportNeeds__c)
+          );
         //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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.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');
-        // 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.find('input-opportunity').set("v.body",[]);
-        // if (component.find('input-product-category1'))
-        //     component.find('input-product-category1').get("v.body")[0].set('v.values', values);
-        // if (component.find('input-product-category2'))
-        //     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', '');
-        this.select_purpose_type(component);
-    },
-    
-    report_date_list : function(component, event, helper, count) {
-        var ret_obj = [];
-		var now = new Date();
-        for (var i = 0; i < count; i++) {
+        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
 
-            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));
+        this.get_reports(
+          component,
+          event,
+          helper,
+          component.find("select_date").get("v.value"),
+          component.find("select_agency_person").get("v.value")
+        );
 
-            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(),
-                });
+        component.set("v.login", false);
+      } else {
+        this.error("doinit failed.");
+        component.set("v.login", false);
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  // PIPL update Yin Mingjie 21/02/2022 start
+  search_contact: function (component, event, helper, resobj) {
+    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 != "") {
+        contactData[resobj[i].awsid] = resobj[i];
+        dataArr.push(resobj[i].awsid);
+      }
+    }
+    let obj = Object.create(null);
+    obj["dataIds"] = dataArr;
+    var payload = JSON.stringify(obj);
+    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") {
+            if (result.object != null) {
+              this.to_contact_list(result, contactData, component);
             } 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(),
-                });
+              component.set("v.login", false);
             }
-        }
+          } else {
+            this.error("AWS search status1 : " + result.status);
+            component.set("v.login", false);
+          }
+        },
+        component
+      );
+    });
+  },
 
-		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.');
-            return false;
-        }
+  to_contact_list: function (result, retMap, component) {
+    var resls = result.object;
+    var res = [];
+    var space = {};
+    space["label"] = "";
+    space["selected"] = true;
+    space["value"] = "";
+    res.push(space);
 
-        var head_key = this.create_header_input_key(s_agency, s_date);
-        component.set('v.agency_report_header', head_key);
-        if (head_key == false) {
-            this.error('create_header_input_key failed.');
-            return false;
-        }
-        
-        var key2 = s_date.replace(/-/g, '');
-        var action = component.get('c.createReportHeader');
+    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;
+      res.push(t);
+    }
+    component.find("select_agency_person").set("v.options", res);
+    component.set("v.allselectlistAgencyPerson", res);
+    component.set("v.login", false);
+  },
 
-        action.setParams({
-            "name" : name,
-            "s_date" : s_date,
-            "s_agency" : s_agency,
-            "head_key" : head_key,
-        });
-        
-        component.set('v.login',true);
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            if(state == 'SUCCESS'){
-                var res = response.getReturnValue();
-                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);
-            }
-        });
-        $A.enqueueAction(action);
-    },
+  search_contact_url: function (component, sobject, callback) {
+    var action = component.get("c.getAwsurl");
+    action.setParams({
+      sobj: sobject
+    });
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state == "SUCCESS") {
+        var result = response.getReturnValue();
+        if (callback) callback(result);
+      } else {
+        this.error("AWS url/token error.");
+        component.set("v.login", false);
+      }
+    });
+    $A.enqueueAction(action);
+  },
+  // PIPL update Yin Mingjie 21/02/2022 end
 
-    create_header_input_key : function(agency_id, s_date) {
-        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.')
-                return false;
-            }
-        }
-        if (!agency_id || !s_date) {
-            return false;
-        }
-
-        s_date = s_date.replace(/-/g, '');
-        var headkey = agency_id + ":" + s_date;
-
-        return headkey;
-    },
-
-    /* typeof is not cool
-     * @ret : String, Boolean, Date, Error, Array, Function, Null, Undefined, etc
-     */
-    object_type : function(obj) {
-        var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
-        return obj_type;
-    },
-
-    // create yyyy-mm-dd string
-    get_date_string : function(val) {
-        if (typeof(val) == 'string') {
-            if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
-                val = val.replace(/[\/]/g, '-');
-                var tmp = val.split('-');
-                if (tmp[1].length == 1) {
-                    tmp[1] = '0' + tmp[1];
-                }
-                if (tmp[2].length == 1) {
-                    tmp[2] = '0' + 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') {
-            var mm = val.getMonth() + 1;
-            if (String(mm).length == 1) {
-                mm = '0' + mm;
-            }
-            
-            var dd = '';
-            if (String(val.getDate()).length == 1) {
-                dd = '0' + val.getDate();
-            } else {
-                dd = val.getDate();
-            }
-            
-            val = val.getFullYear() + '-' + mm + '-' + dd;
+  select_department: function (component, event, helper) {
+    var dc = component.find("select_department").get("v.value");
+    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";
+      } else {
+        purpose_type = "";
+      }
+    }
+    if (dc != "" || purpose_type != "") {
+      var action = component.get("c.getProductList");
+      action.setParams({
+        dc: dc,
+        opdsis: purpose_type
+      });
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        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 {
-            return false;
+          this.error("getProductList failed.");
         }
-        
-        return val;
-    },
-    
-    searchHos : function(component, event, helper) {
-    	var hospital_name = event.getParam("value");
-    	var action = component.get("c.getHospitalList");
-        debugger;
-    	action.setParams({"hospital_name": hospital_name});
+      });
+      $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", []);
+    }
+  },
 
-    	action.setCallback(this, function(response) {
-            var state = response.getState();
-            if(state === "SUCCESS") {
-            	var hospital_list = component.find('hospital_list');
-            	var hosList = response.getReturnValue();
-            	if (hosList.length > 0) {
-            		$A.util.addClass(hospital_list, 'slds-is-open');
-            	} else {
-            		$A.util.removeClass(hospital_list, 'slds-is-open');
-            	}
-                component.set("v.hospitalList", response.getReturnValue());
-            } else {
-                $A.util.removeClass(hospital_list, 'slds-is-open');
-            }
-        });
-        $A.enqueueAction(action);
-    },
+  get_reports: function (component, event, helper, date_str, person_str) {
+    if (!date_str) {
+      return false;
+    }
 
-    hideSearch : function(component, event, helper) {
-    	var hospital_list = component.find('hospital_list');
-    	$A.util.removeClass(hospital_list, 'slds-is-open');
-    },
+    date_str = this.get_date_string(date_str);
 
-    selectHos : function(component, event, helper) {
-        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');
-        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);
-                //break;
-            }
+    var action = component.get("c.getReports");
+    action.setParams({
+      date_str: date_str,
+      person_str: person_str
+    });
+
+    component.set("v.login", true);
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state == "SUCCESS") {
+        var res = response.getReturnValue();
+        component.set("v.reports", res.reports);
+
+        // 20220222 PI鏀归�� by Bright--start
+        let dataIds = [];
+        let dataIds1 = [];
+        let mm = {};
+        let b = false;
+        let b1 = false;
+        for (const rep of res.reports) {
+          if (rep.doctor2__r && rep.doctor2__r.AWS_Data_Id__c) {
+            dataIds.push(rep.doctor2__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);
+          }
         }
-        component.set("v.hospital", accname);
-    	component.set("v.hospitalId", accid);
-        this.set_doctor_list(component);
-        this.opportunityChange(component, event, helper);
-    },
-    
-    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');
+        let Foo = null;
+        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)
+              ) {
+                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];
+              }
+            }
+
+            $A.getCallback(() => component.set("v.reports", res.reports))();
+          } else {
+            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") {
+                for (const m of result.object) {
+                  mm[m.dataId] = m;
+                }
+                b = true;
+                Foo();
+              } else {
+                //this.error('AWS search status2 : ' + result.status);
+                this.success("璇烽噸鏂板埛鏂伴〉闈㈣繘琛岃В瀵�");
+              }
+            },
+            component
+          );
         } else {
-            component.find('select_result').set('v.value', '');
-            var result = component.find('result');
-        	$A.util.addClass(result, 'disp_none');
+          b = true;
         }
-        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 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);
-                flg = true;
-                break;
+
+        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") {
+                for (const m of result.object) {
+                  mm[m.dataId] = m;
+                }
+                b1 = true;
+                Foo();
+              } else {
+                this.error("AWS search status3 : " + result.status);
+              }
+            },
+            component
+          );
+        } else {
+          b1 = true;
+        }
+        // 20220222 PI鏀归�� by Bright--end
+
+        component.set("v.report_count", res.reports.length);
+
+        // 鏇存柊淇濆瓨寰屻伄select_data鐢�
+        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]);
+              break;
             }
+          }
+          component.set("v.update_select_report_data_id", "");
         }
-        if (flg == false) {
-            component.set('v.doctor_title', '');
+
+        if (res.reports.length > 0) {
+          component.set("v.list_message", "");
+        } else {
+          component.set("v.list_message", "no_data");
         }
-    },
+        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.new_button_disabled(component, event, helper);
+
+    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 new_label = this.get_agency_person_name(component, select_value);
+    component.set("v.selected_agency_person", new_label);
+
+    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);
+  },
+
+  get_agency_person_name: function (component, agency_person_value) {
     // PIPL update Yin Mingjie 21/02/2022 start
-    set_aws_url : function(component,sobject) {
-        var action = component.get('c.getAwsurl');
-        action.setParams({
-            "sobj" : sobject,
-        });
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            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);
-            }
-        });
-        $A.enqueueAction(action);
-    },
-
-    insert_agencycontact : function(component,token,newUrl,payload,agencyHospitalid,helper) {
-
-        // AWSService.insert(newUrl,payload,function(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);
-        //         component.find('OppMessage').setError('AWS insert error.');
-        //     }
-        // },token);
-        
-        fetch(newUrl, {
-            method: 'POST',
-            body: payload,
-            headers: {
-                'Content-Type': 'application/json',
-                'pi-token': token
-            }
-        }).then((data) => {
-            return data.json();
-        }).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);
-                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');
-        action.setParams({
-            "name" : result.object[0].name,
-            "nameEncrypt" : result.object[0].nameEncrypt,
-            "type" : result.object[0].type,
-            "typeEncrypt" : result.object[0].typeEncrypt,
-            "doctorDivision1" : result.object[0].doctorDivision1,
-            "doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
-            "agencyHospitalid" : agencyHospitalid,
-            "awsid" : result.object[0].dataId,
-        });
-        action.setCallback(this,function(response){
-            var state = response.getState();
-            if(state == 'SUCCESS'){
-                var acMap = this.conv_selected(response.getReturnValue());
-                console.log(acMap);
-                if(acMap.AgencyContactId != ''){
-                    //纭浜嬪姟 
-                    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;
-
-                    this.to_confirm(component,token,confirmUrl,JSON.stringify(data));
-                }else if(acMap.errormsg != ''){
-                    this.error(acMap.errormsg);
-                    component.set('v.login',false);
-                }else {
-                    this.error('agency contact insert id error.');
-                    component.set('v.login',false);
-                }
-            }
-            else{
-                this.error('agency contact insert error.');
-                component.set('v.login',false);
-            }
-        });
-        $A.enqueueAction(action);
-    },
-
-    to_confirm : function(component,token,confirmUrl,payload) {
-        fetch(confirmUrl, {
-            method: 'POST',
-            body: payload,
-            headers: {
-                'Content-Type': 'application/json',
-                'pi-token': token
-            }
-        }).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('.瀹㈡埛浜哄憳宸插垱寤恒��');
-                this.set_doctor_list(component);
-            }else {
-                this.error('AWS confirm error.');
-                component.set('v.login',false);
-            }
-        }).catch(error => {
-            this.error('AWS confirm error.');
-            component.set('v.login',false);
-        });
-    },
+    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 = "";
+    for (var i = 0; i < allselectlist.length; i++) {
+      if (agency_person_value == allselectlist[i].value) {
+        new_label = allselectlist[i].label;
+        break;
+      }
+    }
+    return new_label;
+  },
 
-    set_doctor_list : function(component) {
-        var hospital_id = component.get('v.hospitalLinkId');
-        if (hospital_id) {
-            component.set('v.login',true);
-            var action = component.get('c.getDoctorList');
-            action.setParams({
-                "hospital_id" : hospital_id,
-            });
-            action.setCallback(this,function(response){
-                var state = response.getState();
-                if(state == 'SUCCESS'){
-                    var retMap = this.conv_selected(response.getReturnValue());
-                    // PIPL update Yin Mingjie 21/02/2022 start
-                    this.AWS_search(retMap,component);
-                    /*
+  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");
+    if (select_date && select_agency) {
+      component.find("new_button").set("v.disabled", false);
+    } else {
+      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")) {
+      // OPEN
+      $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");
+        }
+
+        var reports = component.get("v.reports");
+        var Agency_Hospital_text = "";
+        var Agency_Hospital_parent_id = "";
+        debugger;
+        // 鍖婚櫌鍚�
+        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"];
+            }
+          }
+          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"]
+          );
+        }
+        // 鎷滆浜�
+        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"]
+          );
+          this.select_purpose_type(component);
+        }
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        // 鏀彺闇�姹�
+        if (select_data["SupportNeeds__c"] != "") {
+          this.set_selected(
+            component,
+            "SupportNeeds__c",
+            select_data["SupportNeeds__c"]
+          );
+        }
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+        // 绲愭灉
+        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");
+        if (report_id != "") {
+          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++) {
+            if (report_id == reports[i]["Id"]) {
+              select_opp = reports[i]["Opportunity__c"];
+              select_product_category1 = reports[i]["Product_Category1__c"];
+              select_product_category2 = reports[i]["Product_Category2__c"];
+              select_product_category3 = reports[i]["Product_Category3__c"];
+              reportDate = reports[i]["Report_Date__c"];
+              break;
+            }
+          }
+
+          // 璇环
+          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"
+                  }
+                }
+              ];
+              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);
+            }
+          }
+
+          // 浜у搧鍖哄垎
+          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_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.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");
+
+      if (select_report_data !== null) {
+        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_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["Result__c"] === "undefined") {
+          select_report_data["Result__c"] = "";
+        }
+      }
+
+      if (component.get("v.mode") == "new") {
+        var confirm_title = "璀﹀憡!";
+        var confirm_text = "鏀惧純鏂板缓鍛ㄦ姤锛�";
+
+        if (
+          !Report_Date__c &&
+          !Agency_Hospital__c &&
+          !Department_Cateogy__c &&
+          !doctor2__c &&
+          !Purpose_Type__c &&
+          !SupportNeeds__c && //WAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+          !Opportunity__c &&
+          !Product_Category1__c &&
+          !Product_Category2__c &&
+          !Product_Category3__c &&
+          !Result__c
+        ) {
+          this.allclear(component);
+          $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 = "鏀惧純鏂板缓鍛ㄦ姤锛�";
+
+        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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+          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");
+        } else {
+          this.close_confirm(component, confirm_title, 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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔�
+          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");
+        } 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");
+
+    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");
+    } else if (confirm_status == 1) {
+      // 鏄�
+      $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);
+    } 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);
+    }
+  },
+
+  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
+    );
+    // PIPL update Yin Mingjie 21/02/2022 start
+    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);
+    // 閫�
+    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 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);
+
+    this.new_button_disabled(component, event, helper);
+
+    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);
+
+    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");
+    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);
+        break;
+      }
+    }
+  },
+
+  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", "缂栬緫");
+
+    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.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.edit_copy_select_report_id",
+      component.get("v.reports")[index].Id
+    );
+
+    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")) {
+      if (op.selected) {
+        doctor2Name = op.label;
+        visitortitle = op.Doctor_Division1__c;
+      }
+    }
+    // 20220222 PI鏀归��  by Bright--end
+
+    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") {
+      // 鍛� 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;
+    } else {
+      // 鍛� Submit_date__c
+      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");
+    }
+    // Agency_Report_Header__c
+    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");
+
+    // 绉戝 Department_Cateogy__c
+    var Department_Cateogy__c = component
+      .find("select_department")
+      .get("v.value");
+
+    // 鎷滆浜� doctor2__c
+    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");
+    //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+    // 鏀彺闇�姹� SupportNeeds__c
+    var SupportNeeds__c = component.find("SupportNeeds__c").get("v.value");
+    //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� end
+    // 璇环 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_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");
+
+    // 绲愭灉 Result__c
+    var Result__c = component.find("select_result").get("v.value");
+
+    // 銉愩儶銉囥兗銈枫儳銉�
+    var error = [];
+    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("娲诲姩鏃ュ繀椤绘槸鏈懆锛�");
+    }
+    sDate.setDate(sDate.getDate() + 7);
+    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 (!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("缁撴灉 涓嶅瓨鍦�");
+      }
+    }
+    for (var i = 0; i < error.length; i++) {
+      this.warning(error[i]);
+    }
+    if (error.length > 0) {
+      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;
+      // 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,
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        SupportNeedsc: SupportNeeds__c,
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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
+      });
+
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        if (state == "SUCCESS") {
+          this.success("缂栬緫淇濆瓨鎴愬姛");
+          var report_id = response.getReturnValue();
+          component.set("v.create_agency_report_id", report_id);
+
+          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
+            ) {
+              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.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 {
+          // var error = response.getError();
+          // alert(JSON.stringify(error));
+          // alert(JSON.stringify(error[0].fieldErrors));
+          // alert(JSON.stringify(error[0].fieldErrors.next()));
+          // alert(JSON.stringify(error[0].fieldErrors.next()[0]));
+          // if (this.error(response.getError()[0].message))
+          // else () {
+          //     error[0].fieldErrors[0]
+          // }
+          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");
+      debugger;
+      // alert(SupportNeeds__c);
+      action.setParams({
+        Department_Cateogy: Department_Cateogy__c,
+        Purpose_Type: Purpose_Type__c,
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+        SupportNeedsc: SupportNeeds__c,
+        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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
+      });
+
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        if (state == "SUCCESS") {
+          this.success("淇濆瓨鎴愬姛");
+          var report_id = response.getReturnValue();
+          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")
+          );
+
+          // 銉€兗銉�銉偊銈c兂銉夈偊鍐呫伄涓�瑕х敤
+          var action2 = component.get("c.getReportsById");
+          action2.setParams({
+            report_id: report_id
+          });
+          action2.setCallback(this, function (response) {
+            var state = response.getState();
+            if (state == "SUCCESS") {
+              var res = response.getReturnValue();
+              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;
+              }
+
+              // Save&New鏅傘伄銈︺偅銉炽儔銈﹀唴銉囥兗銈夸竴瑕�
+              if (res.length > 0) {
+                // 20220222 PI鏀归��  by Bright--start
+                res[0].doctor2NameOrigin = doctor2Name;
+                res[0].visitorTitleOrigin = visitortitle;
+                // 20220222 PI鏀归��  by Bright--end
+                reports_now[reports_now_count] = res[0];
+
+                reports_now.sort(function (a, b) {
+                  if (a.Name > b.Name) return -1;
+                  if (a.Name < b.Name) return 1;
+                  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");
+              }
+            } 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 {
+          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);
+        }
+      });
+      $A.enqueueAction(action);
+    }
+  },
+
+  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"))
+      );
+    //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+    component
+      .find("SupportNeeds__c")
+      .set(
+        "v.options",
+        this.conv_selected(component.get("v.allselectlist.SupportNeeds__c"))
+      );
+    //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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.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");
+    // 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.find('input-opportunity').set("v.body",[]);
+    // if (component.find('input-product-category1'))
+    //     component.find('input-product-category1').get("v.body")[0].set('v.values', values);
+    // if (component.find('input-product-category2'))
+    //     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", "");
+    this.select_purpose_type(component);
+  },
+
+  report_date_list: function (component, event, helper, count) {
+    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();
+      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()
+        });
+      } 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()
+        });
+      }
+    }
+
+    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.");
+      return false;
+    }
+
+    var head_key = this.create_header_input_key(s_agency, s_date);
+    component.set("v.agency_report_header", head_key);
+    if (head_key == false) {
+      this.error("create_header_input_key failed.");
+      return false;
+    }
+
+    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
+    });
+
+    component.set("v.login", true);
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state == "SUCCESS") {
+        var res = response.getReturnValue();
+        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);
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  create_header_input_key: function (agency_id, s_date) {
+    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.");
+        return false;
+      }
+    }
+    if (!agency_id || !s_date) {
+      return false;
+    }
+
+    s_date = s_date.replace(/-/g, "");
+    var headkey = agency_id + ":" + s_date;
+
+    return headkey;
+  },
+
+  /* typeof is not cool
+   * @ret : String, Boolean, Date, Error, Array, Function, Null, Undefined, etc
+   */
+  object_type: function (obj) {
+    var obj_type = Object.prototype.toString.call(obj).slice(8, -1);
+    return obj_type;
+  },
+
+  // create yyyy-mm-dd string
+  get_date_string: function (val) {
+    if (typeof val == "string") {
+      if (val.match(/^\d{4}\/\d{1,2}\/\d{1,2}$/)) {
+        val = val.replace(/[\/]/g, "-");
+        var tmp = val.split("-");
+        if (tmp[1].length == 1) {
+          tmp[1] = "0" + tmp[1];
+        }
+        if (tmp[2].length == 1) {
+          tmp[2] = "0" + 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") {
+      var mm = val.getMonth() + 1;
+      if (String(mm).length == 1) {
+        mm = "0" + mm;
+      }
+
+      var dd = "";
+      if (String(val.getDate()).length == 1) {
+        dd = "0" + val.getDate();
+      } else {
+        dd = val.getDate();
+      }
+
+      val = val.getFullYear() + "-" + mm + "-" + dd;
+    } else {
+      return false;
+    }
+
+    return val;
+  },
+
+  searchHos: function (component, event, helper) {
+    var hospital_name = event.getParam("value");
+    var action = component.get("c.getHospitalList");
+    debugger;
+    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 hosList = response.getReturnValue();
+        if (hosList.length > 0) {
+          $A.util.addClass(hospital_list, "slds-is-open");
+        } else {
+          $A.util.removeClass(hospital_list, "slds-is-open");
+        }
+        component.set("v.hospitalList", response.getReturnValue());
+      } else {
+        $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");
+  },
+
+  selectHos: function (component, event, helper) {
+    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");
+    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.hospital", accname);
+    component.set("v.hospitalId", accid);
+    this.set_doctor_list(component);
+    this.opportunityChange(component, event, helper);
+  },
+
+  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");
+    } else {
+      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 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);
+        flg = true;
+        break;
+      }
+    }
+    if (flg == false) {
+      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");
+    action.setParams({
+      sobj: sobject
+    });
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      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);
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  insert_agencycontact: function (
+    component,
+    token,
+    newUrl,
+    payload,
+    agencyHospitalid,
+    helper,
+    hospitalName
+  ) {
+    // AWSService.insert(newUrl,payload,function(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);
+    //         component.find('OppMessage').setError('AWS insert error.');
+    //     }
+    // },token);
+
+    fetch(newUrl, {
+      method: "POST",
+      body: payload,
+      headers: {
+        "Content-Type": "application/json",
+        "pi-token": token
+      }
+    })
+      .then((data) => {
+        return data.json();
+      })
+      .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 + "鍖婚櫌锛岃淇敼"
+              );
+          } else {
+            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");
+    action.setParams({
+      name: result.object[0].name,
+      //"nameEncrypt" : result.object[0].nameEncrypt,
+      type: result.object[0].type,
+      //"typeEncrypt" : result.object[0].typeEncrypt,
+      doctorDivision1: result.object[0].doctorDivision1,
+      //"doctorDivision1Encrypt" : result.object[0].doctorDivision1Encrypt,
+      agencyHospitalid: agencyHospitalid,
+      awsid: result.object[0].dataId
+    });
+    action.setCallback(this, function (response) {
+      var state = response.getState();
+      if (state == "SUCCESS") {
+        var acMap = this.conv_selected(response.getReturnValue());
+        console.log(acMap);
+        if (acMap.AgencyContactId != "") {
+          //纭浜嬪姟
+          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;
+
+          this.to_confirm(component, token, confirmUrl, JSON.stringify(data));
+        } else if (acMap.errormsg != "") {
+          this.error(acMap.errormsg);
+          component.set("v.login", false);
+        } else {
+          this.error("agency contact insert id error.");
+          component.set("v.login", false);
+        }
+      } else {
+        this.error("agency contact insert error.");
+        component.set("v.login", false);
+      }
+    });
+    $A.enqueueAction(action);
+  },
+
+  to_confirm: function (component, token, confirmUrl, payload) {
+    fetch(confirmUrl, {
+      method: "POST",
+      body: payload,
+      headers: {
+        "Content-Type": "application/json",
+        "pi-token": token
+      }
+    })
+      .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(".瀹㈡埛浜哄憳宸插垱寤恒��");
+          this.set_doctor_list(component);
+        } else {
+          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");
+    if (hospital_id) {
+      component.set("v.login", true);
+      var action = component.get("c.getDoctorList");
+      action.setParams({
+        hospital_id: hospital_id
+      });
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        if (state == "SUCCESS") {
+          var retMap = this.conv_selected(response.getReturnValue());
+          // PIPL update Yin Mingjie 21/02/2022 start
+          this.AWS_search(retMap, component);
+          /*
                     var default_doctor = component.get('v.default_select_doctor_id');
                     if (default_doctor != '' && res.length > 0) {
                         var doctor_title = '';
@@ -1385,972 +1707,1195 @@
                     component.set('v.doctor_list', res);
                     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);
-                }
-            });
-            $A.enqueueAction(action);
-        }
-    },
-
-    // PIPL update Yin Mingjie 21/02/2022 start
-    AWS_search : function(retMap,component) {
-        var token = retMap.sre.token;
-        var searchUrl = retMap.sre.searchUrl;
-
-        var dataArr = new Array();
-        for (const key in retMap) {
-            if (key == 'sre') {continue;}
-            dataArr.push(key);
-        }
-        if(dataArr.length == 0){
-            component.set('v.login',false);
-            this.warning('娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�');
-            return;
-        }
-        let obj= Object.create(null);
-        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'){
-                this.to_doctor_list(result,retMap,component);
-            }else{
-                this.error('AWS search status : ' + result.status);
-                component.set('v.login',false);
-            }
-        },component);
-        // fetch(searchUrl, {
-        //     method: 'POST',
-        //     body: payload,
-        //     headers: {
-        //         'Content-Type': 'application/json',
-        //         'pi-token': token
-        //     }
-        // }).then((data) => {
-        //     return data.json();
-        // }).then((result) => {
-            
-        // }).catch(error => {
-        //     this.error('AWS search error.');
-        //     component.set('v.login',false);
-        // });
-    },
-    search_core : function(token,searchUrl,payload,callback,component) {
-        fetch(searchUrl, {
-            method: 'POST',
-            body: payload,
-            headers: {
-                'Content-Type': 'application/json',
-                'pi-token': token
-            }
-        }).then((data) => {
-            return data.json();
-        }).then((result) => {
-            component.set('v.login',false);
-            if(callback)callback(result);
-        }).catch(error => {
-            this.error('AWS search error.');
-            component.set('v.login',false);
-        });
-    },
-
-    to_doctor_list : function(result,retMap,component) {
-        var resls = result.object;
-        var res = [];
-        var space = {};
-        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;
-            res.push(t);
-        }
-
-        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;
-                    doctor_title = res[i].Doctor_Division1__c;
-                } else {
-                    res[i].selected = false;
-                }
-            }
-
-            component.find('select_doctor').set('v.options', res);
-            component.set('v.doctor_title', doctor_title);
+          // PIPL update Yin Mingjie 21/02/2022 end
         } else {
-            component.find('select_doctor').set('v.options', res);
-            if (res.length > 0) {
-                component.set('v.doctor_title', res[0].Doctor_Division1__c);
-            }
+          this.error("set_doctor_list failed.");
+          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
-
-    // stageNameChange : function(component, event, helper) {
-    //     var options = component.find('input-oppstage').get("v.body")[0].get('v.options');
-    //     var remove;
-    //     for (var i = 0; i < options.length; i++) {
-    //         if (options[i].label == '鐩爣') {
-    //             remove = i;
-    //             break;
-    //         }
-    //     }
-    //     options.splice(remove,1);
-    // },
-    
-    opportunityChange : function(component, event, helper) {
-        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('鍖婚櫌涓嶅瓨鍦�');
-                // 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');
-                // 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', '');            
-                // }
-                return false;
-            }
-            var action = component.get('c.selectOpportunityByIdAndHospitalLinkId');
-            action.setParams({
-                "opportunity_id" : opp_id,
-                "agency_hospital_link_id" : component.get('v.hospitalLinkId'),
-            });
-
-            component.set('v.login',true);
-            action.setCallback(this,function(response){
-                var state = response.getState();
-                if(state == 'SUCCESS'){
-                    var res = response.getReturnValue();
-                    if (res.length <= 0) {
-                        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');
-                        // 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);
-                        return false;
-                    } else if (res[0]['StageName2__c'] != '3.璇环' && !component.get('v.loadOpp')){
-                        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');
-                        // 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);
-                        return false;
-                    } 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);
-
-                        $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);
-                }
-            });
-            $A.enqueueAction(action);
-        }
-    },
-    
-    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','');
-        }
-    },
-    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','');
-        }
-    },
-    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','');
-        }
-    },
-    
-    conv_selected : function(obj) {
-        for (var i = 0; i < obj.length; i++) {
-            if (obj[i].selected) {
-                if (obj[i].selected == 'true') {
-                    obj[i].selected = true;
-                } else {
-                    obj[i].selected = false;
-                }
-            }
-        }
-        
-        return obj;
-    },
-    
-    set_selected : function (component, aura_id_name, value) {
-        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) {
-                    select_tmp[i].selected = true;
-                } else {
-                    select_tmp[i].selected = false;
-                }
-            }
-            component.find(aura_id_name).set('v.options', select_tmp);
-            return true;
-        } else {
-            return false;
-        }
-    },
-    
-    success : function(message) {
-        var toastEvent = $A.get("e.force:showToast");
-        toastEvent.setParams({
-            "title" : "鎴愬姛!",
-            "message" : message,
-            "type" : "success",
-            "duration" : "5000"
-        });
-        toastEvent.fire();
-    },
-    
-    warning : function(message) {
-        var toastEvent = $A.get("e.force:showToast");
-        toastEvent.setParams({
-            "title": "璀﹀憡!",
-            "message": message,
-            "type":"warning",
-            "duration" : "10000"
-        });
-        toastEvent.fire();
-    },
-    
-    error : function(message) {
-        // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
-        var toastEvent = $A.get("e.force:showToast");
-
-        toastEvent.setParams({
-            "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');
-    },
-
-    // vivek start 娣诲姞楠岃瘉
-    // handleFormSubmit : function(component) {
-    //     var showValidationError = false;
-    //     var fields = component.find("newOpportunityField");
-    //     var vaildationFailReason = '';
-    //     var currentDate = new Date().toJSON().slice(0,10);
- 
-    //     fields.forEach(function (field) {
-    //         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"))){
-    //             showValidationError = true;
-    //             vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
-    //         }
-    //     });
-         
-    //     if (showValidationError) {
-    //         component.find('OppMessage').setError(vaildationFailReason);
-    //     }
-    // },
-    // 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');
-    },
-            
-    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('.瀹㈡埛浜哄憳宸插垱寤恒��');
-        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');
-    },
-    setOpportunity_cfilter : function(component) {
-        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 ';
-            }
-            opportunity_cfilter += 'Department_Cateogy__c=' + '\'' + Department_Cateogy__c + '\'';
-        }
-        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');
-        }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!');
-                        break;
-                    case evt.target.error.NOT_READABLE_ERR:
-                        alert('File is not readable');
-                        break;
-                    case evt.target.error.ABORT_ERR:
-                        break; // noop
-                    default:
-                        alert('An error occurred reading this file.');
-                };
-            }
-            //reader.onprogress = updateProgress;
-            reader.onabort = function(e) {
-                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>';
-                component.set("v.filename",file.name);
-                component.set("v.TargetFileName",output);
-               
-            };
-            reader.onload = function(e) {
-                var data=e.target.result;
-                component.set("v.fileContentData",data);
-                console.log("file data"+JSON.stringify(data));
-                // 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(',');
-                
-                // 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{
-                    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>';
-                    for(i=0;i<headers.length; i++){
-                        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]!=''){
-                            content +="<tr>";
-                            content +="<td>"+i+"</td>";
-                            for(var j=0;j<filecontentdata.length;j++){
-                                content +='<td>'+filecontentdata[j]+'</td>';
-                            }
-                            content +="</tr>";
-                        }
-                    }
-                    content += "</table>";
-                    console.log(content);
-                    component.set("v.TableContent",content);
-                    component.set("v.showMain",false);                   
-                }
-            }
-            reader.readAsText(file,'gb2312');
-            
-        }
-        var reader = new FileReader();
-        reader.onloadend = function() {
-         
-        };
-        reader.readAsDataURL(file);
-    },
-    
-    saveRecords : function(component,event,helper){
-        component.set('v.login',true);
-        //fy 瀵煎叆 20220424 start
-        var action1 = component.get("c.processDataAWSId");
-        action1.setParams({ 
-            fileData : component.get("v.fileContentData"),
-        }); 
-        action1.setCallback(this, function(response) {
-            var state = response.getState();
-            if (state === "SUCCESS") {
-                var ress = response.getReturnValue();
-                if(ress){
-                    var valur =ress.split('error1');
-                    if(valur.length<=1){
-                        var res = JSON.parse(response.getReturnValue());
-                        var dataArr = new Array();
-                        var dataMap = new Map();
-                        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);
-                            }
-                        });
-                        debugger
-                        let obj= Object.create(null);
-                        obj['dataIds'] = dataArr;
-                        var payload = JSON.stringify(obj);
-                        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'){
-                                    if(result.object != null&&result.object.length != 0){
-                                        // var resultjson = JSON.stringify(result.object);
-                                        // if(resultjson){
-                                        //     debugger
-                                        //     console.warn('001');
-                                        //     component.set('v.login',true);
-                                        //     this.ImportMethod(component,resultjson);
-                                        // }
-                                        component.set('v.login',true);
-                                        this.saveRecordsEditFile(component,dataMap,result.object,helper);
-                                    }else{
-                                        this.error('AWS search status ' );
-                                        component.set('v.login',false);
-                                    }
-                                }else{
-                                    this.error('AWS search status : ' + result.status);
-                                    component.set('v.login',false);
-                                }
-                            },component);
-                        //     var resultjson =null;
-                        // this.ImportMethod(component,resultjson);
-                            
-                        });
-                        // var resultjson =null;
-                        // this.ImportMethod(component,resultjson);
-                    }else{
-                        this.error(valur[1]+'\n'+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
-                    }
-                }
-            }
-        });
-        $A.enqueueAction(action1);
-        //fy 瀵煎叆 20220424 end
-        // var action = component.get("c.processData");
-        // 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");
-        // action.setParams({ 
-        //     fileData : component.get("v.fileContentData"),
-        //     //selectDateselectDate :component.find('select_date').get('v.value'),
-        //     sobjectName:'Account', //Any object
-        //     fields:fieldsList
-        // });        
-        // action.setCallback(this, function(response) {
-        //     var state = response.getState();
-        //     if (state === "SUCCESS") {
-                
-        //         var res = response.getReturnValue();
-        //         var res1 = '';
-        //         console.log("[[[[[["+res);
-        //         if(res != 'success'){
-        //             debugger
-        //             var ress = res.split('=');
-        //             console.log(ress);
-        //             for (var i=0; i<ress.length; i++) {
-        //                 res1 += ress[i].substr(7)+'\n';
-        //             }
-        //             // $('.forceToastManager').css('white-space', 'pre-wrap');
-        //             console.log("=="+res1);
-        //             this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
-        //             component.set('v.login',false);
-        //         }else{
-        //             component.set("v.showMain",true);
-        //             this.success("瀵煎叆鎴愬姛");
-        //             // alert('saved successfully');
-        //             component.set('v.login',false);
-        //         }
-                
-        //     }
-        //     else if (state === "INCOMPLETE") {
-        //         // do something
-        //         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);
-        //             }
-        //         } else {
-        //             console.log("Unknown error");
-        //             component.set('v.login',false);
-        //         }
-        //     }
-        // });
-        // $A.enqueueAction(action);
-
-    },ImportMethod : function(component,fileStr){
-        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 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
-            fields:fieldsList
-            // Agency_ContactListjson:resultjson
-        }); 
-        actionss.setCallback(this, function(response) {
-                console.log('002');
-                var state = response.getState();
-                if (state === "SUCCESS") {
-                    var res = response.getReturnValue();
-                    var res1 = '';
-                    console.log("[[[[[["+res);
-                    if(res != 'success'){
-                        var ress = res.split('=');
-                        console.log(ress);
-                        for (var i=0; i<ress.length; i++) {
-                            res1 += ress[i].substr(7)+'\n';
-                        }
-                        // $('.forceToastManager').css('white-space', 'pre-wrap');
-                        console.log("=="+res1);
-                        this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
-                        component.set('v.login',false);
-                    }else{
-                        component.set("v.showMain",true);
-                        this.success("瀵煎叆鎴愬姛");
-                        // alert('saved successfully');
-                        component.set('v.login',false);
-                    }
-                    
-                }
-                else if (state === "INCOMPLETE") {
-                    // do something
-                    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);
-                        }
-                    } else {
-                        console.log("Unknown error");
-                        component.set('v.login',false);
-                    }
-                }
-        });    
-        $A.enqueueAction(actionss);
-    },saveRecordsEditFile : function(component,dataMap,searchData,helper){
-        var searchDataMap = new Map();
-         for (var i = 0; i < searchData.length; i++) {
-         var sd = searchData[i];
-         searchDataMap.set(sd.name.replace(' ',''),sd.dataId);
-         }
-         console.log('searchDataMap='+searchDataMap);
-         var error = '';
-         var fileData = component.get("v.fileContentData");
-         var files = fileData.split('\n');
-
-         var fileStr = files[0];
-         fileStr += '\n';
-
-       for (var i = 1; i < files.length-1; i++) {
-         var filelist = files[i].split(',');
-         var fileName = filelist[4];
-
-         if (searchDataMap.get(fileName.replace(' ',''))) {
-                 var nameDataId = searchDataMap.get(fileName.replace(' ',''));
-                if (dataMap.get(nameDataId)) {
-                     filelist[4] = dataMap.get(nameDataId);
-                }else {
-                     error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉SF涓嶅瓨鍦�';
-                     error += '=';
-                }
-            }else {
-                 error += 'error1 绗�'+i+'琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�';
-                 error += '=';
-            }
-            fileStr += filelist.toString();
-             fileStr += '\n';
-        }
-
-        if (error != '') {
-            this.error(error);
-            console.log('error='+error);
-            component.set('v.login',false);
-            return;
-         }
-
-         console.log('fileStr='+fileStr);
-         $A.getCallback(function(){
-             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';
-        //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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 = '';
-        csvStringResult += thkeys.join(columnDivider);
-        csvStringResult += lineDivider;
-        console.log("杩涘叆瀵煎嚭helper");
-        for(var i=0; i < objectRecords.length; i++){   
-            counter = 0;
-            for(var sTempkey in keys) {
-                var skey = keys[sTempkey];
-                if(counter > 0){ 
-                    csvStringResult += columnDivider; 
-                }
-                if(typeof objectRecords[i][skey] === "undefined"){
-                    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'){
-                    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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                    csvStringResult += '"'+ objectRecords[i].SupportNeeds__c+'"';
-                }
-                else{
-                    csvStringResult += '"'+ objectRecords[i][skey]+'"';
-                }
-                counter++;
-             
-            } // inner for loop close    
-            console.log("瀵煎嚭寰幆缁撴潫");
-            csvStringResult += lineDivider;
-        }// outer main for loop close 
-       
-       // return the CSV formate String 
-        return csvStringResult;        
-    },
-    showExportDate : function(component,objectRecords){
-        console.log('杩涘叆showexceportdate'+objectRecords);//SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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 += "</tr></thead>";
-        for(var i=0; i < objectRecords.length; i++){
-            console.log('for'+content);
-            content += '<tr>';
-            // content += '<td>'+(i+1)+'</td>';
-            for(var sTempkey in keys) {
-                console.log('for1'+sTempkey);
-                var skey = keys[sTempkey];
-                if(typeof objectRecords[i][skey] === "undefined"){
-                    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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
-                    content += '<td>'+ objectRecords[i].SupportNeeds__c+'</td>';
-                }
-                else{
-                    content += '<td>'+ objectRecords[i][skey]+'</td>';
-                }
-            } // inner for loop close     
-            content += '</tr>'
-        }// outer main for loop close 
-        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);
-        var action = component.get("c.getReportsByDate");
-        console.log('杈撳叆鐨勫紑濮嬫棩鏈�1');
-        action.setParams({ 
-            date1 : reportsdate1,
-            date2: reportsdate2
-        });
-        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);
-
-                // 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){
-                            awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
-                        }
-                    }                    
-                    if(awsids.length > 0){
-                        let awsurl = component.get('v.awsurl');
-                        
-                        AWSService.search(awsurl.searchUrl,{
-                            dataIds:awsids
-                        }, function(data){
-                            if(data && data.object && data.object.length){
-                                let m = {};
-                                for(let di in data.object){
-                                    if(data.object[di] && data.object[di].dataId){
-                                        m[data.object[di].dataId] = data.object[di];
-                                    }
-                                }
-                                
-                                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;
-                                        
-                                    }
-                                }
-                            }
-                            helper.showExportDate(component, res);
-                            
-                            component.set('v.login', false);
-                        }, awsurl.token);
-                    }else{
-                        helper.showExportDate(component, res);
-                    }
-                }
-                
-
-                component.set('v.reports_date', res);
-                
-            }else{
-                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');
-    },
-
-    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');
-    },
-
-    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');
-    },
-
-    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');
+      });
+      $A.enqueueAction(action);
     }
-    
-    // searchAgencyContact : function(res) {
-    //     var agencyContacts = [];
-    //     for (let idx = 0; idx < res.length; idx++) {
-    //         agencyContacts.push(res[idx].awsid);
+  },
+
+  // PIPL update Yin Mingjie 21/02/2022 start
+  AWS_search: function (retMap, component) {
+    var token = retMap.sre.token;
+    var searchUrl = retMap.sre.searchUrl;
+
+    var dataArr = new Array();
+    for (const key in retMap) {
+      if (key == "sre") {
+        continue;
+      }
+      dataArr.push(key);
+    }
+    if (dataArr.length == 0) {
+      component.set("v.login", false);
+      this.warning("娌℃湁鎵惧埌绗﹀悎鏉′欢鐨勫鎴蜂汉鍛�");
+      return;
+    }
+    let obj = Object.create(null);
+    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") {
+          this.to_doctor_list(result, retMap, component);
+        } else {
+          this.error("AWS search status4 : " + result.status);
+          component.set("v.login", false);
+        }
+      },
+      component
+    );
+    // fetch(searchUrl, {
+    //     method: 'POST',
+    //     body: payload,
+    //     headers: {
+    //         'Content-Type': 'application/json',
+    //         'pi-token': token
     //     }
-    //     var action = component.get('c.getAWStoken');
-    //     action.setCallback(this,function(response){
-    //         var state = response.getState();
-    //         console.log('state : ' + state);
-    //         if(state === 'SUCCESS') {
-    //             console.log('get name : ' + action.getName());
-    //         }
-    //         else if(state === 'INCOMPLETE') {
-    //             console.log('incomplete state');
-    //         } else if(state === 'ERROR') {
-    //             if (errors) {
-    //                 if (errors[0] && errors[0].message) {
-    //                     console.log("Error message: " +
-    //                              errors[0].message);
-    //                 }
-    //             } else {
-    //                 console.log("Unknown error");
+    // }).then((data) => {
+    //     return data.json();
+    // }).then((result) => {
+
+    // }).catch(error => {
+    //     this.error('AWS search error.');
+    //     component.set('v.login',false);
+    // });
+  },
+  search_core: function (token, searchUrl, payload, callback, component) {
+    console.log("token = " + token);
+    console.log("searchUrl = " + searchUrl);
+    console.log("payload = " + payload);
+    fetch(searchUrl, {
+      method: "POST",
+      body: payload,
+      headers: {
+        "Content-Type": "application/json",
+        "pi-token": token
+      }
+    })
+      .then((data) => {
+        return data.json();
+      })
+      .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);
+      });
+  },
+
+  to_doctor_list: function (result, retMap, component) {
+    var resls = result.object;
+    var res = [];
+    var space = {};
+    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;
+      res.push(t);
+    }
+
+    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;
+          doctor_title = res[i].Doctor_Division1__c;
+        } else {
+          res[i].selected = false;
+        }
+      }
+
+      component.find("select_doctor").set("v.options", res);
+      component.set("v.doctor_title", doctor_title);
+    } else {
+      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.default_select_doctor_id", "");
+    component.set("v.doctor_list", res);
+    component.set("v.login", false);
+  },
+  // PIPL update Yin Mingjie 21/02/2022 end
+
+  // stageNameChange : function(component, event, helper) {
+  //     var options = component.find('input-oppstage').get("v.body")[0].get('v.options');
+  //     var remove;
+  //     for (var i = 0; i < options.length; i++) {
+  //         if (options[i].label == '鐩爣') {
+  //             remove = i;
+  //             break;
+  //         }
+  //     }
+  //     options.splice(remove,1);
+  // },
+
+  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"
+      );
+    } else if (opp_id != "") {
+      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"
+        );
+        // 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', '');
+        // }
+        return false;
+      }
+      var action = component.get("c.selectOpportunityByIdAndHospitalLinkId");
+      action.setParams({
+        opportunity_id: opp_id,
+        agency_hospital_link_id: component.get("v.hospitalLinkId")
+      });
+
+      component.set("v.login", true);
+      action.setCallback(this, function (response) {
+        var state = response.getState();
+        if (state == "SUCCESS") {
+          var res = response.getReturnValue();
+          if (res.length <= 0) {
+            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"
+            );
+            // 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);
+            return false;
+          }
+          //SWAG-CKH5M8  銆愬鎵樸�戝懆鎶ュ叧鑱旇浠凤紝鍙�夋嫨璇环鑼冨洿璋冩暣 fy start
+          //  else if (res[0]['StageName2__c'] != '3.璇环' && !component.get('v.loadOpp')){
+          //     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');
+          //     // 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);
+          //     return false;
+          // }
+          //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);
+
+            $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);
+        }
+      });
+      $A.enqueueAction(action);
+    }
+  },
+
+  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", "");
+    }
+  },
+  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", "");
+    }
+  },
+  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", "");
+    }
+  },
+
+  conv_selected: function (obj) {
+    for (var i = 0; i < obj.length; i++) {
+      if (obj[i].selected) {
+        if (obj[i].selected == "true") {
+          obj[i].selected = true;
+        } else {
+          obj[i].selected = false;
+        }
+      }
+    }
+
+    return obj;
+  },
+
+  set_selected: function (component, aura_id_name, value) {
+    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) {
+          select_tmp[i].selected = true;
+        } else {
+          select_tmp[i].selected = false;
+        }
+      }
+      component.find(aura_id_name).set("v.options", select_tmp);
+      return true;
+    } else {
+      return false;
+    }
+  },
+
+  success: function (message) {
+    var toastEvent = $A.get("e.force:showToast");
+    toastEvent.setParams({
+      title: "鎴愬姛!",
+      message: message,
+      type: "success",
+      duration: "5000"
+    });
+    toastEvent.fire();
+  },
+
+  warning: function (message) {
+    var toastEvent = $A.get("e.force:showToast");
+    toastEvent.setParams({
+      title: "璀﹀憡!",
+      message: message,
+      type: "warning",
+      duration: "10000"
+    });
+    toastEvent.fire();
+  },
+
+  error: function (message) {
+    // $('toastMessage.forceToastManager').css('white-space', 'pre-wrap');
+    var toastEvent = $A.get("e.force:showToast");
+
+    toastEvent.setParams({
+      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');
+  },
+
+  // vivek start 娣诲姞楠岃瘉
+  // handleFormSubmit : function(component) {
+  //     var showValidationError = false;
+  //     var fields = component.find("newOpportunityField");
+  //     var vaildationFailReason = '';
+  //     var currentDate = new Date().toJSON().slice(0,10);
+
+  //     fields.forEach(function (field) {
+  //         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"))){
+  //             showValidationError = true;
+  //             vaildationFailReason = "鍖荤敓鍖哄垎(鑱屽姟)涓嶈兘涓虹┖锛�";
+  //         }
+  //     });
+
+  //     if (showValidationError) {
+  //         component.find('OppMessage').setError(vaildationFailReason);
+  //     }
+  // },
+  // 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");
+  },
+
+  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(".瀹㈡埛浜哄憳宸插垱寤恒��");
+    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");
+  },
+  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 + "'";
+    }
+    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 + "'";
+    }
+    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");
+    } 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!");
+            break;
+          case evt.target.error.NOT_READABLE_ERR:
+            alert("File is not readable");
+            break;
+          case evt.target.error.ABORT_ERR:
+            break; // noop
+          default:
+            alert("An error occurred reading this file.");
+        }
+      };
+      //reader.onprogress = updateProgress;
+      reader.onabort = function (e) {
+        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>";
+        component.set("v.filename", file.name);
+        component.set("v.TargetFileName", output);
+      };
+      reader.onload = function (e) {
+        var data = e.target.result;
+        component.set("v.fileContentData", data);
+        console.log("file data" + JSON.stringify(data));
+        // 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(",");
+
+        // 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 {
+          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>";
+          for (i = 0; i < headers.length; i++) {
+            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] != "") {
+              content += "<tr>";
+              content += "<td>" + i + "</td>";
+              for (var j = 0; j < filecontentdata.length; j++) {
+                content += "<td>" + filecontentdata[j] + "</td>";
+              }
+              content += "</tr>";
+            }
+          }
+          content += "</table>";
+          console.log(content);
+          component.set("v.TableContent", content);
+          component.set("v.showMain", false);
+        }
+      };
+      reader.readAsText(file, "gb2312");
+    }
+    var reader = new FileReader();
+    reader.onloadend = function () {};
+    reader.readAsDataURL(file);
+  },
+
+  saveRecords: function (component, event, helper) {
+    component.set("v.login", true);
+    //fy 瀵煎叆 20220424 start
+    var action1 = component.get("c.processDataAWSId");
+    action1.setParams({
+      fileData: component.get("v.fileContentData")
+    });
+    action1.setCallback(this, function (response) {
+      console.log("response = " + JSON.stringify(response));
+      var state = response.getState();
+      if (state === "SUCCESS") {
+        var ress = response.getReturnValue();
+        console.log("ress = " + JSON.stringify(ress));
+        if (ress) {
+          var valur = ress.split("error1");
+          if (valur.length <= 1) {
+            var res = JSON.parse(response.getReturnValue());
+            console.log("res = " + JSON.stringify(res));
+            var dataArr = new Array();
+            var dataMap = new Map();
+            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;
+            var payload = JSON.stringify(obj);
+            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") {
+                      if (result.object != null && result.object.length != 0) {
+                        // var resultjson = JSON.stringify(result.object);
+                        // if(resultjson){
+                        //     debugger
+                        //     console.warn('001');
+                        //     component.set('v.login',true);
+                        //     this.ImportMethod(component,resultjson);
+                        // }
+                        component.set("v.login", true);
+                        this.saveRecordsEditFile(
+                          component,
+                          dataMap,
+                          result.object,
+                          helper
+                        );
+                      } else {
+                        this.error("AWS search status5 ");
+                        component.set("v.login", false);
+                      }
+                    } else {
+                      this.error("AWS search status6 : " + result.status);
+                      component.set("v.login", false);
+                    }
+                  },
+                  component
+                );
+                //     var resultjson =null;
+                // this.ImportMethod(component,resultjson);
+              }
+            );
+            // var resultjson =null;
+            // this.ImportMethod(component,resultjson);
+          } else {
+            this.error(valur[1] + "\n" + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+          }
+        }
+      }
+    });
+    $A.enqueueAction(action1);
+    //fy 瀵煎叆 20220424 end
+    // var action = component.get("c.processData");
+    // 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");
+    // action.setParams({
+    //     fileData : component.get("v.fileContentData"),
+    //     //selectDateselectDate :component.find('select_date').get('v.value'),
+    //     sobjectName:'Account', //Any object
+    //     fields:fieldsList
+    // });
+    // action.setCallback(this, function(response) {
+    //     var state = response.getState();
+    //     if (state === "SUCCESS") {
+
+    //         var res = response.getReturnValue();
+    //         var res1 = '';
+    //         console.log("[[[[[["+res);
+    //         if(res != 'success'){
+    //             debugger
+    //             var ress = res.split('=');
+    //             console.log(ress);
+    //             for (var i=0; i<ress.length; i++) {
+    //                 res1 += ress[i].substr(7)+'\n';
     //             }
+    //             // $('.forceToastManager').css('white-space', 'pre-wrap');
+    //             console.log("=="+res1);
+    //             this.error(res1+"璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+    //             component.set('v.login',false);
+    //         }else{
+    //             component.set("v.showMain",true);
+    //             this.success("瀵煎叆鎴愬姛");
+    //             // alert('saved successfully');
+    //             component.set('v.login',false);
     //         }
-    //     });
-    //     $A.enqueueAction(action);
-    //     // var requestSearchPayload = new Map();
-    //     // requestSearchPayload.set("dataIds",agencyContacts);
-    //     var data = '{"dataIds": ["944233643042144256", "943645353649897473"]}';
-    //     var token = 'eyJhbGciOiJIUzUxMiJ9.eyJjcmVhdGVkIjoxNjQ0NzY4MTIwNjc2LCJhcHBpZCI6IjZMeml6Y1JmN2g4eUx4MjgiLCJleHAiOjE2NDk5NTIxMjB9.6vORDP8BRaf_beCt4SEXrl3DEuYZ3owotkUqh27r8YhfmKDDWrv_NpVVpjTPeFjvzlQqaJMcFobZeAmPxpmq2A';
-    //     var searchUrl = 'https://52.83.101.205/api/agencycontact/search';
-    //     var data = this.search(searchUrl,data,token);
-    //     return data;searchUrl,requestSearchPayload,token
-    // },
-})
\ No newline at end of file
+
+    //     }
+    //     else if (state === "INCOMPLETE") {
+    //         // do something
+    //         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);
+    //             }
+    //         } else {
+    //             console.log("Unknown error");
+    //             component.set('v.login',false);
+    //         }
+    //     }
+    // });
+    // $A.enqueueAction(action);
+  },
+  ImportMethod: function (component, fileStr) {
+    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 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
+      fields: fieldsList
+      // Agency_ContactListjson:resultjson
+    });
+    actionss.setCallback(this, function (response) {
+      console.log("002");
+      var state = response.getState();
+      if (state === "SUCCESS") {
+        var res = response.getReturnValue();
+        var res1 = "";
+        console.log("[[[[[[" + res);
+        if (res != "success") {
+          var ress = res.split("=");
+          console.log(ress);
+          for (var i = 0; i < ress.length; i++) {
+            res1 += ress[i].substr(7) + "\n";
+          }
+          // $('.forceToastManager').css('white-space', 'pre-wrap');
+          console.log("==" + res1);
+          this.error(res1 + "璇蜂慨鏀瑰悗閲嶆柊涓婁紶");
+          component.set("v.login", false);
+        } else {
+          component.set("v.showMain", true);
+          this.success("瀵煎叆鎴愬姛");
+          // alert('saved successfully');
+          component.set("v.login", false);
+        }
+      } else if (state === "INCOMPLETE") {
+        // do something
+        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);
+          }
+        } else {
+          console.log("Unknown error");
+          component.set("v.login", false);
+        }
+      }
+    });
+    $A.enqueueAction(actionss);
+  },
+  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);
+    }
+    console.log("searchDataMap=" + searchDataMap);
+    var error = "";
+    var fileData = component.get("v.fileContentData");
+    var files = fileData.split("\n");
+
+    var fileStr = files[0];
+    fileStr += "\n";
+
+    for (var i = 1; i < files.length - 1; i++) {
+      var filelist = files[i].split(",");
+      var fileName = filelist[4];
+
+      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 += "=";
+        }
+      } else {
+        error += "error1 绗�" + i + "琛屾暟鎹嫓璁夸汉AWS涓嶅瓨鍦�";
+        error += "=";
+      }
+      fileStr += filelist.toString();
+      fileStr += "\n";
+    }
+
+    if (error != "") {
+      this.error(error);
+      console.log("error=" + error);
+      component.set("v.login", false);
+      return;
+    }
+
+    console.log("fileStr=" + fileStr);
+    $A.getCallback(function () {
+      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";
+    //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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 = "";
+    csvStringResult += thkeys.join(columnDivider);
+    csvStringResult += lineDivider;
+    console.log("杩涘叆瀵煎嚭helper");
+    for (var i = 0; i < objectRecords.length; i++) {
+      counter = 0;
+      for (var sTempkey in keys) {
+        var skey = keys[sTempkey];
+        if (counter > 0) {
+          csvStringResult += columnDivider;
+        }
+        if (typeof objectRecords[i][skey] === "undefined") {
+          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") {
+          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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+          csvStringResult += '"' + objectRecords[i].SupportNeeds__c + '"';
+        } else {
+          csvStringResult += '"' + objectRecords[i][skey] + '"';
+        }
+        counter++;
+      } // inner for loop close
+      console.log("瀵煎嚭寰幆缁撴潫");
+      csvStringResult += lineDivider;
+    } // outer main for loop close
+
+    // return the CSV formate String
+    return csvStringResult;
+  },
+  showExportDate: function (component, objectRecords) {
+    console.log("杩涘叆showexceportdate" + objectRecords); //SWAG-CBX68C fy 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� 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 += "</tr></thead>";
+    for (var i = 0; i < objectRecords.length; i++) {
+      console.log("for" + content);
+      content += "<tr>";
+      // content += '<td>'+(i+1)+'</td>';
+      for (var sTempkey in keys) {
+        console.log("for1" + sTempkey);
+        var skey = keys[sTempkey];
+        if (typeof objectRecords[i][skey] === "undefined") {
+          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 銆愬鎵樸�慏AMS绯荤粺鍛ㄦ姤妯″潡鍐呭闇�姹傚鍔� start
+          content += "<td>" + objectRecords[i].SupportNeeds__c + "</td>";
+        } else {
+          content += "<td>" + objectRecords[i][skey] + "</td>";
+        }
+      } // inner for loop close
+      content += "</tr>";
+    } // outer main for loop close
+    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
+    );
+    var action = component.get("c.getReportsByDate");
+    console.log("杈撳叆鐨勫紑濮嬫棩鏈�1");
+    action.setParams({
+      date1: reportsdate1,
+      date2: reportsdate2
+    });
+    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);
+
+        // 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
+            ) {
+              awsids.push(res[ri].doctor2__r.AWS_Data_Id__c);
+            }
+          }
+          if (awsids.length > 0) {
+            let awsurl = component.get("v.awsurl");
+
+            AWSService.search(
+              awsurl.searchUrl,
+              {
+                dataIds: awsids
+              },
+              function (data) {
+                if (data && data.object && data.object.length) {
+                  let m = {};
+                  for (let di in data.object) {
+                    if (data.object[di] && data.object[di].dataId) {
+                      m[data.object[di].dataId] = data.object[di];
+                    }
+                  }
+
+                  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;
+                    }
+                  }
+                }
+                helper.showExportDate(component, res);
+
+                component.set("v.login", false);
+              },
+              awsurl.token
+            );
+          } else {
+            helper.showExportDate(component, res);
+          }
+        }
+
+        component.set("v.reports_date", res);
+      } else {
+        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");
+  },
+
+  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");
+  },
+
+  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");
+  },
+
+  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");
+  },
+
+  //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 start
+  CallBackAction: function (component, action_name, para, callback) {
+    var action = component.get(
+      "c." + action_name.trimStart().replace("c.", "")
+    );
+    if (para) {
+      action.setParams(para);
+    }
+    if (callback) {
+      action.setCallback(this, function (data) {
+        callback(data);
+      });
+    }
+
+    $A.enqueueAction(action);
+  }
+  //zhj MEBG鏂版柟妗堟敼閫� 2022-11-29 end
+
+  // searchAgencyContact : function(res) {
+  //     var agencyContacts = [];
+  //     for (let idx = 0; idx < res.length; idx++) {
+  //         agencyContacts.push(res[idx].awsid);
+  //     }
+  //     var action = component.get('c.getAWStoken');
+  //     action.setCallback(this,function(response){
+  //         var state = response.getState();
+  //         console.log('state : ' + state);
+  //         if(state === 'SUCCESS') {
+  //             console.log('get name : ' + action.getName());
+  //         }
+  //         else if(state === 'INCOMPLETE') {
+  //             console.log('incomplete state');
+  //         } else if(state === 'ERROR') {
+  //             if (errors) {
+  //                 if (errors[0] && errors[0].message) {
+  //                     console.log("Error message: " +
+  //                              errors[0].message);
+  //                 }
+  //             } else {
+  //                 console.log("Unknown error");
+  //             }
+  //         }
+  //     });
+  //     $A.enqueueAction(action);
+  //     // var requestSearchPayload = new Map();
+  //     // requestSearchPayload.set("dataIds",agencyContacts);
+  //     var data = '{"dataIds": ["944233643042144256", "943645353649897473"]}';
+  //     var token = 'eyJhbGciOiJIUzUxMiJ9.eyJjcmVhdGVkIjoxNjQ0NzY4MTIwNjc2LCJhcHBpZCI6IjZMeml6Y1JmN2g4eUx4MjgiLCJleHAiOjE2NDk5NTIxMjB9.6vORDP8BRaf_beCt4SEXrl3DEuYZ3owotkUqh27r8YhfmKDDWrv_NpVVpjTPeFjvzlQqaJMcFobZeAmPxpmq2A';
+  //     var searchUrl = 'https://52.83.101.205/api/agencycontact/search';
+  //     var data = this.search(searchUrl,data,token);
+  //     return data;searchUrl,requestSearchPayload,token
+  // },
+});
diff --git a/force-app/main/default/classes/ContactTriggerHandler.cls b/force-app/main/default/classes/ContactTriggerHandler.cls
index cb33adc..8d1fca3 100644
--- a/force-app/main/default/classes/ContactTriggerHandler.cls
+++ b/force-app/main/default/classes/ContactTriggerHandler.cls
@@ -2,587 +2,665 @@
  * Select Id From Contact Where RecordTypeId = '01210000000QfWdAAK' and Strategic_dept_Class__c != null
  */
 public without sharing class ContactTriggerHandler extends Oly_TriggerHandler {
-    private Map < Id, Contact > newMap;
-    private Map < Id, Contact > oldMap;
-    private List < Contact > newList;
-    private List < Contact > oldList;
-    private Id AgencyId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId(); // 20220830 ljh LLIU-CHR8FF add
-        
-    public ContactTriggerHandler() {
-        this.newMap = (Map < Id, Contact > ) Trigger.newMap;
-        this.oldMap = (Map < Id, Contact > ) Trigger.oldMap;
-        this.newList = (List < Contact > ) Trigger.new;
-        this.oldList = (List < Contact > ) Trigger.old;
+  private Map<Id, Contact> newMap;
+  private Map<Id, Contact> oldMap;
+  private List<Contact> newList;
+  private List<Contact> oldList;
+  private Id AgencyId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+    .get('Agency')
+    .getRecordTypeId(); // 20220830 ljh LLIU-CHR8FF add
+
+  public ContactTriggerHandler() {
+    this.newMap = (Map<Id, Contact>) Trigger.newMap;
+    this.oldMap = (Map<Id, Contact>) Trigger.oldMap;
+    this.newList = (List<Contact>) Trigger.new;
+    this.oldList = (List<Contact>) Trigger.old;
+  }
+  protected override void beforeInsert() {
+    if (
+      Test.isRunningTest() || UserInfo.getUserId() != System.Label.ByPassTrigger
+    ) {
+      //Add by Li Jun for PIPL 20220331
+      mobileNumberVerification();
     }
-    protected override void beforeInsert() {
-        if(Test.isRunningTest()||UserInfo.getUserId()!=System.Label.ByPassTrigger){ //Add by Li Jun for PIPL 20220331
-            mobileNumberVerification();
-        }
-    }
+  }
 
-    protected override void afterInsert() {
-        syncToAgencyContact();
-        updateDealerNum();
-        sendToComPlat();
-        updateChargeState();// 20220830 ljh LLIU-CHR8FF
-    }
+  protected override void afterInsert() {
+    syncToAgencyContact();
+    updateDealerNum();
+    sendToComPlat();
+    updateChargeState(); // 20220830 ljh LLIU-CHR8FF
+  }
 
-    protected override void afterUpdate() {
-        syncToAgencyContact();
-        updateDealerNum();
-        sendToComPlat();
-    }
+  protected override void afterUpdate() {
+    syncToAgencyContact();
+    updateDealerNum();
+    sendToComPlat();
+  }
 
-    protected override void beforeUpdate() {
-        // 鏈嶅姟鎶�甯� 2018/12/24  Start
-        UpdateProcessingWork();
-        // 鏈嶅姟鎶�甯� 2018/12/24  end
-        mobileNumberVerification();
-    }
-
-
-    protected override void afterDelete() {
-        syncToAgencyContactDelete();
-        updateDealerNum();
-    }
-
-    //
-    /**
-     * @author 寮犵帀灞�
-     * @DateTime 2019-03-11T13:49:10+0800
-     * 鏍规嵁鏈嶅姟鎶�甯堝~鍐欐儏鍐垫洿鏂板鎴蜂汉鍛樹笂鐨勫紑灞曞伐浣滃瓧娈�
-     */
-    private void UpdateProcessingWork() {
-        for (Contact temContact: newList) {
-            if (System.label.UpdateServiceHistory.equals('true')) {
-
-                string ProcessingWork = '';
-                string ProcessingWorkWithoutNumber = '';
-                if (temContact.ServiceBookInput__c != 0) {
-                    ProcessingWork += '缁翠慨濮旀墭涔﹀~鍐�' + temContact.ServiceBookInput__c + '娆�';
-                    ProcessingWorkWithoutNumber += '缁翠慨濮旀墭涔﹀~鍐�';
-
-                }
-                if (temContact.InspectTime__c != 0) {
-                    if (String.isBlank(ProcessingWork)) {
-                        ProcessingWork += '鐐规' + temContact.InspectTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '鐐规';
-                    } else {
-                        ProcessingWork += '锛岀偣妫�' + temContact.InspectTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '锛岀偣妫�';
-
-                    }
-                }
-                if (temContact.InspectEquipmentTime__c != 0) {
-                    if (String.isBlank(ProcessingWork)) {
-                        ProcessingWork += '鐐规璁惧' + temContact.InspectEquipmentTime__c + '涓�';
-                        ProcessingWorkWithoutNumber += '鐐规璁惧';
-                    } else {
-                        ProcessingWork += '锛岀偣妫�璁惧' + temContact.InspectEquipmentTime__c + '涓�';
-                        ProcessingWorkWithoutNumber += '锛岀偣妫�璁惧';
-                    }
-
-                }
-                if (temContact.VisitTime__c != 0) {
-                    if (String.isBlank(ProcessingWork)) {
-                        ProcessingWork += '涓婇棬' + temContact.VisitTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '涓婇棬';
-                    } else {
-                        ProcessingWork += '锛屼笂闂�' + temContact.VisitTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '锛屼笂闂�';
-                    }
-
-                }
-                if (temContact.pollingTime__c != 0) {
-                    if (String.isBlank(ProcessingWork)) {
-                        ProcessingWork += '宸℃' + temContact.pollingTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '宸℃';
-                    } else {
-                        ProcessingWork += '锛屽贰妫�' + temContact.pollingTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '锛屽贰妫�';
-                    }
-
-                }
-                if (temContact.TeachingTime__c != 0) {
-                    if (String.isBlank(ProcessingWork)) {
-                        ProcessingWork += '鍩硅娆℃暟' + temContact.TeachingTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '鍩硅娆℃暟';
-                    } else {
-                        ProcessingWork += '锛屽煿璁鏁�' + temContact.TeachingTime__c + '娆�';
-                        ProcessingWorkWithoutNumber += '锛屽煿璁鏁�';
-                    }
-                }
-                //if (!String.isBlank(ProcessingWork)) {
-                //    ProcessingWork += '銆�';
-                //    ProcessingWorkWithoutNumber += '銆�';
-                //}
-                temContact.ProcessingWork__c = ProcessingWork;
-                temContact.ProcessingWorkWithoutNumber__c = ProcessingWorkWithoutNumber;
-
-
-            }
-        }
-
-    }
+  protected override void beforeUpdate() {
+    // 鏈嶅姟鎶�甯� 2018/12/24  Start
+    UpdateProcessingWork();
     // 鏈嶅姟鎶�甯� 2018/12/24  end
-    private void syncToAgencyContact() {
-        System.debug('enter syncToAgencyContact');
-        Map < Id, Agency_Contact__c > targetContactMap = new Map < Id, Agency_Contact__c > ();
-        Map < Id, Contact > ContactMap = new Map < Id, Contact > ();
-        for (Contact nObj: newList) {
-            if (nObj.RecordTypeId == '01210000000QfWdAAK' // Doctor
-                &&
-                String.isBlank(nObj.Strategic_dept_Class__c) == false
-            ) {
-                if (Trigger.isInsert ||
-                    (Trigger.isUpdate
-                        //                        && (
-                        //                            oldMap.get(nObj.Id).LastName                != nObj.LastName
-                        //                         || oldMap.get(nObj.Id).FirstName               != nObj.FirstName
-                        //                         || oldMap.get(nObj.Id).Strategic_dept_Class__c != nObj.Strategic_dept_Class__c
-                        //                         || oldMap.get(nObj.Id).Type__c                 != nObj.Type__c
-                        //                         || oldMap.get(nObj.Id).Doctor_Division1__c     != nObj.Doctor_Division1__c
-                        //                        )
-                    )
-                ) {
-                    //Agency_Contact__c acObj = new Agency_Contact__c(Agency_ID__c = '000000000000000', Contact__c = nObj.Id, ContactId18__c = nObj.Id, Agency_Hospital__c = null, Name = nObj.LastName + ((String.isBlank(nObj.FirstName) == false) ? ' ' + nObj.FirstName : ''), Department_Class__c = nObj.Strategic_dept_Class__c, Type__c = nObj.Type__c, Doctor_Division1__c = nObj.Doctor_Division1__c);
-                    //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 鍘绘帀Encrypted start
-                    Agency_Contact__c acObj = new Agency_Contact__c(
-                        Agency_ID__c = '000000000000000', 
-                        Contact__c = nObj.Id, 
-                        ContactId18__c = nObj.Id, 
-                        Agency_Hospital__c = null, 
-                        Name = nObj.LastName,
-                        //Name_Encrypted__c = nObj.LastName_Encrypted__c,
-                        Department_Class__c = nObj.Strategic_dept_Class__c, 
-                        Type__c = nObj.Type__c,
-                        //Type_Encrypted__c = nObj.Type_Encrypted__c,
-                        Doctor_Division1__c = nObj.Doctor_Division1__c
-                        //Doctor_Division1_Encrypted__c = nObj.Doctor_Division1_Encrypted__c
-                    );
-                    //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 鍘绘帀Encrypted end
-                    targetContactMap.put(nObj.Id, acObj);
-                    ContactMap.put(nObj.Id, nObj);
-                }
-            }
+    mobileNumberVerification();
+  }
+
+  protected override void afterDelete() {
+    syncToAgencyContactDelete();
+    updateDealerNum();
+  }
+
+  //
+  /**
+   * @author 寮犵帀灞�
+   * @DateTime 2019-03-11T13:49:10+0800
+   * 鏍规嵁鏈嶅姟鎶�甯堝~鍐欐儏鍐垫洿鏂板鎴蜂汉鍛樹笂鐨勫紑灞曞伐浣滃瓧娈�
+   */
+  private void UpdateProcessingWork() {
+    for (Contact temContact : newList) {
+      if (System.label.UpdateServiceHistory.equals('true')) {
+        string ProcessingWork = '';
+        string ProcessingWorkWithoutNumber = '';
+        if (temContact.ServiceBookInput__c != 0) {
+          ProcessingWork +=
+            '缁翠慨濮旀墭涔﹀~鍐�' +
+            temContact.ServiceBookInput__c +
+            '娆�';
+          ProcessingWorkWithoutNumber += '缁翠慨濮旀墭涔﹀~鍐�';
         }
-        if (targetContactMap.size() > 0) {
-            List<Agency_Contact__c> temp = targetContactMap.values();
-            upsert temp ContactId18__c;
-            system.debug('temp='+temp);
-            EncryptInsert(temp,ContactMap);
+        if (temContact.InspectTime__c != 0) {
+          if (String.isBlank(ProcessingWork)) {
+            ProcessingWork += '鐐规' + temContact.InspectTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '鐐规';
+          } else {
+            ProcessingWork += '锛岀偣妫�' + temContact.InspectTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '锛岀偣妫�';
+          }
         }
+        if (temContact.InspectEquipmentTime__c != 0) {
+          if (String.isBlank(ProcessingWork)) {
+            ProcessingWork +=
+              '鐐规璁惧' +
+              temContact.InspectEquipmentTime__c +
+              '涓�';
+            ProcessingWorkWithoutNumber += '鐐规璁惧';
+          } else {
+            ProcessingWork +=
+              '锛岀偣妫�璁惧' +
+              temContact.InspectEquipmentTime__c +
+              '涓�';
+            ProcessingWorkWithoutNumber += '锛岀偣妫�璁惧';
+          }
+        }
+        if (temContact.VisitTime__c != 0) {
+          if (String.isBlank(ProcessingWork)) {
+            ProcessingWork += '涓婇棬' + temContact.VisitTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '涓婇棬';
+          } else {
+            ProcessingWork += '锛屼笂闂�' + temContact.VisitTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '锛屼笂闂�';
+          }
+        }
+        if (temContact.pollingTime__c != 0) {
+          if (String.isBlank(ProcessingWork)) {
+            ProcessingWork += '宸℃' + temContact.pollingTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '宸℃';
+          } else {
+            ProcessingWork += '锛屽贰妫�' + temContact.pollingTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '锛屽贰妫�';
+          }
+        }
+        if (temContact.TeachingTime__c != 0) {
+          if (String.isBlank(ProcessingWork)) {
+            ProcessingWork += '鍩硅娆℃暟' + temContact.TeachingTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '鍩硅娆℃暟';
+          } else {
+            ProcessingWork += '锛屽煿璁鏁�' + temContact.TeachingTime__c + '娆�';
+            ProcessingWorkWithoutNumber += '锛屽煿璁鏁�';
+          }
+        }
+        //if (!String.isBlank(ProcessingWork)) {
+        //    ProcessingWork += '銆�';
+        //    ProcessingWorkWithoutNumber += '銆�';
+        //}
+        temContact.ProcessingWork__c = ProcessingWork;
+        temContact.ProcessingWorkWithoutNumber__c = ProcessingWorkWithoutNumber;
+      }
     }
-    
-    static void EncryptInsert(List<Agency_Contact__c> aclist,Map < Id, Contact > ContactMap){
-        if(!(system.isFuture() || system.isBatch())){
-            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 start
-            //AwsServiceTool2.EncryptPushFuture(Json.serialize(aclist), 'Agency_Contact__c');
-
-            Map<String,PIHelper.PIIntegration> staticResource = new Map<String,PIHelper.PIIntegration>();
-            staticResource.put('Contact',PIHelper.getPIIntegrationInfo('Contact'));
-            staticResource.put('Agency_Contact__c',PIHelper.getPIIntegrationInfo('Agency_Contact__c'));
-            Map<String, Map<String, PI_Field_Policy_Detail__c>> mmsp = new Map<String, Map<String,PI_Field_Policy_Detail__c>>();
-            for (String key : staticResource.keySet()) {
-                mmsp.put(key, new Map<String,PI_Field_Policy_Detail__c>());
-                for (PI_Field_Policy_Detail__c detail : staticResource.get(key).PIDetails) {
-                    mmsp.get(key).put(detail.SF_Field_API_Name__c, detail);
-                }
-            }
-
-            System.debug('mmsp = ' + mmsp);
-            List<AWSServiceTool2V2.EncryptPushRequestBody> EncryptPushList = new List<AWSServiceTool2V2.EncryptPushRequestBody>();
-            for(Agency_Contact__c ac : aclist){
-                AWSServiceTool2V2.EncryptPushRequestBody EncryptPush = new AWSServiceTool2V2.EncryptPushRequestBody();
-                EncryptPush.dataId = ac.AWS_Data_Id__c != null ?ac.AWS_Data_Id__c:'';
-                EncryptPush.sfRecordId = ac.Id;
-                EncryptPush.fieldsMapping = new Map<String, List<AWSServiceTool2V2.EncryptPushRes>>();
-                List<AWSServiceTool2V2.EncryptPushRes> resList = new List<AWSServiceTool2V2.EncryptPushRes>();
-                AWSServiceTool2V2.EncryptPushRes res= new AWSServiceTool2V2.EncryptPushRes();
-                res.isQueryDb = true;
-                res.value = '';
-                res.table = staticResource.get('Contact').awsTableName;
-                res.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
-                res.field = mmsp.get('Contact').get('LastName').AWS_Field_API__c;
-                resList.add(res);
-
-                List<AWSServiceTool2V2.EncryptPushRes> resList2 = new List<AWSServiceTool2V2.EncryptPushRes>();
-                AWSServiceTool2V2.EncryptPushRes res2= new AWSServiceTool2V2.EncryptPushRes();
-                res2.isQueryDb = true;
-                res2.value = '';
-                res2.table = staticResource.get('Contact').awsTableName;
-                res2.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
-                res2.field = mmsp.get('Contact').get('Type__c').AWS_Field_API__c;
-                resList2.add(res2);
-
-                List<AWSServiceTool2V2.EncryptPushRes> resList3 = new List<AWSServiceTool2V2.EncryptPushRes>();
-                AWSServiceTool2V2.EncryptPushRes res3= new AWSServiceTool2V2.EncryptPushRes();
-                res3.isQueryDb = true;
-                res3.value = '';
-                res3.table = staticResource.get('Contact').awsTableName;
-                res3.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
-                res3.field = mmsp.get('Contact').get('Doctor_Division1__c').AWS_Field_API__c;
-                resList3.add(res3);
-
-                System.debug('Agency_Contact__c Name = ' +mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c);
-                System.debug('resList = ' + resList);
-                EncryptPush.fieldsMapping.put(mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c, resList);
-                EncryptPush.fieldsMapping.put(mmsp.get('Agency_Contact__c').get('Type__c').AWS_Field_API__c, resList2);
-                EncryptPush.fieldsMapping.put(mmsp.get('Agency_Contact__c').get('Doctor_Division1__c').AWS_Field_API__c, resList3);
-                EncryptPushList.add(EncryptPush);
-            }
-            System.debug('EncryptPushListdataId = ' + JSON.serialize(EncryptPushList[0].dataId));
-            System.debug('EncryptPushListsfRecordId = ' + JSON.serialize(EncryptPushList[0].sfRecordId));
-            System.debug('EncryptPushListfieldsMapping = ' + JSON.serialize(EncryptPushList[0].fieldsMapping));
-            System.debug('EncryptPushList = ' + JSON.serialize(EncryptPushList));
-            if(!Test.isRunningTest())
-                AwsServiceTool2V2.EncryptPushFutureV2(Json.serialize(EncryptPushList),Json.serialize(aclist), 'Agency_Contact__c');
-            //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 end
-        }else{
-            //Add By Li Jun for sync agency contact to aws 20220424 start
-            if(!Test.isRunningTest()){
-                System.debug('ContactMap = ' + ContactMap);
-                SyncAccountContactToAWS.assignOnceOneMinuteLater(aclist,ContactMap);
-            }
-            //Add By Li Jun for sync agency contact to aws 20220424 end
+  }
+  // 鏈嶅姟鎶�甯� 2018/12/24  end
+  private void syncToAgencyContact() {
+    System.debug('enter syncToAgencyContact');
+    Map<Id, Agency_Contact__c> targetContactMap = new Map<Id, Agency_Contact__c>();
+    Map<Id, Contact> ContactMap = new Map<Id, Contact>();
+    for (Contact nObj : newList) {
+      if (
+        nObj.RecordTypeId ==
+        '01210000000QfWdAAK' && // Doctor
+        String.isBlank(nObj.Strategic_dept_Class__c) == false
+      ) {
+        if (
+          Trigger.isInsert ||
+          (Trigger.isUpdate)
+          //                        && (
+          //                            oldMap.get(nObj.Id).LastName                != nObj.LastName
+          //                         || oldMap.get(nObj.Id).FirstName               != nObj.FirstName
+          //                         || oldMap.get(nObj.Id).Strategic_dept_Class__c != nObj.Strategic_dept_Class__c
+          //                         || oldMap.get(nObj.Id).Type__c                 != nObj.Type__c
+          //                         || oldMap.get(nObj.Id).Doctor_Division1__c     != nObj.Doctor_Division1__c
+          //                        )
+        ) {
+          //Agency_Contact__c acObj = new Agency_Contact__c(Agency_ID__c = '000000000000000', Contact__c = nObj.Id, ContactId18__c = nObj.Id, Agency_Hospital__c = null, Name = nObj.LastName + ((String.isBlank(nObj.FirstName) == false) ? ' ' + nObj.FirstName : ''), Department_Class__c = nObj.Strategic_dept_Class__c, Type__c = nObj.Type__c, Doctor_Division1__c = nObj.Doctor_Division1__c);
+          //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 鍘绘帀Encrypted start
+          Agency_Contact__c acObj = new Agency_Contact__c(
+            Agency_ID__c = '000000000000000',
+            Contact__c = nObj.Id,
+            ContactId18__c = nObj.Id,
+            Agency_Hospital__c = null,
+            Name = nObj.LastName,
+            //Name_Encrypted__c = nObj.LastName_Encrypted__c,
+            Department_Class__c = nObj.Strategic_dept_Class__c,
+            Type__c = nObj.Type__c,
+            //Type_Encrypted__c = nObj.Type_Encrypted__c,
+            Doctor_Division1__c = nObj.Doctor_Division1__c
+            //Doctor_Division1_Encrypted__c = nObj.Doctor_Division1_Encrypted__c
+          );
+          //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 鍘绘帀Encrypted end
+          targetContactMap.put(nObj.Id, acObj);
+          ContactMap.put(nObj.Id, nObj);
         }
+      }
+    }
+    if (targetContactMap.size() > 0) {
+      List<Agency_Contact__c> temp = targetContactMap.values();
+      upsert temp ContactId18__c;
+      system.debug('temp=' + temp);
+      EncryptInsert(temp, ContactMap);
+    }
+  }
+
+  static void EncryptInsert(
+    List<Agency_Contact__c> aclist,
+    Map<Id, Contact> ContactMap
+  ) {
+    if (!(system.isFuture() || system.isBatch())) {
+      //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 start
+      //AwsServiceTool2.EncryptPushFuture(Json.serialize(aclist), 'Agency_Contact__c');
+
+      Map<String, PIHelper.PIIntegration> staticResource = new Map<String, PIHelper.PIIntegration>();
+      staticResource.put('Contact', PIHelper.getPIIntegrationInfo('Contact'));
+      staticResource.put(
+        'Agency_Contact__c',
+        PIHelper.getPIIntegrationInfo('Agency_Contact__c')
+      );
+      Map<String, Map<String, PI_Field_Policy_Detail__c>> mmsp = new Map<String, Map<String, PI_Field_Policy_Detail__c>>();
+      for (String key : staticResource.keySet()) {
+        mmsp.put(key, new Map<String, PI_Field_Policy_Detail__c>());
+        for (
+          PI_Field_Policy_Detail__c detail : staticResource.get(key).PIDetails
+        ) {
+          mmsp.get(key).put(detail.SF_Field_API_Name__c, detail);
+        }
+      }
+
+      System.debug('mmsp = ' + mmsp);
+      List<AWSServiceTool2V2.EncryptPushRequestBody> EncryptPushList = new List<AWSServiceTool2V2.EncryptPushRequestBody>();
+      for (Agency_Contact__c ac : aclist) {
+        AWSServiceTool2V2.EncryptPushRequestBody EncryptPush = new AWSServiceTool2V2.EncryptPushRequestBody();
+        EncryptPush.dataId = ac.AWS_Data_Id__c != null ? ac.AWS_Data_Id__c : '';
+        EncryptPush.sfRecordId = ac.Id;
+        EncryptPush.fieldsMapping = new Map<String, List<AWSServiceTool2V2.EncryptPushRes>>();
+        List<AWSServiceTool2V2.EncryptPushRes> resList = new List<AWSServiceTool2V2.EncryptPushRes>();
+        AWSServiceTool2V2.EncryptPushRes res = new AWSServiceTool2V2.EncryptPushRes();
+        res.isQueryDb = true;
+        res.value = '';
+        res.table = staticResource.get('Contact').awsTableName;
+        res.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
+        res.field = mmsp.get('Contact').get('LastName').AWS_Field_API__c;
+        resList.add(res);
+
+        List<AWSServiceTool2V2.EncryptPushRes> resList2 = new List<AWSServiceTool2V2.EncryptPushRes>();
+        AWSServiceTool2V2.EncryptPushRes res2 = new AWSServiceTool2V2.EncryptPushRes();
+        res2.isQueryDb = true;
+        res2.value = '';
+        res2.table = staticResource.get('Contact').awsTableName;
+        res2.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
+        res2.field = mmsp.get('Contact').get('Type__c').AWS_Field_API__c;
+        resList2.add(res2);
+
+        List<AWSServiceTool2V2.EncryptPushRes> resList3 = new List<AWSServiceTool2V2.EncryptPushRes>();
+        AWSServiceTool2V2.EncryptPushRes res3 = new AWSServiceTool2V2.EncryptPushRes();
+        res3.isQueryDb = true;
+        res3.value = '';
+        res3.table = staticResource.get('Contact').awsTableName;
+        res3.dataId = ContactMap.get(ac.Contact__c).AWS_Data_Id__c;
+        res3.field = mmsp.get('Contact')
+          .get('Doctor_Division1__c')
+          .AWS_Field_API__c;
+        resList3.add(res3);
+
+        System.debug(
+          'Agency_Contact__c Name = ' +
+          mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c
+        );
+        System.debug('resList = ' + resList);
+        EncryptPush.fieldsMapping.put(
+          mmsp.get('Agency_Contact__c').get('Name').AWS_Field_API__c,
+          resList
+        );
+        EncryptPush.fieldsMapping.put(
+          mmsp.get('Agency_Contact__c').get('Type__c').AWS_Field_API__c,
+          resList2
+        );
+        EncryptPush.fieldsMapping.put(
+          mmsp.get('Agency_Contact__c')
+            .get('Doctor_Division1__c')
+            .AWS_Field_API__c,
+          resList3
+        );
+        EncryptPushList.add(EncryptPush);
+      }
+      System.debug(
+        'EncryptPushListdataId = ' + JSON.serialize(EncryptPushList[0].dataId)
+      );
+      System.debug(
+        'EncryptPushListsfRecordId = ' +
+        JSON.serialize(EncryptPushList[0].sfRecordId)
+      );
+      System.debug(
+        'EncryptPushListfieldsMapping = ' +
+        JSON.serialize(EncryptPushList[0].fieldsMapping)
+      );
+      System.debug('EncryptPushList = ' + JSON.serialize(EncryptPushList));
+      if (!Test.isRunningTest())
+        AwsServiceTool2V2.EncryptPushFutureV2(
+          Json.serialize(EncryptPushList),
+          Json.serialize(aclist),
+          'Agency_Contact__c'
+        );
+      //zhj MEBG鏂版柟妗堟敼閫� 2022-11-27 end
+    } else {
+      //Add By Li Jun for sync agency contact to aws 20220424 start
+      if (!Test.isRunningTest()) {
+        System.debug('ContactMap = ' + ContactMap);
+        SyncAccountContactToAWS.assignOnceOneMinuteLater(aclist, ContactMap);
+      }
+      //Add By Li Jun for sync agency contact to aws 20220424 end
+    }
+  }
+
+  private void syncToAgencyContactDelete() {
+    List<Id> cIdList = new List<Id>();
+    for (Contact oObj : oldList) {
+      cIdList.add(oObj.Id);
+    }
+    if (cIdList.size() > 0) {
+      List<Agency_Contact__c> acList = [
+        SELECT Id
+        FROM Agency_Contact__c
+        WHERE Contact__c = :null AND Agency_ID__c = '000000000000000'
+      ];
+      if (acList.size() > 0) {
+        delete acList;
+      }
+    }
+  }
+
+  //鏇存柊缁忛攢鍟嗙敤鎴蜂汉鏁板瓧娈� 绮剧悽鎶�鏈� pk 2021-08-26 start
+  private void updateDealerNum() {
+    Set<Id> accountSet = new Set<Id>();
+    Map<Id, Account> acMap = new Map<Id, Account>();
+    if (Trigger.isUpdate) {
+      for (Contact contactnew : newList) {
+        if (
+          contactnew.Agency_User__c !=
+          oldMap.get(contactnew.Id).Agency_User__c ||
+          (System.Label.onlyUpdate == '1' &&
+          UserInfo.getUserId() == '00510000005sEEMAA2')
+        ) {
+          accountSet.add(contactnew.AccountId);
+        }
+      }
     }
 
-    private void syncToAgencyContactDelete() {
-        List < Id > cIdList = new List < Id > ();
-        for (Contact oObj: oldList) {
-            cIdList.add(oObj.Id);
+    if (Trigger.isInsert) {
+      for (Contact contactnew : newList) {
+        if (contactnew.Agency_User__c) {
+          accountSet.add(contactnew.AccountId);
         }
-        if (cIdList.size() > 0) {
-            List < Agency_Contact__c > acList = [Select Id From Agency_Contact__c
-                Where Contact__c =: null and Agency_ID__c = '000000000000000'
-            ];
-            if (acList.size() > 0) {
-                delete acList;
-            }
-        }
+      }
     }
 
-    //鏇存柊缁忛攢鍟嗙敤鎴蜂汉鏁板瓧娈� 绮剧悽鎶�鏈� pk 2021-08-26 start
-    private void updateDealerNum() {
-        Set < Id > accountSet = new Set < Id > ();
-        Map < Id, Account > acMap = new Map < Id, Account > ();
-        if (Trigger.isUpdate) {
-            for (Contact contactnew: newList) {
-                if (contactnew.Agency_User__c != oldMap.get(contactnew.Id).Agency_User__c || (System.Label.onlyUpdate == '1' && UserInfo.getUserId() == '00510000005sEEMAA2')) {
-                    accountSet.add(contactnew.AccountId);
-                }
-            }
+    if (Trigger.isDelete) {
+      for (Contact contactold : oldList) {
+        if (contactold.Agency_User__c) {
+          accountSet.add(contactold.AccountId);
         }
-
-        if (Trigger.isInsert) {
-            for (Contact contactnew: newList) {
-                if (contactnew.Agency_User__c) {
-                    accountSet.add(contactnew.AccountId);
-                }
-            }
-        }
-
-
-        if (Trigger.isDelete) {
-            for (Contact contactold: oldList) {
-                if (contactold.Agency_User__c) {
-                    accountSet.add(contactold.AccountId);
-                }
-            }
-        }
-
-        if (accountSet.size() > 0) {
-            List < AggregateResult > contactList = [select count(id) ctn, AccountId accid from Contact where Agency_User__c = true and AccountId =: accountSet and RecordTypeId = '01210000000QfWi'
-                group by AccountId
-            ];
-            for (AggregateResult ar: contactList) {
-                String accid = (String) ar.get('accid');
-                Account account = new Account();
-                account.id = accid;
-                account.Dealer_Num__c = (Integer) ar.get('ctn');
-                acMap.put(accid, account);
-            }
-
-            for (Id accountId: accountSet) {
-                if (!acMap.containsKey(accountId)) {
-                    Account account = new Account();
-                    account.id = accountId;
-                    account.Dealer_Num__c = 0;
-                    acMap.put(accountId, account);
-                }
-            }
-
-            if (acMap.size() > 0) {
-                update acMap.values();
-            }
-        }
-
-
+      }
     }
-    //鏇存柊缁忛攢鍟嗙敤鎴蜂汉鏁板瓧娈� 绮剧悽鎶�鏈� pk 2021-08-26 end
-    
-    //zhj 鏂版柟妗堟敼閫� 灏嗘墜鏈哄彿鍘婚噸鍙婂叾楠岃瘉瑙勫垯绉诲姩鍒癆WS鍜屽墠绔� start
-    // 鎵嬫満鍙峰幓閲嶅強瑙勫垯楠岃瘉 鍙婃柊澧炲鎴蜂汉鍛橀噸鍚嶉獙璇�
-    public void mobileNumberVerification(){
 
-        // Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
-        Map<String, Map<String,Contact>> accountContactMap = new Map<String, Map<String,Contact>>();
-        Set<Id> accountIdSet = new Set<Id>();
-        //鐢ㄦ埛瀵硅薄涓婃壘瀵瑰簲鐨勮仈绯讳汉
-        // List<User> userList=[select ID,ContactID from User where ContactID != null];
-        // Map<String,User> userMap= new Map<String,User>();
-        // if (userList.size()>0){
-        //     for(User us1: userList){
-        //         userMap.put(us1.ContactId, us1);
-        //     }
-        // }
-        //鏌ユ壘鑱旂郴浜哄璞′笂瀵瑰簲鐨勬湁鏁堝鎴凤紱鍖婚櫌鐩存帴浣跨敤鏈夋晥/鏃犳晥瀛楁銆佺粡閿�鍟嗕娇鐢ㄦ湁鏁�/鏃犳晥鍏紡瀛楁
-        List<String> accIdList = new List<String>();
-        Map<String,String> accMap= new Map<String,String>();
-        for (Contact contact1: newList) {
-            accIdList.add(contact1.AccountId);
+    if (accountSet.size() > 0) {
+      List<AggregateResult> contactList = [
+        SELECT count(id) ctn, AccountId accid
+        FROM Contact
+        WHERE
+          Agency_User__c = TRUE
+          AND AccountId = :accountSet
+          AND RecordTypeId = '01210000000QfWi'
+        GROUP BY AccountId
+      ];
+      for (AggregateResult ar : contactList) {
+        String accid = (String) ar.get('accid');
+        Account account = new Account();
+        account.id = accid;
+        account.Dealer_Num__c = (Integer) ar.get('ctn');
+        acMap.put(accid, account);
+      }
+
+      for (Id accountId : accountSet) {
+        if (!acMap.containsKey(accountId)) {
+          Account account = new Account();
+          account.id = accountId;
+          account.Dealer_Num__c = 0;
+          acMap.put(accountId, account);
         }
-        if (accIdList.size()>0){
-            List<Account> accList=[select ID,Is_Active__c,Is_Active_Formula__c from Account where ID in:accIdList];
-            if(accList.size()>0){
-                for(Account acc:accList){
-                    if (String.isNotBlank(acc.Is_Active__c)){
-                        accMap.put(acc.Id, acc.Is_Active__c);
-                        continue;
-                    }
-                    if (String.isNotBlank(acc.Is_Active_Formula__c)){
-                        accMap.put(acc.Id, acc.Is_Active_Formula__c);
-                    }
-                }
-            }
+      }
+
+      if (acMap.size() > 0) {
+        update acMap.values();
+      }
+    }
+  }
+  //鏇存柊缁忛攢鍟嗙敤鎴蜂汉鏁板瓧娈� 绮剧悽鎶�鏈� pk 2021-08-26 end
+
+  //zhj 鏂版柟妗堟敼閫� 灏嗘墜鏈哄彿鍘婚噸鍙婂叾楠岃瘉瑙勫垯绉诲姩鍒癆WS鍜屽墠绔� start
+  // 鎵嬫満鍙峰幓閲嶅強瑙勫垯楠岃瘉 鍙婃柊澧炲鎴蜂汉鍛橀噸鍚嶉獙璇�
+  public void mobileNumberVerification() {
+    // Pattern pattern = Pattern.compile('^(13[0-9]|14[01456879]|15[0-35-9]|16[2567]|17[0-8]|18[0-9]|19[0-35-9])\\d{8}$');
+    Map<String, Map<String, Contact>> accountContactMap = new Map<String, Map<String, Contact>>();
+    Set<Id> accountIdSet = new Set<Id>();
+    //鐢ㄦ埛瀵硅薄涓婃壘瀵瑰簲鐨勮仈绯讳汉
+    // List<User> userList=[select ID,ContactID from User where ContactID != null];
+    // Map<String,User> userMap= new Map<String,User>();
+    // if (userList.size()>0){
+    //     for(User us1: userList){
+    //         userMap.put(us1.ContactId, us1);
+    //     }
+    // }
+    //鏌ユ壘鑱旂郴浜哄璞′笂瀵瑰簲鐨勬湁鏁堝鎴凤紱鍖婚櫌鐩存帴浣跨敤鏈夋晥/鏃犳晥瀛楁銆佺粡閿�鍟嗕娇鐢ㄦ湁鏁�/鏃犳晥鍏紡瀛楁
+    List<String> accIdList = new List<String>();
+    Map<String, String> accMap = new Map<String, String>();
+    for (Contact contact1 : newList) {
+      accIdList.add(contact1.AccountId);
+    }
+    if (accIdList.size() > 0) {
+      List<Account> accList = [
+        SELECT ID, Is_Active__c, Is_Active_Formula__c
+        FROM Account
+        WHERE ID IN :accIdList
+      ];
+      if (accList.size() > 0) {
+        for (Account acc : accList) {
+          if (String.isNotBlank(acc.Is_Active__c)) {
+            accMap.put(acc.Id, acc.Is_Active__c);
+            continue;
+          }
+          if (String.isNotBlank(acc.Is_Active_Formula__c)) {
+            accMap.put(acc.Id, acc.Is_Active_Formula__c);
+          }
         }
-        //鎵嬫満鍙峰敮涓�鏍¢獙-鍖婚櫌涓嬫柊寤哄鎴蜂汉鍛樻牎楠屼娇鐢ㄥ姞瀵嗘墜鏈哄彿,缁忛攢鍟嗕娇鐢ㄦ櫘閫氭墜鏈哄彿 thh 20220328 start
-        ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Doctor').getRecordTypeId();
-        ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
-        for (Contact contactnew : newList) {
-            // 鎵嬫満鍙锋湁鍊煎苟涓旇仈绯讳汉鏈夋晥锛岃仈绯讳汉鐨勫鎴锋湁鏁堬紝杩涜鎵嬫満鍙风爜楠岃瘉
-            if (('鏈夋晥'.equals(contactnew.Isactive__c) || '鏈夊姽'.equals(contactnew.Isactive__c))
-                && ('鏈夊姽'.equals(accMap.get(contactnew.AccountId)) || '鏈夋晥'.equals(accMap.get(contactnew.AccountId)))) {
-                // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 start
-                if(AgencyRecordTypeId.equals(contactnew.RecordTypeId)){
-                    if(String.isNotBlank(contactnew.MobilePhone)){
-                        // Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
-                        // if (isMobilePhone.matches()) {
-                        contactnew.UniqueNumber__c = contactnew.MobilePhone;
-                        // } else {
-                            // 鎵嬫満鍙峰敮涓�瀛楁娓呯┖
-                            // contactnew.UniqueNumber__c = null;
-                        // }
-                    } else {
-                        contactnew.UniqueNumber__c = null;
-                    }
-                // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 end
-                } 
-                // else if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
-                //     if(String.isNotBlank(contactnew.MobilePhone_Encrypted__c)){
-                //         contactnew.UniqueNumber__c = contactnew.MobilePhone_Encrypted__c;
-                //     } else {
-                //         contactnew.UniqueNumber__c = null;
-                //     }
-                // }
-            }
-            // if (Trigger.isInsert) {
-            // if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
-            //     accountIdSet.add(contactnew.AccountId);  
+      }
+    }
+    //鎵嬫満鍙峰敮涓�鏍¢獙-鍖婚櫌涓嬫柊寤哄鎴蜂汉鍛樻牎楠屼娇鐢ㄥ姞瀵嗘墜鏈哄彿,缁忛攢鍟嗕娇鐢ㄦ櫘閫氭墜鏈哄彿 thh 20220328 start
+    ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+      .get('Doctor')
+      .getRecordTypeId();
+    ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+      .get('Agency')
+      .getRecordTypeId();
+    for (Contact contactnew : newList) {
+      // 鎵嬫満鍙锋湁鍊煎苟涓旇仈绯讳汉鏈夋晥锛岃仈绯讳汉鐨勫鎴锋湁鏁堬紝杩涜鎵嬫満鍙风爜楠岃瘉
+      if (
+        ('鏈夋晥'.equals(contactnew.Isactive__c) ||
+        '鏈夊姽'.equals(contactnew.Isactive__c)) &&
+        ('鏈夊姽'.equals(accMap.get(contactnew.AccountId)) ||
+        '鏈夋晥'.equals(accMap.get(contactnew.AccountId)))
+      ) {
+        // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 start
+        if (AgencyRecordTypeId.equals(contactnew.RecordTypeId)) {
+          if (String.isNotBlank(contactnew.MobilePhone)) {
+            // Matcher isMobilePhone = pattern.matcher(contactnew.MobilePhone);
+            // if (isMobilePhone.matches()) {
+            contactnew.UniqueNumber__c = contactnew.MobilePhone;
+            // } else {
+            // 鎵嬫満鍙峰敮涓�瀛楁娓呯┖
+            // contactnew.UniqueNumber__c = null;
             // }
-            // }   
+          } else {
+            contactnew.UniqueNumber__c = null;
+          }
+          // 缁忛攢鍟嗗鎴蜂汉鍛樹笉杩涜鎵嬫満鍙锋牎楠� thh 20220517 end
         }
-        //鎵嬫満鍙峰敮涓�鏍¢獙-鍖婚櫌涓嬫柊寤哄鎴蜂汉鍛樻牎楠屼娇鐢ㄥ姞瀵嗘墜鏈哄彿,缁忛攢鍟嗕娇鐢ㄦ櫘閫氭墜鏈哄彿 thh 20220328 end
-        // 鏂板鍖婚櫌鑱旂郴浜烘椂
-        // if (accountIdSet.size() > 0) {
-        //     List<Contact> contactList = new List<Contact>();
-        //     if(Trigger.isInsert){
-        //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
-        //                                         LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
-        //                                         , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
-        //                                         FROM Contact 
-        //                                         WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
-        //     }
-        //     if(Trigger.isUpdate){
-        //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
-        //                                      LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
-        //                                      , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
-        //                                     FROM Contact 
-        //                                     WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet AND Id Not IN: oldMap.keyset()];
-        //     }
-        //     System.debug('contactList:' + contactList);
-        //     if (contactList.size() > 0) {
-        //         for(Contact contact :contactList){
-        //             // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
-        //             // String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
-        //             // String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
-        //             // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr; 
-        //             String contactFullName = contact.LastName_Encrypted__c + contact.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
-        //             // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
-        //             if(string.isBlank(contactFullName)){
-        //                 continue;
-        //             }      
-        //             String accountId = String.valueOf(contact.AccountId).SubString(0,15);
-        //             Map<String,Contact> contactFullNameMap = new  Map<String,Contact>();
-        //             if (accountContactMap.containsKey(accountId)) {
-        //                 contactFullNameMap = accountContactMap.get(accountId);
-        //             }
-        //             contactFullNameMap.put(contactFullName, contact);
-        //             accountContactMap.put(accountId, contactFullNameMap);
-        //         }
+        // else if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
+        //     if(String.isNotBlank(contactnew.MobilePhone_Encrypted__c)){
+        //         contactnew.UniqueNumber__c = contactnew.MobilePhone_Encrypted__c;
+        //     } else {
+        //         contactnew.UniqueNumber__c = null;
         //     }
         // }
+      }
+      // if (Trigger.isInsert) {
+      // if(DoctorRecordTypeId.equals(contactnew.RecordTypeId)){
+      //     accountIdSet.add(contactnew.AccountId);
+      // }
+      // }
+    }
+    //鎵嬫満鍙峰敮涓�鏍¢獙-鍖婚櫌涓嬫柊寤哄鎴蜂汉鍛樻牎楠屼娇鐢ㄥ姞瀵嗘墜鏈哄彿,缁忛攢鍟嗕娇鐢ㄦ櫘閫氭墜鏈哄彿 thh 20220328 end
+    // 鏂板鍖婚櫌鑱旂郴浜烘椂
+    // if (accountIdSet.size() > 0) {
+    //     List<Contact> contactList = new List<Contact>();
+    //     if(Trigger.isInsert){
+    //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
+    //                                         LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
+    //                                         , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
+    //                                         FROM Contact
+    //                                         WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet];
+    //     }
+    //     if(Trigger.isUpdate){
+    //         contactList = [SELECT Id,AccountId,FullName__c,LastName,FirstName,Account.Name,CManageCode__c,IsFromSPO__c,
+    //                                      LastName_Encrypted__c// 20220314 PI鏀归�� by Bright
+    //                                      , MobilePhone_Encrypted__c // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518
+    //                                     FROM Contact
+    //                                     WHERE IsFromSPO__c = false AND AccountId IN:accountIdSet AND Id Not IN: oldMap.keyset()];
+    //     }
+    //     System.debug('contactList:' + contactList);
+    //     if (contactList.size() > 0) {
+    //         for(Contact contact :contactList){
+    //             // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+    //             // String lastNameStr = String.isNotBlank(contact.LastName) ? contact.LastName:'';
+    //             // String firstNameStr = String.isNotBlank(contact.FirstName) ? contact.FirstName:'';
+    //             // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
+    //             String contactFullName = contact.LastName_Encrypted__c + contact.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
+    //             // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+    //             if(string.isBlank(contactFullName)){
+    //                 continue;
+    //             }
+    //             String accountId = String.valueOf(contact.AccountId).SubString(0,15);
+    //             Map<String,Contact> contactFullNameMap = new  Map<String,Contact>();
+    //             if (accountContactMap.containsKey(accountId)) {
+    //                 contactFullNameMap = accountContactMap.get(accountId);
+    //             }
+    //             contactFullNameMap.put(contactFullName, contact);
+    //             accountContactMap.put(accountId, contactFullNameMap);
+    //         }
+    //     }
+    // }
 
-        // for (Contact contactnew: newList) {
-        //     if(AgencyRecordTypeId.equals(contactnew.RecordTypeId) || (Trigger.isUpdate && !oldMap.isEmpty() && oldMap.get(contactnew.Id) != null 
-        //         && String.isBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) 
-        //         && String.isBlank(contactnew.MobilePhone_Encrypted__c))){
-        //         continue;
-        //     }
-        //     String accountId = String.valueOf(contactnew.AccountId).substring(0, 15);
-        //     if (accountContactMap.containsKey(accountId)) {
-        //         Map<String,Contact> contactFullNameMap =  accountContactMap.get(accountId);
-        //         // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
-        //         // String lastNameStr = String.isNotBlank(contactnew.LastName) ? contactnew.LastName:'';
-        //         // String firstNameStr = String.isNotBlank(contactnew.FirstName) ? contactnew.FirstName:'';
-        //         // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
-        //         String contactFullName = contactnew.LastName_Encrypted__c + contactnew.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
-        //         // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
-        //         if (contactFullNameMap.containsKey(contactFullName)) {
-        //             String accountName = contactFullNameMap.get(contactFullName).Account.Name;
-        //             String cManageCode = contactFullNameMap.get(contactFullName).CManageCode__c;
-        //             // 璺宠繃娴嬭瘯绋嬪簭 鍜� SPO閫氳繃203鎺ュ彛鍒涘缓鐨勮仈绯讳汉
-        //             if (!(Test.isRunningTest() || contactnew.IsFromSPO__c)) {
-        //                 // if(Trigger.isInsert) {
-        //                     contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');     
-        //                 // } 
-        //                 // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 start
-        //                 // if(Trigger.isUpdate && !UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
-        //                 //     if (String.isNotBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) && String.isBlank(contactnew.MobilePhone_Encrypted__c)){
-        //                 //         contactnew.LastName.addError('鐩稿悓鍚嶅瓧鐨勮仈绯讳汉 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 鎵嬫満鍙蜂负绌哄凡缁忓瓨鍦紝涓嶈兘閲嶅鍒涘缓锛岃浜嗚В');
-        //                 //     } 
-        //                 //     if (oldMap.get(contactnew.Id).CManageCode__c != contactnew.CManageCode__c){
-        //                 //         contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�'); 
-        //                 //     }
-        //                 // }
-        //                 // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 end
-        //             } 
-        //         }
-        //     }
+    // for (Contact contactnew: newList) {
+    //     if(AgencyRecordTypeId.equals(contactnew.RecordTypeId) || (Trigger.isUpdate && !oldMap.isEmpty() && oldMap.get(contactnew.Id) != null
+    //         && String.isBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c)
+    //         && String.isBlank(contactnew.MobilePhone_Encrypted__c))){
+    //         continue;
+    //     }
+    //     String accountId = String.valueOf(contactnew.AccountId).substring(0, 15);
+    //     if (accountContactMap.containsKey(accountId)) {
+    //         Map<String,Contact> contactFullNameMap =  accountContactMap.get(accountId);
+    //         // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 start
+    //         // String lastNameStr = String.isNotBlank(contactnew.LastName) ? contactnew.LastName:'';
+    //         // String firstNameStr = String.isNotBlank(contactnew.FirstName) ? contactnew.FirstName:'';
+    //         // String contactFullName = lastNameStr + firstNameStr + MobilePhoneStr;
+    //         String contactFullName = contactnew.LastName_Encrypted__c + contactnew.MobilePhone_Encrypted__c;// 20220314 PI鏀归�� by Bright
+    //         // 閫氳繃濮撳悕+鎵嬫満鍙峰垽鏂汉鍛樻槸鍚﹂噸澶� thh 20220518 end
+    //         if (contactFullNameMap.containsKey(contactFullName)) {
+    //             String accountName = contactFullNameMap.get(contactFullName).Account.Name;
+    //             String cManageCode = contactFullNameMap.get(contactFullName).CManageCode__c;
+    //             // 璺宠繃娴嬭瘯绋嬪簭 鍜� SPO閫氳繃203鎺ュ彛鍒涘缓鐨勮仈绯讳汉
+    //             if (!(Test.isRunningTest() || contactnew.IsFromSPO__c)) {
+    //                 // if(Trigger.isInsert) {
+    //                     contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');
+    //                 // }
+    //                 // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 start
+    //                 // if(Trigger.isUpdate && !UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
+    //                 //     if (String.isNotBlank(oldMap.get(contactnew.Id).MobilePhone_Encrypted__c) && String.isBlank(contactnew.MobilePhone_Encrypted__c)){
+    //                 //         contactnew.LastName.addError('鐩稿悓鍚嶅瓧鐨勮仈绯讳汉 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 鎵嬫満鍙蜂负绌哄凡缁忓瓨鍦紝涓嶈兘閲嶅鍒涘缓锛岃浜嗚В');
+    //                 //     }
+    //                 //     if (oldMap.get(contactnew.Id).CManageCode__c != contactnew.CManageCode__c){
+    //                 //         contactnew.LastName.addError('瀹㈡埛 [ '+accountName+ ' ],宸插瓨鍦ㄧ浉鍚屽悕瀛楃殑鑱旂郴浜� 浜哄憳绠$悊缂栫爜 ['+cManageCode+' ] 锛屼笉鑳介噸澶嶅垱寤猴紝璇蜂簡瑙�');
+    //                 //     }
+    //                 // }
+    //                 // 瀹㈡埛浜哄憳鍒犻櫎鎵嬫満鍙锋椂,杩涜鍒ゆ柇鏄惁瀛樺湪鍚屽悕涓旀墜鏈哄彿涓虹┖鐨勫鎴蜂汉鍛� thh 20220523 end
+    //             }
+    //         }
+    //     }
+    // }
+  }
+  //zhj 鏂版柟妗堟敼閫� 灏嗘墜鏈哄彿鍘婚噸鍙婂叾楠岃瘉瑙勫垯绉诲姩鍒癆WS鍜屽墠绔� end
+
+  public static Map<Id, Id> NFM606_IdMap = new Map<Id, Id>();
+  // 606鎺ュ彛璋冪敤闂淇 thh 20220330 start
+  private void sendToComPlat() {
+    List<Id> contactIdList = new List<Id>();
+    List<String> interfaceUserUpsertContact = new List<String>();
+    for (Contact local : newList) {
+      Contact old = null;
+      if (Trigger.isUpdate) {
+        old = oldMap.get(local.Id);
+      }
+      if (
+        Trigger.isInsert ||
+        old.LastName != local.LastName ||
+        old.FirstName != local.FirstName ||
+        old.Email != local.Email || //銉°兗銉� Email
+        old.MobilePhone != local.MobilePhone || //鎵嬫満鍙风爜 Mobile_Phone__c
+        old.Employee_No_manual__c != local.Employee_No_manual__c || //鍛樺伐鍙风爜 Employee_No__c
+        old.Work_Location_manual__c != local.Work_Location_manual__c || //宸ヤ綔鍦� Work_Location__c
+        old.Post_picklist__c != local.Post_picklist__c || //鑱屼綅 post__c
+        old.Job_Category_picklist__c != local.Job_Category_picklist__c || //鑱岀 Job_Category__c
+        old.Hire_date_text__c != local.Hire_date_text__c || //鍏ヨ亴鏃� Hire_date__c
+        old.Gender_text__c != local.Gender_text__c || //鎬у埆 Gender__c
+        old.dept__c != local.dept__c || //鏈儴 dept__c
+        old.Pregnant_Rest__c != local.Pregnant_Rest__c || // 鏄惁浜у亣 Pregnant_Rest__c
+        old.Stay_or_not__c != local.Stay_or_not__c || // 鍦ㄨ亴/绂昏亴 Stay_or_not__c
+        //|| old.Salesdepartment_Text__c != local.Salesdepartment_Text__c // 閿�鍞湰閮� Salesdepartment__c
+        old.AccountId != local.AccountId || //瀹㈡埛浜哄憳鎹㈠鎴�
+        old.Isactive__c != local.Isactive__c || //鐘舵�佸彉鏇�
+        old.ServicePlatformCode__c != local.ServicePlatformCode__c || //鏈嶅姟骞冲彴缂栫爜
+        old.UnifiedI_Contact_ID__c != local.UnifiedI_Contact_ID__c || //鏅烘収鍖荤枟缂栫爜
+        old.ContactType__c != local.ContactType__c || //浜哄憳绫诲瀷
+        (old.ChargeState__c != local.ChargeState__c &&
+        local.RecordTypeId == AgencyId) //璐熻矗鐪� // 20220830 ljh LLIU-CHR8FF add
+      ) {
+        //鑾峰彇瀹㈡埛浜哄憳鐨勮褰曠被鍨婭D thh 20220330 start
+        ID InternalStaffRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+          .get('Internal_staff')
+          .getRecordTypeId();
+        ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+          .get('Doctor')
+          .getRecordTypeId();
+        ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName()
+          .get('Agency')
+          .getRecordTypeId();
+        //鑾峰彇瀹㈡埛浜哄憳鐨勮褰曠被鍨婭D thh 20220330 end
+        System.debug(
+          'local.UnifiedI_Contact_ID__c1:' + local.UnifiedI_Contact_ID__c
+        );
+        System.debug('local.MobilePhone1:' + local.MobilePhone);
+        // gzw 20220824 bugfix start
+        // if (!local.IsFromSPO__c && !InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
+        if (!InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
+          // gzw 20220824 bugfix end
+          // 鍖婚櫌 瀹㈡埛浜哄憳 缁熶竴骞冲彴缂栫爜鏈夊�� 鍙戦�� PO
+          if (
+            DoctorRecordTypeId.equals(local.RecordTypeId) &&
+            String.isNotBlank(local.UnifiedI_Contact_ID__c)
+          ) {
+            if (!NFM606_IdMap.containsKey(local.Id)) {
+              if (UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
+                interfaceUserUpsertContact.add(local.Id);
+              } else {
+                contactIdList.add(local.Id);
+              }
+              NFM606_IdMap.put(local.Id, local.Id);
+            }
+          }
+          // 缁忛攢鍟� 瀹㈡埛浜哄憳 鎵嬫満鍙风爜鏈夊�� 鍙戦�� PO
+          if (
+            AgencyRecordTypeId.equals(local.RecordTypeId) &&
+            String.isNotBlank(local.MobilePhone)
+          ) {
+            if (!NFM606_IdMap.containsKey(local.Id)) {
+              if (UserInfo.getUserId().equals(System.Label.interfaceUserID)) {
+                interfaceUserUpsertContact.add(local.Id);
+              } else {
+                contactIdList.add(local.Id);
+              }
+              NFM606_IdMap.put(local.Id, local.Id);
+            }
+          }
+        }
+      }
+    }
+    //606鏍囪
+    if (!System.Test.isRunningTest()) {
+      // NFM606Controller.executeNotFuture('', contactIdList);
+      if (contactIdList.size() > 0) {
+        // NFM606Controller.callout('', contactIdList);
+        //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220317 start
+        // if (!(System.isFuture()||System.isBatch())) {
+        NFM606Controller.callout('', contactIdList);
+
+        // } else{
+        // NFM606Controller.executeNotFuture('', contactIdList);
         // }
+        //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220317 end
+      }
+      if (interfaceUserUpsertContact.size() > 0) {
+        NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
+        //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220316 start
+        // if (!(System.isFuture()||System.isBatch())) {
+        // NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
+        // }
+        //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220316 end
+      }
     }
-    //zhj 鏂版柟妗堟敼閫� 灏嗘墜鏈哄彿鍘婚噸鍙婂叾楠岃瘉瑙勫垯绉诲姩鍒癆WS鍜屽墠绔� end
-
-    public static Map<Id,Id> NFM606_IdMap = new Map<Id,Id>();
-    // 606鎺ュ彛璋冪敤闂淇 thh 20220330 start
-    private void sendToComPlat() {
-        List<Id> contactIdList = new List<Id>();
-        List<String> interfaceUserUpsertContact = new List<String>();
-        for (Contact local: newList) {
-            Contact old = null;
-            if (Trigger.isUpdate) {
-                old = oldMap.get(local.Id);
-            }
-            if (Trigger.isInsert
-                        || old.LastName != local.LastName
-                        || old.FirstName != local.FirstName
-                        || old.Email != local.Email  //銉°兗銉� Email
-                        || old.MobilePhone != local.MobilePhone  //鎵嬫満鍙风爜 Mobile_Phone__c
-                        || old.Employee_No_manual__c != local.Employee_No_manual__c  //鍛樺伐鍙风爜 Employee_No__c
-                        || old.Work_Location_manual__c != local.Work_Location_manual__c  //宸ヤ綔鍦� Work_Location__c
-                        || old.Post_picklist__c != local.Post_picklist__c  //鑱屼綅 post__c
-                        || old.Job_Category_picklist__c != local.Job_Category_picklist__c  //鑱岀 Job_Category__c
-                        || old.Hire_date_text__c != local.Hire_date_text__c  //鍏ヨ亴鏃� Hire_date__c
-                        || old.Gender_text__c != local.Gender_text__c  //鎬у埆 Gender__c
-                        || old.dept__c != local.dept__c  //鏈儴 dept__c
-                        || old.Pregnant_Rest__c != local.Pregnant_Rest__c // 鏄惁浜у亣 Pregnant_Rest__c
-                        || old.Stay_or_not__c != local.Stay_or_not__c // 鍦ㄨ亴/绂昏亴 Stay_or_not__c
-                        //|| old.Salesdepartment_Text__c != local.Salesdepartment_Text__c // 閿�鍞湰閮� Salesdepartment__c
-                        || old.AccountId != local.AccountId//瀹㈡埛浜哄憳鎹㈠鎴�
-                        || old.Isactive__c != local.Isactive__c//鐘舵�佸彉鏇�
-                        || old.ServicePlatformCode__c != local.ServicePlatformCode__c//鏈嶅姟骞冲彴缂栫爜
-                        || old.UnifiedI_Contact_ID__c != local.UnifiedI_Contact_ID__c//鏅烘収鍖荤枟缂栫爜
-                        || old.ContactType__c != local.ContactType__c//浜哄憳绫诲瀷
-                        || (old.ChargeState__c != local.ChargeState__c && local.RecordTypeId == AgencyId)//璐熻矗鐪� // 20220830 ljh LLIU-CHR8FF add
-                        ) {
-                //鑾峰彇瀹㈡埛浜哄憳鐨勮褰曠被鍨婭D thh 20220330 start
-                ID InternalStaffRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Internal_staff').getRecordTypeId();
-                ID DoctorRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Doctor').getRecordTypeId();
-                ID AgencyRecordTypeId = Schema.SObjectType.Contact.getRecordTypeInfosByDeveloperName().get('Agency').getRecordTypeId();
-                //鑾峰彇瀹㈡埛浜哄憳鐨勮褰曠被鍨婭D thh 20220330 end
-                System.debug('local.UnifiedI_Contact_ID__c1:' + local.UnifiedI_Contact_ID__c);
-                System.debug('local.MobilePhone1:' + local.MobilePhone);
-                // gzw 20220824 bugfix start
-                // if (!local.IsFromSPO__c && !InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
-                if (!InternalStaffRecordTypeId.equals(local.RecordTypeId)) {
-                // gzw 20220824 bugfix end
-                    // 鍖婚櫌 瀹㈡埛浜哄憳 缁熶竴骞冲彴缂栫爜鏈夊�� 鍙戦�� PO
-                    if (DoctorRecordTypeId.equals(local.RecordTypeId) && String.isNotBlank(local.UnifiedI_Contact_ID__c)) {
-                        if (!NFM606_IdMap.containsKey(local.Id)) {
-                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
-                                interfaceUserUpsertContact.add(local.Id);
-                            } else {
-                                contactIdList.add(local.Id);
-                            }
-                            NFM606_IdMap.put(local.Id, local.Id);
-                        }
-                    }
-                    // 缁忛攢鍟� 瀹㈡埛浜哄憳 鎵嬫満鍙风爜鏈夊�� 鍙戦�� PO
-                    if (AgencyRecordTypeId.equals(local.RecordTypeId) && String.isNotBlank(local.MobilePhone)) {
-                        if (!NFM606_IdMap.containsKey(local.Id)) {
-                            if(UserInfo.getUserId().equals(System.Label.interfaceUserID)){
-                                interfaceUserUpsertContact.add(local.Id);
-                            } else {
-                                contactIdList.add(local.Id);
-                            }
-                            NFM606_IdMap.put(local.Id, local.Id);
-                        }
-                    }
-                }
-                
-            }
-        }
-        //606鏍囪
-        if(!System.Test.isRunningTest()){
-            // NFM606Controller.executeNotFuture('', contactIdList);
-            if (contactIdList.size() > 0) {
-                // NFM606Controller.callout('', contactIdList);
-                 //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220317 start
-                // if (!(System.isFuture()||System.isBatch())) {
-                NFM606Controller.callout('', contactIdList);
-                // } else{
-                    // NFM606Controller.executeNotFuture('', contactIdList);
-                // }
-               //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220317 end 
-            }
-            if (interfaceUserUpsertContact.size() > 0) {
-                NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
-                //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220316 start
-                // if (!(System.isFuture()||System.isBatch())) {
-                    // NFM606Controller.executeNotFuture('', interfaceUserUpsertContact);
-                // }
-               //娣诲姞future 鍒ゆ柇 add for pipl  sushanhu 20220316 end 
-            }
-        } 
+  }
+  // 606鎺ュ彛璋冪敤闂淇 thh 20220330 end
+  // 20220830 ljh LLIU-CHR8FF add start
+  private void updateChargeState() {
+    List<Contact> contactL = new List<Contact>();
+    for (Contact nObj : newList) {
+      if (
+        nObj.RecordTypeId == AgencyId && String.isBlank(nObj.ChargeState__c)
+      ) {
+        Contact cnew = new Contact();
+        cnew.Id = nObj.Id;
+        cnew.ChargeState__c = nObj.ChargeState_F__c;
+        contactL.add(cnew);
+      }
     }
-    // 606鎺ュ彛璋冪敤闂淇 thh 20220330 end
-    // 20220830 ljh LLIU-CHR8FF add start
-    private void updateChargeState(){
-        List<Contact> contactL = new List<Contact>();
-        for (Contact nObj : newList) {
-            if(nObj.RecordTypeId == AgencyId && String.isBlank(nObj.ChargeState__c)){
-                Contact cnew = new Contact();
-                cnew.Id = nObj.Id;
-                cnew.ChargeState__c =  nObj.ChargeState_F__c;
-                contactL.add(cnew);
-            }
-        }
-        if (!contactL.isEmpty()) {
-            update contactL;
-        }
+    if (!contactL.isEmpty()) {
+      update contactL;
     }
-    // 20220830 ljh LLIU-CHR8FF add end
-
-    
-}
\ No newline at end of file
+  }
+  // 20220830 ljh LLIU-CHR8FF add end
+}
diff --git a/force-app/main/default/classes/LexConInvoicedetailsController.cls b/force-app/main/default/classes/LexConInvoicedetailsController.cls
index 18a4fb5..5996cba 100644
--- a/force-app/main/default/classes/LexConInvoicedetailsController.cls
+++ b/force-app/main/default/classes/LexConInvoicedetailsController.cls
@@ -1,392 +1,512 @@
 public with sharing class LexConInvoicedetailsController {
-    //鍑哄簱鍗曚娇鐢�
-	public static Consumable_order__c coc { get; set; }
+  //鍑哄簱鍗曚娇鐢�
+  public static Consumable_order__c coc { get; set; }
 
-	//鍙戠エ浣跨敤
-	public static Consumable_order__c invoicecode { get; set; }
+  //鍙戠エ浣跨敤
+  public static Consumable_order__c invoicecode { get; set; }
 
-	//浠锋牸璁$畻缁撴灉
-    public static Decimal sumPrice {get;set;}
+  //浠锋牸璁$畻缁撴灉
+  public static Decimal sumPrice { get; set; }
 
-	//鍑哄簱鍗旾D
-	private static String orderId {get;set;}
-	//鍙戠エ鍗旾D
-	private static String invoiceId {get;set;}
+  //鍑哄簱鍗旾D
+  private static String orderId { get; set; }
+  //鍙戠エ鍗旾D
+  private static String invoiceId { get; set; }
+  //鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
+  public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records {
+    get;
+    set;
+  }
+  //鏄庣粏鏁伴噺
+  public static Integer invoiceOrderRecoedsCount {
+    get {
+      return consumableorderdetails1Records == null
+        ? 0
+        : consumableorderdetails1Records.size();
+    }
+  }
+
+  //椤甸潰鍒濆鍖�
+  @AuraEnabled
+  public static ResponseBodyLWC init(String orderIdLwc, String invoiceIdLwc) {
+    ResponseBodyLWC res = new ResponseBodyLWC();
+    Map<String, object> data = new Map<String, object>();
+    res.entity = data;
+
+    orderId = orderIdLwc;
+    invoiceId = invoiceIdLwc;
+    consumableorderdetails1Records = new List<ConsumableorderdetailsInfo>();
+    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
+    ];
+    //鍙戠エ淇℃伅
+    invoicecode = [
+      SELECT
+        Id,
+        Name,
+        ShipmentAccount__c,
+        Order_ForCustomerText__c,
+        Order_ForDealerText__c,
+        Dealer_Info__c
+      FROM Consumable_order__c
+      WHERE Id = :invoiceId
+    ];
+    //鍙戠エ鏄庣粏1
+    Map<String, Consumable_Orderdetails__c> invoiceorderdet1CountMap = new Map<String, Consumable_Orderdetails__c>();
+    List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
+      SELECT
+        Id,
+        Name,
+        Consumable_order__c,
+        Asset_Model_No__c,
+        Consumable_Product__r.Asset_Model_No__c,
+        Consumable_Count__c,
+        Shipment_Count__c,
+        RrturnPro_count__c,
+        Delivery_List_RMB__c,
+        InvoicedProCost_RMB__c,
+        Invoiced_Procount__c,
+        Invoiced_Count__c,
+        Invoice_Unitprice__c,
+        InvoiceProNot_count__c,
+        Invoice_Cost_RMB__c,
+        Invoice_No__c,
+        Invoice_Unit__c,
+        Invoicedet1_OD_link__c
+      FROM Consumable_Orderdetails__c
+      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]
+      );
+    }
     //鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
-	public static List<ConsumableorderdetailsInfo> consumableorderdetails1Records { get; set; }
-	//鏄庣粏鏁伴噺
-    public static Integer invoiceOrderRecoedsCount {
-        get {
-            return consumableorderdetails1Records == null ? 0 : consumableorderdetails1Records.size();
-        }
+    List<Consumable_Orderdetails__c> consumableorderdetails1 = [
+      SELECT
+        Id,
+        Name,
+        Consumable_order__c,
+        Asset_Model_No__c,
+        Consumable_Product__r.Asset_Model_No__c,
+        Consumable_Count__c,
+        Shipment_Count__c,
+        RrturnPro_count__c,
+        Delivery_List_RMB__c,
+        InvoicedProCost_RMB__c,
+        Invoiced_Procount__c,
+        Invoiced_Count__c,
+        Invoice_Unitprice__c,
+        InvoiceProNot_count__c,
+        Invoice_Cost_RMB__c,
+        Invoice_No__c,
+        Consumable_Product__c,
+        Intra_Trade_List_RMB__c,
+        Dealer_Custom_Price__c,
+        Sum_of_money__c,
+        Used_date__c,
+        Send_date__c,
+        Box_Piece__c,
+        Invoice_Unit__c,
+        Consumable_Product__r.Packing_list_manual__c,
+        ProductPacking_list_manual__c
+      FROM Consumable_Orderdetails__c
+      WHERE Consumable_order__c = :orderId
+    ];
+    for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
+      consumableorderdetails1Records.add(
+        new ConsumableorderdetailsInfo(consumableorderdetails1[i])
+      );
     }
-
-    //椤甸潰鍒濆鍖�
-    @AuraEnabled
-    public static ResponseBodyLWC init(String orderIdLwc,String invoiceIdLwc) {
-        ResponseBodyLWC res = new ResponseBodyLWC();
-        Map<String, object> data = new Map<String, object>();
-        res.entity = data;
-
-        orderId = orderIdLwc;
-        invoiceId = invoiceIdLwc;
-        consumableorderdetails1Records = new List<ConsumableorderdetailsInfo>();
-        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];
-        //鍙戠エ淇℃伅
-        invoicecode = [
-            SELECT Id, Name, ShipmentAccount__c, Order_ForCustomerText__c, Order_ForDealerText__c, Dealer_Info__c
-            FROM Consumable_order__c
-            WHERE Id = :invoiceId
-        ];
-        //鍙戠エ鏄庣粏1
-        Map<String, Consumable_Orderdetails__c> invoiceorderdet1CountMap = new Map<String, Consumable_Orderdetails__c>();
-        List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
-            SELECT
-                Id,
-                Name,
-                Consumable_order__c,
-                Asset_Model_No__c,
-                Consumable_Product__r.Asset_Model_No__c,
-                Consumable_Count__c,
-                Shipment_Count__c,
-                RrturnPro_count__c,
-                Delivery_List_RMB__c,
-                InvoicedProCost_RMB__c,
-                Invoiced_Procount__c,
-                Invoiced_Count__c,
-                Invoice_Unitprice__c,
-                InvoiceProNot_count__c,
-                Invoice_Cost_RMB__c,
-                Invoice_No__c,
-                Invoice_Unit__c,
-                Invoicedet1_OD_link__c
-            FROM Consumable_Orderdetails__c
-            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]);
+    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 == ''
+        ) {
+          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;
         }
-        //鍑哄簱鍗曟槑缁�1锛岀敾闈㈡樉绀轰娇鐢�
-        List<Consumable_Orderdetails__c> consumableorderdetails1 = [
-            SELECT
-                Id,
-                Name,
-                Consumable_order__c,
-                Asset_Model_No__c,
-                Consumable_Product__r.Asset_Model_No__c,
-                Consumable_Count__c,
-                Shipment_Count__c,
-                RrturnPro_count__c,
-                Delivery_List_RMB__c,
-                InvoicedProCost_RMB__c,
-                Invoiced_Procount__c,
-                Invoiced_Count__c,
-                Invoice_Unitprice__c,
-                InvoiceProNot_count__c,
-                Invoice_Cost_RMB__c,
-                Invoice_No__c,
-                Consumable_Product__c,
-                Intra_Trade_List_RMB__c,
-                Dealer_Custom_Price__c,
-                Sum_of_money__c,
-                Used_date__c,
-                Send_date__c,
-                Box_Piece__c,
-                Invoice_Unit__c,
-                Consumable_Product__r.Packing_list_manual__c,
-                ProductPacking_list_manual__c
-            FROM Consumable_Orderdetails__c
-            WHERE Consumable_order__c = :orderId
-        ];
-        for (Integer i = 0; i < consumableorderdetails1.size(); i++) {
-            consumableorderdetails1Records.add(new ConsumableorderdetailsInfo(consumableorderdetails1[i]));
+        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
+        ) {
+          ass.invoiceCount = ass.esd.Invoiced_Count__c;
+        } else {
+          ass.invoiceCount = invoiceorderdet1CountMap.get(
+              ass.esd.Asset_Model_No__c
+            )
+            .Invoiced_Count__c;
         }
-        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 == ''
-                ) {
-                    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;
-                }
-                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
-                ) {
-                    ass.invoiceCount = ass.esd.Invoiced_Count__c;
-                } else {
-                    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;
-                } 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);
-                ass.invoiceAllprice = invoiceAllprice;
-            } else {
-                ass.invoiceCount = ass.esd.InvoiceProNot_count__c;
-                ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
-                ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__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;
+        } else {
+          ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
         }
-        data.put('invoicecode',invoicecode);
-        data.put('coc',coc);
-        data.put('consumableorderdetails1Records',consumableorderdetails1Records);
-        res.status = 'Success';
-        res.code = 200;
-        System.debug('res = ' + res);
-        return res;
+        Decimal invoiceAllprice = 0.00;
+        invoiceAllprice = (ass.invoiceCount * ass.esd.Invoice_Unitprice__c)
+          .setScale(2);
+        ass.invoiceAllprice = invoiceAllprice;
+      } else {
+        ass.invoiceCount = ass.esd.InvoiceProNot_count__c;
+        ass.esd.Invoice_Unit__c = ass.esd.Box_Piece__c;
+        ass.esd.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+      }
     }
+    data.put('invoicecode', invoicecode);
+    data.put('coc', coc);
+    data.put('consumableorderdetails1Records', consumableorderdetails1Records);
+    res.status = 'Success';
+    res.code = 200;
+    System.debug('res = ' + res);
+    return res;
+  }
 
-    @AuraEnabled
-    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;
+  @AuraEnabled
+  public static ResponseBodyLWC save(
+    String consumableorderdetails1RecordsLwc,
+    String invoiceIdLwc,
+    String orderIdLwc
+  ) {
+    system.debug(
+      'consumableorderdetails1RecordsLwc:' + consumableorderdetails1RecordsLwc
+    );
+    ResponseBodyLWC res = new ResponseBodyLWC();
+    Map<String, object> data = new Map<String, object>();
+    res.entity = data;
 
-        consumableorderdetails1Records= (List<ConsumableorderdetailsInfo>)JSON.deserialize(consumableorderdetails1RecordsLwc, List<ConsumableorderdetailsInfo>.class);
-        invoiceId = invoiceIdLwc;
-        orderId = orderIdLwc;
-        System.debug('consumableorderdetails1Records = ' + consumableorderdetails1Records);
-        System.debug('invoiceId = ' + invoiceId);
-        System.debug('orderId = ' + orderId);
+    consumableorderdetails1Records = (List<ConsumableorderdetailsInfo>) JSON.deserialize(
+      consumableorderdetails1RecordsLwc,
+      List<ConsumableorderdetailsInfo>.class
+    );
 
-        Savepoint sp = Database.setSavepoint();
-        //鏂拌鍙戠エ鏄庣粏1
-        List<Consumable_Orderdetails__c> invoiceorderList1 = new List<Consumable_Orderdetails__c>();
-        //鏇存柊鍙戠エ鏄庣粏1
-        List<Consumable_Orderdetails__c> invoiceorderUpList1 = new List<Consumable_Orderdetails__c>();
-        //鍒犻櫎鍙戠エ鏄庣粏1
-        List<Consumable_Orderdetails__c> invoiceorderDeList1 = new List<Consumable_Orderdetails__c>();
+    invoiceId = invoiceIdLwc;
+    orderId = orderIdLwc;
+    System.debug(
+      'consumableorderdetails1Records = ' + consumableorderdetails1Records
+    );
+    System.debug('invoiceId = ' + invoiceId);
+    System.debug('orderId = ' + orderId);
 
-        Map<String, Consumable_Orderdetails__c> invoiceordet1Map = new Map<String, Consumable_Orderdetails__c>();
+    Savepoint sp = Database.setSavepoint();
+    //鏂拌鍙戠エ鏄庣粏1
+    List<Consumable_Orderdetails__c> invoiceorderList1 = new List<Consumable_Orderdetails__c>();
+    //鏇存柊鍙戠エ鏄庣粏1
+    List<Consumable_Orderdetails__c> invoiceorderUpList1 = new List<Consumable_Orderdetails__c>();
+    //鍒犻櫎鍙戠エ鏄庣粏1
+    List<Consumable_Orderdetails__c> invoiceorderDeList1 = new List<Consumable_Orderdetails__c>();
 
-        List<String> consumableorderList = new List<String>();
-        List<String> consumableNameList = new List<String>();
-        try {
-            //鏇存柊鍑哄簱鍗曟槑缁�1
-            for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
-                consumableorderList.add(ass.esd.Asset_Model_No__c);
-            }
+    Map<String, Consumable_Orderdetails__c> invoiceordet1Map = new Map<String, Consumable_Orderdetails__c>();
 
-            //鍙戠エ鏄庣粏1鑾峰彇
-            List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
-                SELECT
-                    Id,
-                    Name,
-                    Consumable_order__c,
-                    Asset_Model_No__c,
-                    Consumable_Product__r.Asset_Model_No__c,
-                    Consumable_Count__c,
-                    Shipment_Count__c,
-                    RrturnPro_count__c,
-                    Delivery_List_RMB__c,
-                    InvoicedProCost_RMB__c,
-                    Invoiced_Procount__c,
-                    Invoiced_Count__c,
-                    Invoice_Unitprice__c,
-                    InvoiceProNot_count__c,
-                    Invoice_Cost_RMB__c,
-                    Invoice_No__c,
-                    Invoice_Unit__c,
-                    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
-            ];
-            for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
-                invoiceordet1Map.put(
-                    invoiceorderdetails1[i].Invoicedet1_OD_link__c + invoiceorderdetails1[i].Asset_Model_No__c,
-                    invoiceorderdetails1[i]
-                );
-            }
-            List<Consumable_Orderdetails__c> invoicedetails1count = [
-                SELECT
-                    Id,
-                    Name,
-                    Consumable_order__c,
-                    Invoicedet1_OD_link__c,
-                    Asset_Model_No__c,
-                    Consumable_Product__r.Asset_Model_No__c,
-                    Consumable_Count__c,
-                    Shipment_Count__c,
-                    RrturnPro_count__c,
-                    Delivery_List_RMB__c,
-                    InvoicedProCost_RMB__c,
-                    Invoiced_Procount__c,
-                    Invoiced_Count__c,
-                    Sum_of_money__c,
-                    Invoice_Unitprice__c,
-                    InvoiceProNot_count__c,
-                    Invoice_Cost_RMB__c,
-                    Invoice_Unit__c,
-                    Invoice_No__c
-                FROM Consumable_Orderdetails__c
-                WHERE Consumable_order__c = :invoiceId
-            ];
-            Integer invoiceRecordscon = invoicedetails1count.size() + 1;
+    List<String> consumableorderList = new List<String>();
+    List<String> consumableNameList = new List<String>();
+    try {
+      //鏇存柊鍑哄簱鍗曟槑缁�1
+      for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
+        consumableorderList.add(ass.esd.Asset_Model_No__c);
+      }
 
-            for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
-                if (ass.check == true && ass.invoiceCount > 0) {
-                    if (String.isEmpty(String.valueOf(ass.invoiceCount))) {
-                        // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒'));
-                        // return null;
-                        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)) {
-                            // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
-                            // return null;
-                            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, '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�', '');
-                        }
-                    }
+      //鍙戠エ鏄庣粏1鑾峰彇
+      List<Consumable_Orderdetails__c> invoiceorderdetails1 = [
+        SELECT
+          Id,
+          Name,
+          Consumable_order__c,
+          Asset_Model_No__c,
+          Consumable_Product__r.Asset_Model_No__c,
+          Consumable_Count__c,
+          Shipment_Count__c,
+          RrturnPro_count__c,
+          Delivery_List_RMB__c,
+          InvoicedProCost_RMB__c,
+          Invoiced_Procount__c,
+          Invoiced_Count__c,
+          Invoice_Unitprice__c,
+          InvoiceProNot_count__c,
+          Invoice_Cost_RMB__c,
+          Invoice_No__c,
+          Invoice_Unit__c,
+          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
+      ];
+      for (Integer i = 0; i < invoiceorderdetails1.size(); i++) {
+        invoiceordet1Map.put(
+          invoiceorderdetails1[i].Invoicedet1_OD_link__c +
+          invoiceorderdetails1[i].Asset_Model_No__c,
+          invoiceorderdetails1[i]
+        );
+      }
+      List<Consumable_Orderdetails__c> invoicedetails1count = [
+        SELECT
+          Id,
+          Name,
+          Consumable_order__c,
+          Invoicedet1_OD_link__c,
+          Asset_Model_No__c,
+          Consumable_Product__r.Asset_Model_No__c,
+          Consumable_Count__c,
+          Shipment_Count__c,
+          RrturnPro_count__c,
+          Delivery_List_RMB__c,
+          InvoicedProCost_RMB__c,
+          Invoiced_Procount__c,
+          Invoiced_Count__c,
+          Sum_of_money__c,
+          Invoice_Unitprice__c,
+          InvoiceProNot_count__c,
+          Invoice_Cost_RMB__c,
+          Invoice_Unit__c,
+          Invoice_No__c
+        FROM Consumable_Orderdetails__c
+        WHERE Consumable_order__c = :invoiceId
+      ];
+      Integer invoiceRecordscon = invoicedetails1count.size() + 1;
 
-                    //if(ass.esd.Invoice_Unit__c =='涓�'){
-                    String invoiceCount = String.valueOf(ass.invoiceCount);
-                    if (!Pattern.matches('^\\+{0,1}[1-9]\\d*', invoiceCount)) {
-                        // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�'));
-                        // return null;
-                        return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�', '');
-                    }
-                    //}
-
-                    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)
-                            .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 =
-                                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 =
-                                ass.esd.Delivery_List_RMB__c * ass.invoiceCount;
-                            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));
-                        invoiceRecordscon++;
-                    } else {
-                        String str = string.valueOf(invoiceRecordscon);
-                        if (str.length() == 1) {
-                            str = '0' + str;
-                        }
-                        Consumable_Orderdetails__c invoiceInsert1 = new Consumable_Orderdetails__c();
-                        invoiceInsert1.Used_date__c = ass.esd.Used_date__c;
-                        invoiceInsert1.Send_date__c = ass.esd.Send_date__c;
-                        invoiceInsert1.Name =
-                            invoicecode.Name +
-                            '-' +
-                            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;
-                        } else {
-                            invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
-                        }
-                        //invoiceInsert1.Invoice_Unitprice__c = ass.esd.Invoice_Unitprice__c;
-                        invoiceInsert1.Invoice_Unit__c = ass.esd.Invoice_Unit__c;
-                        invoiceInsert1.Box_Piece__c = ass.esd.Box_Piece__c;
-                        if (ass.esd.Invoiced_Procount__c == null)
-                            ass.esd.Invoiced_Procount__c = 0;
-                        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.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 (invoiceorderList1.size() > 0) {
-                insert invoiceorderList1;
-            }
-            if (invoiceorderUpList1.size() > 0) {
-                update invoiceorderUpList1;
-            }
-            if (invoiceorderDeList1.size() > 0) {
-                delete invoiceorderDeList1;
-            }
-        } catch (Exception e) {
-            ApexPages.addmessages(e);
-            // Database.rollback(sp);
+      for (ConsumableorderdetailsInfo ass : consumableorderdetails1Records) {
+        if (ass.check == true && ass.invoiceCount > 0) {
+          if (String.isEmpty(String.valueOf(ass.invoiceCount))) {
+            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.Error, '璇疯緭鍏ュ彂绁ㄦ暟閲忥紒'));
             // return null;
-            return new ResponseBodyLWC('Error', 500, e.getMessage() + ' ' + e.getLineNumber(), '');
+            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)
+            ) {
+              // ass.esd.InvoiceProNot_count__c.addError('鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�');
+              // return null;
+              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,
+                '鍙戠エ鏁伴噺涓嶈兘瓒呰繃杩樻病鍙戠エ鏁伴噺锛�',
+                ''
+              );
+            }
+          }
+
+          //if(ass.esd.Invoice_Unit__c =='涓�'){
+          String invoiceCount = String.valueOf(ass.invoiceCount);
+          if (!Pattern.matches('^\\+{0,1}[1-9]\\d*', invoiceCount)) {
+            // ApexPages.addmessage(new ApexPages.message(ApexPages.severity.ERROR, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�'));
+            // return null;
+            return new ResponseBodyLWC('Error', 500, '鍙戠エ鏁伴噺蹇呴』鏄暣鏁�', '');
+          }
+          //}
+
+          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
+              )
+              .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 =
+                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 =
+                ass.esd.Delivery_List_RMB__c * ass.invoiceCount;
+              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
+              )
+            );
+            invoiceRecordscon++;
+          } else {
+            String str = string.valueOf(invoiceRecordscon);
+            if (str.length() == 1) {
+              str = '0' + str;
+            }
+            Consumable_Orderdetails__c invoiceInsert1 = new Consumable_Orderdetails__c();
+            invoiceInsert1.Used_date__c = ass.esd.Used_date__c;
+            invoiceInsert1.Send_date__c = ass.esd.Send_date__c;
+            invoiceInsert1.Name =
+              invoicecode.Name +
+              '-' +
+              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;
+            } else {
+              invoiceInsert1.Invoice_Unitprice__c = ass.esd.Delivery_List_RMB__c;
+            }
+            //invoiceInsert1.Invoice_Unitprice__c = ass.esd.Invoice_Unitprice__c;
+            invoiceInsert1.Invoice_Unit__c = ass.esd.Invoice_Unit__c;
+            invoiceInsert1.Box_Piece__c = ass.esd.Box_Piece__c;
+            if (ass.esd.Invoiced_Procount__c == null)
+              ass.esd.Invoiced_Procount__c = 0;
+            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.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
+              )
+            );
+          }
         }
-        res.status = 'Success';
-        res.code = 200;
-        System.debug('res = ' + res);
-        return res;
+      }
+
+      if (invoiceorderList1.size() > 0) {
+        insert invoiceorderList1;
+      }
+      if (invoiceorderUpList1.size() > 0) {
+        update invoiceorderUpList1;
+      }
+      if (invoiceorderDeList1.size() > 0) {
+        delete invoiceorderDeList1;
+      }
+    } catch (Exception e) {
+      ApexPages.addmessages(e);
+      // Database.rollback(sp);
+      // return null;
+      return new ResponseBodyLWC(
+        'Error',
+        500,
+        e.getMessage() + ' ' + e.getLineNumber(),
+        ''
+      );
     }
+    res.status = 'Success';
+    res.code = 200;
+    System.debug('res = ' + res);
+    return res;
+  }
 
-    // Data Bean
-    class ConsumableorderdetailsInfo {
-        @AuraEnabled
-        public Boolean check { get; set; }
-        @AuraEnabled
-        public Boolean oldCheck { get; set; }
-        @AuraEnabled
-        public Consumable_Orderdetails__c esd { get; set; }
-        @AuraEnabled
-        public Product2__c Prod { get; set; }
-        @AuraEnabled
-        public Decimal invoiceCount { get; set; }
-        @AuraEnabled
-        public Decimal invoiceAllprice { get; set; }
-        @AuraEnabled
-        public Decimal Packing_list_manual { get; set; }
-        public List<SelectOption> Invoice_UnitOpts { get; set; }
-        @AuraEnabled
-        public Map<String,String> Invoice_UnitOptsMap { get; set; }
-        // 娑堣�楀搧浜у搧鏄庣粏
-        public ConsumableorderdetailsInfo(Consumable_Orderdetails__c e) {
-            check = false;
-            oldCheck = false;
-            esd = e;
-            Prod = e.Consumable_Product__r;
-            invoiceAllprice = 0;
+  // Data Bean
+  class ConsumableorderdetailsInfo {
+    @AuraEnabled
+    public Boolean check { get; set; }
+    @AuraEnabled
+    public Boolean oldCheck { get; set; }
+    @AuraEnabled
+    public Consumable_Orderdetails__c esd { get; set; }
+    @AuraEnabled
+    public Product2__c Prod { get; set; }
+    @AuraEnabled
+    public Decimal invoiceCount { get; set; }
+    @AuraEnabled
+    public Decimal invoiceAllprice { get; set; }
+    @AuraEnabled
+    public Decimal Packing_list_manual { get; set; }
+    public List<SelectOption> Invoice_UnitOpts { get; set; }
+    @AuraEnabled
+    public Map<String, String> Invoice_UnitOptsMap { get; set; }
+    // 娑堣�楀搧浜у搧鏄庣粏
+    public ConsumableorderdetailsInfo(Consumable_Orderdetails__c e) {
+      check = false;
+      oldCheck = false;
+      esd = e;
+      Prod = e.Consumable_Product__r;
+      invoiceAllprice = 0;
 
-            Packing_list_manual = e.Consumable_Product__r.Packing_list_manual__c;
+      Packing_list_manual = e.Consumable_Product__r.Packing_list_manual__c;
 
-            Invoice_UnitOpts = new List<SelectOption>();
-            Invoice_UnitOpts.add(new SelectOption('鐩�', '鐩�'));
-            Invoice_UnitOpts.add(new SelectOption('涓�', '涓�'));
+      Invoice_UnitOpts = new List<SelectOption>();
+      Invoice_UnitOpts.add(new SelectOption('鐩�', '鐩�'));
+      Invoice_UnitOpts.add(new SelectOption('涓�', '涓�'));
 
-            Invoice_UnitOptsMap = new Map<String,String>();
-            Invoice_UnitOptsMap.put('鐩�', '鐩�');
-            Invoice_UnitOptsMap.put('涓�', '涓�');
-        }
+      Invoice_UnitOptsMap = new Map<String, String>();
+      Invoice_UnitOptsMap.put('鐩�', '鐩�');
+      Invoice_UnitOptsMap.put('涓�', '涓�');
     }
-}
\ No newline at end of file
+  }
+}
diff --git a/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls
new file mode 100644
index 0000000..2e96f53
--- /dev/null
+++ b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls
@@ -0,0 +1,798 @@
+@isTest
+private class LexConInvoicedetailsControllerTest {
+  @isTest
+  static void itShould() {
+    user myUser_test;
+    Account myAccount1;
+    Account myAccount2;
+    Product2__c pro2;
+    Product2__c pro1;
+    Product2 prod01;
+    Product2 prod02;
+    User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
+    System.runAs(thisUser) {
+      Profile prof = [
+        SELECT Id
+        FROM Profile
+        WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'
+      ];
+      List<RecordType> rectCo = [
+        SELECT Id
+        FROM RecordType
+        WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
+      ];
+      if (rectCo.size() == 0) {
+        return;
+      }
+      List<RecordType> rectHos = [
+        SELECT Id
+        FROM RecordType
+        WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'
+      ];
+      if (rectHos.size() == 0) {
+        return;
+      }
+      //浜у搧淇℃伅
+      prod01 = new Product2(
+        Name = 'Test01',
+        ProductCode = 'Test01',
+        Asset_Model_No__c = 'Test01',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      prod02 = new Product2(
+        Name = 'Test02',
+        ProductCode = 'Test02',
+        Asset_Model_No__c = 'Test02',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod03 = new Product2(
+        Name = 'Test03',
+        ProductCode = 'Test03',
+        Asset_Model_No__c = 'Test03',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod04 = new Product2(
+        Name = 'Test04',
+        ProductCode = 'Test04',
+        Asset_Model_No__c = 'Test04',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 2,
+        Manual_Entry__c = false
+      );
+      Product2 prod05 = new Product2(
+        Name = 'Test05',
+        ProductCode = 'Test05',
+        Asset_Model_No__c = 'Test05',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod06 = new Product2(
+        Name = 'Test06',
+        ProductCode = 'Test06',
+        Asset_Model_No__c = 'Test06',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      insert new List<Product2>{
+        prod01,
+        prod02,
+        prod03,
+        prod04,
+        prod05,
+        prod06
+      };
+
+      pro1 = new Product2__c(
+        Name = 'Pro001',
+        OT_CODE_Text__c = 'Test001',
+        Product2__c = prod01.Id
+      );
+      pro2 = new Product2__c(
+        Name = 'Pro002',
+        OT_CODE_Text__c = 'Test002',
+        Product2__c = prod02.Id
+      );
+      Product2__c pro5 = new Product2__c(
+        Name = 'Pro003',
+        OT_CODE_Text__c = 'Test003',
+        Product2__c = prod03.Id
+      );
+      Product2__c pro3 = new Product2__c(
+        Name = 'Pro004',
+        OT_CODE_Text__c = 'Test004',
+        Product2__c = prod04.Id
+      );
+      Product2__c pro4 = new Product2__c(
+        Name = 'Pro005',
+        OT_CODE_Text__c = 'Test005',
+        Product2__c = prod05.Id
+      );
+      Product2__c pro6 = new Product2__c(
+        Name = 'Pro006',
+        OT_CODE_Text__c = 'Test006',
+        Product2__c = prod06.Id
+      );
+      insert new List<Product2__c>{ pro4, pro5, pro6, pro1, pro2, pro3 };
+
+      myAccount1 = new Account(
+        name = 'testaccount001',
+        Dealer_discount__c = 10,
+        RecordTypeId = rectCo[0].Id
+      );
+      myAccount2 = new Account(
+        name = 'testaccount002',
+        Dealer_discount__c = 20,
+        RecordTypeId = rectHos[0].Id
+      );
+      insert myAccount1;
+      insert myAccount2;
+      Contact core = new Contact(
+        email = 'jplumber@salesforce.com',
+        firstname = 'Joe',
+        lastname = 'Plumber',
+        accountid = myAccount1.id
+      );
+      insert core;
+      myUser_test = new User(
+        ContactId = core.id,
+        Alias = 'newUser',
+        Email = 'newuser@testorg.com',
+        EmailEncodingKey = 'UTF-8',
+        LastName = 'testUser',
+        LanguageLocaleKey = 'zh_CN',
+        LocaleSidKey = 'zh_CN',
+        ProfileId = prof.Id,
+        TimeZoneSidKey = 'Asia/Shanghai',
+        UserName = 'testUser@testorg.com'
+      );
+      insert myUser_test;
+    }
+    System.runAs(myUser_test) {
+      //鍙戠エ淇℃伅
+      Consumable_order__c invoiceorder = new Consumable_order__c(
+        Name = 'invoice01',
+        Order_type__c = '鍙戠エ',
+        Invoice_status__c = '宸插畬鎴�',
+        Invoice_Date__c = Date.today(),
+        RecordTypeid = System.Label.RT_ConOrder_Invoice,
+        Order_ForHospital__c = myAccount2.Id,
+        SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌',
+        Order_status__c = '鑽夋涓�',
+        Dealer_info__c = myAccount1.Id
+      );
+      insert invoiceorder;
+
+      //鍑哄簱鍗�
+      Consumable_order__c testList1 = new Consumable_order__c(
+        Name = 'Test1',
+        Summons_Sale_Status__c = '鍑鸿揣',
+        SummonsStatus_c__c = '宸插畬鎴�',
+        Order_ForHospital__c = myAccount2.Id,
+        SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌',
+        Order_status__c = '鑽夋涓�',
+        Order_type__c = '浼犵エ',
+        Dealer_info__c = myAccount1.Id,
+        ConInvoice_Code__c = invoiceorder.id
+      );
+      Consumable_order__c testList2 = new Consumable_order__c(
+        Name = 'Test2',
+        Summons_Sale_Status__c = '鍑鸿揣',
+        SummonsStatus_c__c = '宸插畬鎴�',
+        Order_ForHospital__c = myAccount2.Id,
+        SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌',
+        Order_status__c = '宸叉彁浜�',
+        Order_type__c = '浼犵エ',
+        Dealer_info__c = myAccount1.Id,
+        ConInvoice_Code__c = invoiceorder.id
+      );
+      TestList1.Order_date__c = Date.today().addDays(2);
+      TestList2.Order_date__c = Date.today().addDays(2);
+      TestList1.Order_date__c = Date.today();
+      TestList2.Deliver_date__c = Date.today();
+      insert new List<Consumable_order__c>{ testList1, testList2 };
+
+      Consumable_order_LinkTable__c order_LinkTable1 = new Consumable_order_LinkTable__c(
+        Name = 'order_LinkTable1',
+        Outboundorder_Code_link__c = testList1.Id,
+        Invoice_Code_link__c = invoiceorder.Id
+      );
+      insert order_LinkTable1;
+      Consumable_order_LinkTable__c order_LinkTable2 = new Consumable_order_LinkTable__c(
+        Name = 'order_LinkTable2',
+        Outboundorder_Code_link__c = testList2.Id,
+        Invoice_Code_link__c = invoiceorder.Id
+      );
+      insert order_LinkTable2;
+
+      //鍙戠エ鏄庣粏1
+      Consumable_orderdetails__c invoicedet1 = new Consumable_orderdetails__c();
+      invoicedet1.Name = 'invoicetest1_001001';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      invoicedet1.Consumable_order__c = invoiceorder.id;
+      invoicedet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet1.Consumable_count__c = 1;
+      invoicedet1.Consumable_product__c = pro1.Id;
+      invoicedet1.Invoicedet1_OD_link__c = testList1.Id;
+      invoicedet1.Box_Piece__c = '鐩�';
+      invoicedet1.Shipment_Count__c = 1;
+      invoicedet1.Invoice_Unitprice__c = 1;
+      invoicedet1.Delivery_List_RMB__c = 1;
+      invoicedet1.InvoicedProCost_RMB__c = 1;
+      invoicedet1.Invoice_Unit__c = '涓�';
+      invoicedet1.Invoiced_Procount__c = 3;
+      invoicedet1.RrturnPro_count__c = 3;
+      Consumable_orderdetails__c invoicedet2 = new Consumable_orderdetails__c();
+      invoicedet2.Name = 'invoiceTest1_001002';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      invoicedet2.Consumable_order__c = invoiceorder.Id;
+      invoicedet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet2.Consumable_count__c = 1;
+      invoicedet2.Consumable_product__c = pro2.Id;
+      invoicedet2.Invoicedet1_OD_link__c = testList2.Id;
+      invoicedet2.Box_Piece__c = '鐩�';
+      invoicedet2.Shipment_Count__c = 1;
+      invoicedet2.Invoice_Unitprice__c = 1;
+      invoicedet2.Delivery_List_RMB__c = 1;
+      invoicedet2.InvoicedProCost_RMB__c = 1;
+      invoicedet2.Invoice_Unit__c = '涓�';
+      invoicedet2.Invoiced_Procount__c = 3;
+      invoicedet2.RrturnPro_count__c = 3;
+      Consumable_orderdetails__c invoicedet3 = new Consumable_orderdetails__c();
+      invoicedet3.Name = 'invoiceTest1_001003';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      invoicedet3.Consumable_order__c = invoiceorder.Id;
+      invoicedet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet3.Consumable_count__c = 1;
+      invoicedet3.Consumable_product__c = pro2.Id;
+      invoicedet3.Invoicedet1_OD_link__c = testList2.Id;
+      invoicedet3.Box_Piece__c = '涓�';
+      invoicedet3.Shipment_Count__c = 1;
+      invoicedet3.Invoice_Unit__c = '鐩�';
+      invoicedet3.Delivery_List_RMB__c = 2.0;
+      invoicedet3.Invoice_Unitprice__c = 1;
+      invoicedet3.InvoicedProCost_RMB__c = 1;
+      invoicedet3.Invoiced_Procount__c = 3;
+      invoicedet3.RrturnPro_count__c = 3;
+      insert new List<Consumable_orderdetails__c>{
+        invoicedet1,
+        invoicedet2,
+        invoicedet3
+      };
+
+      //鍑哄簱鍗曟槑缁�1
+      Consumable_orderdetails__c orderdet1 = new Consumable_orderdetails__c();
+      orderdet1.Name = 'Test1_001001';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      orderdet1.Consumable_order__c = testList1.Id;
+      orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet1.Consumable_count__c = 1;
+      orderdet1.Consumable_product__c = pro1.Id;
+      orderdet1.Box_Piece__c = '鐩�';
+      orderdet1.Shipment_Count__c = 11;
+      orderdet1.Delivery_List_RMB__c = 2.0;
+      orderdet1.Invoice_Unitprice__c = 1;
+      orderdet1.InvoicedProCost_RMB__c = 1;
+      orderdet1.Invoiced_Procount__c = 3;
+      orderdet1.RrturnPro_count__c = 3;
+      orderdet1.Invoice_Unit__c = '涓�';
+      orderdet1 = new Consumable_orderdetails__c();
+      orderdet1.Name = 'Test1_0010011';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      orderdet1.Consumable_order__c = testList1.Id;
+      orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet1.Consumable_count__c = 1;
+      orderdet1.Consumable_product__c = pro2.Id;
+      orderdet1.Box_Piece__c = '涓�';
+      orderdet1.Shipment_Count__c = 11;
+      orderdet1.Delivery_List_RMB__c = 2.0;
+      orderdet1.Invoice_Unitprice__c = 1;
+      orderdet1.InvoicedProCost_RMB__c = 1;
+      orderdet1.Invoiced_Procount__c = 3;
+      orderdet1.RrturnPro_count__c = 3;
+      orderdet1.Invoice_Unit__c = '鐩�';
+      Consumable_orderdetails__c orderdet2 = new Consumable_orderdetails__c();
+      orderdet2.Name = 'Test1_0010012';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet2.Consumable_order__c = testList1.Id;
+      orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet2.Consumable_count__c = 1;
+      orderdet2.Consumable_product__c = pro2.Id;
+      orderdet2.Box_Piece__c = '鐩�';
+      orderdet2.Shipment_Count__c = 10;
+      orderdet2.Delivery_List_RMB__c = 2.0;
+      orderdet2.Invoice_Unitprice__c = 1;
+      orderdet2.InvoicedProCost_RMB__c = 1;
+      orderdet2.Invoiced_Procount__c = 3;
+      orderdet2.RrturnPro_count__c = 3;
+      orderdet2.Invoice_Unit__c = '涓�';
+      orderdet2.Invoiced_Count__c = 3;
+      orderdet2 = new Consumable_orderdetails__c();
+      orderdet2.Name = 'Test1_0010031';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet2.Consumable_order__c = testList1.Id;
+      orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet2.Consumable_count__c = 1;
+      orderdet2.Consumable_product__c = pro1.Id;
+      orderdet2.Box_Piece__c = '涓�';
+      orderdet2.Shipment_Count__c = 10;
+      orderdet2.Delivery_List_RMB__c = 2.0;
+      orderdet2.Invoice_Unitprice__c = 1;
+      orderdet2.InvoicedProCost_RMB__c = 1;
+      orderdet2.Invoiced_Procount__c = 3;
+      orderdet2.RrturnPro_count__c = 3;
+      orderdet2.Invoice_Unit__c = '鐩�';
+      orderdet2.Invoiced_Count__c = 3;
+
+      Consumable_orderdetails__c orderdet3 = new Consumable_orderdetails__c();
+      orderdet3.Name = 'Test1_001002';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet3.Consumable_order__c = testList1.Id;
+      orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet3.Consumable_count__c = 1;
+      orderdet3.Box_Piece__c = '鐩�';
+      orderdet3.Consumable_product__c = pro2.Id;
+      orderdet3.Invoice_Unit__c = '涓�';
+      orderdet3.Shipment_Count__c = 11;
+      orderdet3.Delivery_List_RMB__c = 2.0;
+      orderdet3.Invoiced_Procount__c = 3;
+      orderdet3.RrturnPro_count__c = 3;
+      orderdet3.Invoiced_Count__c = 3;
+      orderdet3 = new Consumable_orderdetails__c();
+      orderdet3.Name = 'Test1_001003';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet3.Consumable_order__c = testList1.Id;
+      orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet3.Consumable_count__c = 1;
+      orderdet3.Box_Piece__c = '鐩�';
+      orderdet3.Consumable_product__c = pro1.Id;
+      orderdet3.Invoice_Unit__c = '鐩�';
+      orderdet3.Shipment_Count__c = 11;
+      orderdet3.Delivery_List_RMB__c = 2.0;
+      orderdet3.Invoiced_Procount__c = 3;
+      orderdet3.RrturnPro_count__c = 3;
+      orderdet3.Invoiced_Count__c = 3;
+
+      Consumable_orderdetails__c orderdet4 = new Consumable_orderdetails__c();
+      orderdet4.Name = 'Test1_001004';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet4.Consumable_order__c = testList1.Id;
+      orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet4.Consumable_count__c = 1;
+      orderdet4.Box_Piece__c = '鐩�';
+      orderdet4.Consumable_product__c = pro2.Id;
+      orderdet4.Invoice_Unit__c = '涓�';
+      orderdet4.Shipment_Count__c = 11;
+      orderdet4.Delivery_List_RMB__c = 2.0;
+      orderdet4.Invoiced_Procount__c = 3;
+      orderdet4.Invoiced_Count__c = 3;
+      orderdet4.RrturnPro_count__c = 3;
+      insert new List<Consumable_orderdetails__c>{
+        orderdet1,
+        orderdet2,
+        orderdet3,
+        orderdet4
+      };
+
+      // PageReference page = new PageReference('/apex/ConInvoicedetails?orderId=' + testList1.Id + '&invoiceId=' + invoiceorder.id);
+      // page.setRedirect(true);
+      // System.Test.setCurrentPage(page);
+      //   page = new Pagereference('/ConInvoiceView?invoiceId='+invoiceorder.id);
+      //  page.setRedirect(true);
+
+      LexConInvoicedetailsController.init('', '');
+      // System.assertEquals(4, conTest.consumableorderdetails1Records.size());
+      // conTest.consumableorderdetails1Records[0].check= true;
+      // conTest.consumableorderdetails1Records[0].invoiceCount= 1;
+      // conTest.consumableorderdetails1Records[0].esd.Invoice_Unit__c = '涓�';
+      // conTest.consumableorderdetails1Records[1].check= true;
+      // conTest.consumableorderdetails1Records[1].invoiceCount= 2;
+      // conTest.consumableorderdetails1Records[1].esd.Invoice_Unit__c = '涓�';
+      //     conTest.save();
+      //     conTest.returnToinvoice();
+      //     Consumable_orderdetails__c testInvoice = [select id,Name,Invoiced_Count__c,Invoice_Unit__c,Invoice_Unitprice__c from Consumable_orderdetails__c where id=:invoicedet1.Id];
+      //    System.assertEquals(4, conTest.invoiceOrderRecoedsCount);
+      // System.assertEquals('涓�', testInvoice.Invoice_Unit__c);
+    }
+  }
+  @isTest
+  static void all() {
+    User myUser_test;
+    Account myAccount1;
+    Account myAccount2;
+    Product2__c pro2;
+    Product2__c pro1;
+    Product2 prod01;
+    Product2 prod02;
+    User thisUser = [SELECT Id FROM User WHERE Id = :UserInfo.getUserId()];
+    System.runAs(thisUser) {
+      Profile prof = [
+        SELECT Id
+        FROM Profile
+        WHERE Name = '901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(ET)'
+      ];
+      List<RecordType> rectCo = [
+        SELECT Id
+        FROM RecordType
+        WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '璨╁2搴�'
+      ];
+      if (rectCo.size() == 0) {
+        return;
+      }
+      List<RecordType> rectHos = [
+        SELECT Id
+        FROM RecordType
+        WHERE IsActive = TRUE AND SobjectType = 'Account' AND Name = '鐥呴櫌'
+      ];
+      if (rectHos.size() == 0) {
+        return;
+      }
+      //浜у搧淇℃伅
+      prod01 = new Product2(
+        Name = 'Test01',
+        ProductCode = 'Test01',
+        Asset_Model_No__c = 'Test01',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      prod02 = new Product2(
+        Name = 'Test02',
+        ProductCode = 'Test02',
+        Asset_Model_No__c = 'Test02',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod03 = new Product2(
+        Name = 'Test03',
+        ProductCode = 'Test03',
+        Asset_Model_No__c = 'Test03',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod04 = new Product2(
+        Name = 'Test04',
+        ProductCode = 'Test04',
+        Asset_Model_No__c = 'Test04',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 2,
+        Manual_Entry__c = false
+      );
+      Product2 prod05 = new Product2(
+        Name = 'Test05',
+        ProductCode = 'Test05',
+        Asset_Model_No__c = 'Test05',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      Product2 prod06 = new Product2(
+        Name = 'Test06',
+        ProductCode = 'Test06',
+        Asset_Model_No__c = 'Test06',
+        SFDA_Status__c = '鏈夊姽',
+        Dealer_special_Object__c = true,
+        Packing_list_manual__c = 1,
+        Manual_Entry__c = false
+      );
+      insert new List<Product2>{
+        prod01,
+        prod02,
+        prod03,
+        prod04,
+        prod05,
+        prod06
+      };
+      pro1 = new Product2__c(
+        Name = 'Pro001',
+        OT_CODE_Text__c = 'Test001',
+        Product2__c = prod01.Id
+      );
+      pro2 = new Product2__c(
+        Name = 'Pro002',
+        OT_CODE_Text__c = 'Test002',
+        Product2__c = prod02.Id
+      );
+      Product2__c pro5 = new Product2__c(
+        Name = 'Pro003',
+        OT_CODE_Text__c = 'Test003',
+        Product2__c = prod03.Id
+      );
+      Product2__c pro3 = new Product2__c(
+        Name = 'Pro004',
+        OT_CODE_Text__c = 'Test004',
+        Product2__c = prod04.Id
+      );
+      Product2__c pro4 = new Product2__c(
+        Name = 'Pro005',
+        OT_CODE_Text__c = 'Test005',
+        Product2__c = prod05.Id
+      );
+      Product2__c pro6 = new Product2__c(
+        Name = 'Pro006',
+        OT_CODE_Text__c = 'Test006',
+        Product2__c = prod06.Id
+      );
+      insert new List<Product2__c>{ pro4, pro5, pro6, pro1, pro2, pro3 };
+      myAccount1 = new Account(
+        Name = 'testaccount001',
+        Dealer_discount__c = 10,
+        RecordTypeId = rectCo[0].Id
+      );
+      myAccount2 = new Account(
+        Name = 'testaccount002',
+        Dealer_discount__c = 20,
+        RecordTypeId = rectHos[0].Id
+      );
+      insert myAccount1;
+      insert myAccount2;
+      Contact core = new Contact(
+        email = 'jplumber@salesforce.com',
+        firstname = 'Joe',
+        lastname = 'Plumber',
+        accountid = myAccount1.id
+      );
+      insert core;
+      myUser_test = new User(
+        ContactId = core.id,
+        Alias = 'newUser',
+        Email = 'newuser@testorg.com',
+        EmailEncodingKey = 'UTF-8',
+        LastName = 'TestUser',
+        LanguageLocaleKey = 'zh_CN',
+        LocaleSidKey = 'zh_CN',
+        ProfileId = prof.Id,
+        TimeZoneSidKey = 'Asia/Shanghai',
+        UserName = 'testUser@testorg.com',
+        UserPro_Type__c = 'ENG',
+        Work_Location__c = '鍖椾含'
+      );
+      insert myUser_test;
+    }
+    System.runAs(myUser_test) {
+      //鍙戠エ
+      Consumable_order__c invoiceorder = new Consumable_order__c();
+      invoiceorder.Name = 'invoice02';
+      invoiceorder.Order_type__c = '鍙戠エ';
+      invoiceorder.Invoice_status__c = '宸插畬鎴�';
+      invoiceorder.Invoice_Date__c = Date.today();
+      invoiceorder.RecordTypeid = System.Label.RT_ConOrder_Invoice;
+      invoiceorder.Dealer_info__c = myAccount1.Id;
+      // createId.Order_ForHospital__c = myAccount2.Id;
+      invoiceorder.SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌';
+      invoiceorder.Order_status__c = '鑽夋涓�';
+      insert invoiceorder;
+
+      //鍑哄簱鍗曚俊鎭�
+      //鍑哄簱鍗�
+      Consumable_order__c testList1 = new Consumable_order__c(
+        Name = 'Test1',
+        Summons_Sale_Status__c = '鍑鸿揣',
+        SummonsStatus_c__c = '宸插畬鎴�',
+        SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌',
+        Order_status__c = '鑽夋涓�',
+        Order_type__c = '浼犵エ',
+        Dealer_info__c = myAccount1.Id,
+        ConInvoice_Code__c = invoiceorder.id
+      );
+      Consumable_order__c testList2 = new Consumable_order__c(
+        Name = 'Test2',
+        Summons_Sale_Status__c = '鍑鸿揣',
+        SummonsStatus_c__c = '宸插畬鎴�',
+        SummonsForDirction__c = '鐩存帴閿�鍞粰鍖婚櫌',
+        Order_status__c = '宸叉彁浜�',
+        Order_type__c = '浼犵エ',
+        Dealer_info__c = myAccount1.Id,
+        ConInvoice_Code__c = invoiceorder.id
+      );
+      TestList1.Order_date__c = Date.today().addDays(2);
+      TestList2.Order_date__c = Date.today().addDays(2);
+      TestList1.Order_date__c = Date.today();
+      TestList2.Deliver_date__c = Date.today();
+      insert new List<Consumable_order__c>{ testList1, testList2 };
+
+      //鍙戠エ鏄庣粏1
+      Consumable_orderdetails__c invoicedet1 = new Consumable_orderdetails__c();
+      invoicedet1.Name = 'invoicetest1_001001';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      invoicedet1.Consumable_order__c = invoiceorder.id;
+      invoicedet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet1.Consumable_count__c = 1;
+      invoicedet1.Consumable_product__c = pro1.Id;
+      invoicedet1.Invoicedet1_OD_link__c = testList1.Id;
+      invoicedet1.Box_Piece__c = '鐩�';
+      invoicedet1.Shipment_Count__c = 1;
+      invoicedet1.Invoice_Unitprice__c = 1;
+      invoicedet1.Delivery_List_RMB__c = 1;
+      invoicedet1.InvoicedProCost_RMB__c = 1;
+      invoicedet1.Invoice_Unit__c = '涓�';
+      invoicedet1.Invoiced_Procount__c = 3;
+      invoicedet1.RrturnPro_count__c = 3;
+      Consumable_orderdetails__c invoicedet2 = new Consumable_orderdetails__c();
+      invoicedet2.Name = 'invoiceTest1_001002';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      invoicedet2.Consumable_order__c = invoiceorder.Id;
+      invoicedet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet2.Consumable_count__c = 1;
+      invoicedet2.Consumable_product__c = pro2.Id;
+      invoicedet2.Invoicedet1_OD_link__c = testList2.Id;
+      invoicedet2.Box_Piece__c = '鐩�';
+      invoicedet2.Shipment_Count__c = 1;
+      invoicedet2.Invoice_Unitprice__c = 1;
+      invoicedet2.Delivery_List_RMB__c = 1;
+      invoicedet2.InvoicedProCost_RMB__c = 1;
+      invoicedet2.Invoice_Unit__c = '涓�';
+      invoicedet2.Invoiced_Procount__c = 3;
+      invoicedet2.RrturnPro_count__c = 3;
+      Consumable_orderdetails__c invoicedet3 = new Consumable_orderdetails__c();
+      invoicedet3.Name = 'invoiceTest1_001003';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      invoicedet3.Consumable_order__c = invoiceorder.Id;
+      invoicedet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      invoicedet3.Consumable_count__c = 1;
+      invoicedet3.Consumable_product__c = pro2.Id;
+      invoicedet3.Invoicedet1_OD_link__c = testList2.Id;
+      invoicedet3.Box_Piece__c = '涓�';
+      invoicedet3.Shipment_Count__c = 1;
+      invoicedet3.Invoice_Unit__c = '鐩�';
+      invoicedet3.Delivery_List_RMB__c = 2.0;
+      invoicedet3.Invoice_Unitprice__c = 1;
+      invoicedet3.InvoicedProCost_RMB__c = 1;
+      invoicedet3.Invoiced_Procount__c = 3;
+      invoicedet3.RrturnPro_count__c = 3;
+      insert new List<Consumable_orderdetails__c>{
+        invoicedet1,
+        invoicedet2,
+        invoicedet3
+      };
+
+      //鍑哄簱鍗曟槑缁�1
+      Consumable_orderdetails__c orderdet1 = new Consumable_orderdetails__c();
+      orderdet1.Name = 'Test1_001001';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      orderdet1.Consumable_order__c = testList1.Id;
+      orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet1.Consumable_count__c = 1;
+      orderdet1.Consumable_product__c = pro1.Id;
+      orderdet1.Box_Piece__c = '鐩�';
+      orderdet1.Shipment_Count__c = 11;
+      orderdet1.Delivery_List_RMB__c = 2.0;
+      orderdet1.Invoice_Unitprice__c = 1;
+      orderdet1.InvoicedProCost_RMB__c = 1;
+      orderdet1.Invoiced_Procount__c = 3;
+      orderdet1.RrturnPro_count__c = 3;
+      orderdet1.Invoice_Unit__c = '涓�';
+      orderdet1 = new Consumable_orderdetails__c();
+      orderdet1.Name = 'Test1_0010011';
+      //orderdet1.Consumable_principal__c = testList1.Id;
+      orderdet1.Consumable_order__c = testList1.Id;
+      orderdet1.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet1.Consumable_count__c = 1;
+      orderdet1.Consumable_product__c = pro2.Id;
+      orderdet1.Box_Piece__c = '涓�';
+      orderdet1.Shipment_Count__c = 11;
+      orderdet1.Delivery_List_RMB__c = 2.0;
+      orderdet1.Invoice_Unitprice__c = 1;
+      orderdet1.InvoicedProCost_RMB__c = 1;
+      orderdet1.Invoiced_Procount__c = 3;
+      orderdet1.RrturnPro_count__c = 3;
+      orderdet1.Invoice_Unit__c = '鐩�';
+      Consumable_orderdetails__c orderdet2 = new Consumable_orderdetails__c();
+      orderdet2.Name = 'Test1_0010012';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet2.Consumable_order__c = testList1.Id;
+      orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet2.Consumable_count__c = 1;
+      orderdet2.Consumable_product__c = pro2.Id;
+      orderdet2.Box_Piece__c = '鐩�';
+      orderdet2.Shipment_Count__c = 10;
+      orderdet2.Delivery_List_RMB__c = 2.0;
+      orderdet2.Invoice_Unitprice__c = 1;
+      orderdet2.InvoicedProCost_RMB__c = 1;
+      orderdet2.Invoiced_Procount__c = 3;
+      orderdet2.RrturnPro_count__c = 3;
+      orderdet2.Invoice_Unit__c = '涓�';
+      orderdet2.Invoiced_Count__c = 3;
+      orderdet2 = new Consumable_orderdetails__c();
+      orderdet2.Name = 'Test1_0010031';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet2.Consumable_order__c = testList1.Id;
+      orderdet2.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet2.Consumable_count__c = 1;
+      orderdet2.Consumable_product__c = pro1.Id;
+      orderdet2.Box_Piece__c = '涓�';
+      orderdet2.Shipment_Count__c = 10;
+      orderdet2.Delivery_List_RMB__c = 2.0;
+      orderdet2.Invoice_Unitprice__c = 1;
+      orderdet2.InvoicedProCost_RMB__c = 1;
+      orderdet2.Invoiced_Procount__c = 3;
+      orderdet2.RrturnPro_count__c = 3;
+      orderdet2.Invoice_Unit__c = '鐩�';
+      orderdet2.Invoiced_Count__c = 3;
+
+      Consumable_orderdetails__c orderdet3 = new Consumable_orderdetails__c();
+      orderdet3.Name = 'Test1_001002';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet3.Consumable_order__c = testList1.Id;
+      orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet3.Consumable_count__c = 1;
+      orderdet3.Box_Piece__c = '鐩�';
+      orderdet3.Consumable_product__c = pro2.Id;
+      orderdet3.Invoice_Unit__c = '涓�';
+      orderdet3.Shipment_Count__c = 11;
+      orderdet3.Delivery_List_RMB__c = 2.0;
+      orderdet3.Invoiced_Procount__c = 3;
+      orderdet3.RrturnPro_count__c = 3;
+      orderdet3.Invoiced_Count__c = 3;
+      orderdet3 = new Consumable_orderdetails__c();
+      orderdet3.Name = 'Test1_001003';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet3.Consumable_order__c = testList1.Id;
+      orderdet3.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet3.Consumable_count__c = 1;
+      orderdet3.Box_Piece__c = '鐩�';
+      orderdet3.Consumable_product__c = pro1.Id;
+      orderdet3.Invoice_Unit__c = '鐩�';
+      orderdet3.Shipment_Count__c = 11;
+      orderdet3.Delivery_List_RMB__c = 2.0;
+      orderdet3.Invoiced_Procount__c = 3;
+      orderdet3.RrturnPro_count__c = 3;
+      orderdet3.Invoiced_Count__c = 3;
+
+      Consumable_orderdetails__c orderdet4 = new Consumable_orderdetails__c();
+      orderdet4.Name = 'Test1_001004';
+      //orderdet2.Consumable_principal__c = testList2.Id;
+      orderdet4.Consumable_order__c = testList1.Id;
+      orderdet4.RecordTypeId = System.Label.RT_ConOrderDetail1_Invoice;
+      orderdet4.Consumable_count__c = 1;
+      orderdet4.Box_Piece__c = '鐩�';
+      orderdet4.Consumable_product__c = pro2.Id;
+      orderdet4.Invoice_Unit__c = '涓�';
+      orderdet4.Shipment_Count__c = 11;
+      orderdet4.Delivery_List_RMB__c = 2.0;
+      orderdet4.Invoiced_Procount__c = 3;
+      orderdet4.Invoiced_Count__c = 3;
+      orderdet4.RrturnPro_count__c = 3;
+      insert new List<Consumable_orderdetails__c>{
+        orderdet1,
+        orderdet2,
+        orderdet3,
+        orderdet4
+      };
+
+      LexConInvoicedetailsController.init(testList1.Id, invoiceorder.Id);
+      System.debug(
+        '===>鏁版嵁' +
+        LexConInvoicedetailsController.consumableorderdetails1Records
+      );
+
+      List<LexConInvoicedetailsController.ConsumableorderdetailsInfo> test = LexConInvoicedetailsController.consumableorderdetails1Records;
+
+      LexConInvoicedetailsController.save(
+        JSON.serialize(test),
+        invoiceorder.Id,
+        testList1.Id
+      );
+    }
+  }
+}
diff --git a/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls-meta.xml b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls-meta.xml
new file mode 100644
index 0000000..a9fd6e9
--- /dev/null
+++ b/force-app/main/default/classes/LexConInvoicedetailsControllerTest.cls-meta.xml
@@ -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>
diff --git a/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json b/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
index 112d371..6305bbf 100644
--- a/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
+++ b/force-app/main/default/experiences/Consumable1/brandingSets/partnerCentral.json
@@ -1,33 +1,37 @@
 {
   "definitionName": "prm:branding-prm-merged",
-  "id": "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
+  "id": "57ae3440-8896-4020-a05b-a780ddaf46f0",
   "label": "Partner Central",
   "type": "brandingSet",
   "values": {
     "ActionColor": "rgb(10, 129, 223)",
-    "BorderColor": "#D4D4D4",
-    "CardBackgroundColor": "rgba(255, 255, 255, 0)",
-    "CompanyLogo": "/file-asset/OlympusCommunityLogo?v=1&height=300&width=300",
+    "BorderColor": "rgb(212, 212, 212)",
+    "CardBackgroundColor": "rgba(244, 244, 244, 0)",
+    "CompanyLogo": "/file-asset/servlet1?v=1&height=300&width=300",
     "DetailTextColor": "rgb(51, 51, 51)",
-    "ErrorFontColor": "#ff9e9e",
-    "HeaderBackgroundColor": "#FFFFFF",
-    "HeaderFonts": "Salesforce Sans",
+    "ErrorFontColor": "rgb(224, 75, 32)",
+    "HeaderBackgroundColor": "rgb(255, 255, 255)",
+    "HeaderFonts": "sans-serif",
     "LinkColor": "rgb(37, 116, 169)",
-    "LoginBackgroundColor": "#F4F4F4",
-    "LoginBackgroundImage": "/file-asset/OlympusCommunityLoginBG?v=1",
+    "LoginBackgroundColor": "rgb(216, 233, 229)",
+    "LoginBackgroundImage": "/file-asset/LEXCommunityLogin?v=1",
+    "LoginButtonBorderColor": "#5d392e",
+    "LoginButtonColor": "#202834",
+    "LoginButtonHoverBorderColor": "#4f748b",
+    "LoginButtonHoverColor": "#89644c",
     "NavigationMenuColor": "rgb(8, 16, 132)",
-    "NavigationMenuTextColor": "#FFFFFF",
-    "OverlayTextColor": "#FFFFFF",
-    "PageBackgroundColor": "#FFFFFF",
+    "NavigationMenuTextColor": "rgb(255, 255, 255)",
+    "OverlayTextColor": "rgb(255, 255, 255)",
+    "PageBackgroundColor": "rgb(255, 255, 255)",
     "PrimaryFont": "sans-serif",
-    "TextColor": "#222222",
+    "TextColor": "rgb(51, 51, 51)",
     "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": "#FFFFFF",
+    "_DxpPageBackgroundColor": "rgb(255, 255, 255)",
     "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
     "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
     "_HeaderTextColor": "rgba(34,34,34,.8)",
@@ -42,14 +46,14 @@
     "_NeutralForegroundColor1": "#000",
     "_NeutralForegroundColor2": "#000",
     "_NeutralForegroundColor3": "#fff",
-    "_OverlayTextColorShadow": "#000000",
+    "_OverlayTextColorShadow": "#000",
     "_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(14, 14, 14)",
+    "_TextColor1": "rgb(31, 31, 31)",
     "_TextColor2": "rgb(0, 0, 0)",
     "_TextColor3": "rgb(0, 0, 0)"
   }
diff --git "a/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
index f5f1010..a461d36 100644
--- "a/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
+++ "b/force-app/main/default/experiences/Consumable1/config/consumable\347\263\273\347\273\237.json"
@@ -1,11 +1,11 @@
 {
-  "forgotPasswordRouteId": "543c3ca6-a340-46d3-a25b-82ce3864cf02",
+  "forgotPasswordRouteId": "696dc6cc-2e29-4d91-8947-826d95506b8b",
   "isAvailableToGuests": false,
   "isFilteredComponentsView": false,
   "isProgressiveRenderingEnabled": false,
-  "loginAppPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "mainAppPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "loginAppPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "mainAppPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "preferredDomain": "none",
-  "selfRegistrationRouteId": "2d8061dd-a482-4608-8514-113389805fc4",
+  "selfRegistrationRouteId": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
   "type": "site"
 }
diff --git a/force-app/main/default/experiences/Consumable1/config/languages.json b/force-app/main/default/experiences/Consumable1/config/languages.json
index c0ff54c..e37a81f 100644
--- a/force-app/main/default/experiences/Consumable1/config/languages.json
+++ b/force-app/main/default/experiences/Consumable1/config/languages.json
@@ -1,6 +1,6 @@
 {
   "defaultCode": "zh_CN",
   "defaultLabel": "涓枃锛堢畝浣擄級 (CN)",
-  "id": "574943f7-c68f-4a1b-9b77-b2154af650ab",
+  "id": "50b82dc6-9079-40b8-aa74-c83564656d96",
   "type": "languageContainer"
 }
diff --git a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
index dda7785..8ac0de4 100644
--- a/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
+++ b/force-app/main/default/experiences/Consumable1/config/loginAppPage.json
@@ -1,6 +1,6 @@
 {
   "cmsSettings": {},
-  "id": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "id": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "label": "login",
   "templateName": "Login Template",
   "type": "appPage"
diff --git a/force-app/main/default/experiences/Consumable1/config/mainAppPage.json b/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
index 8e0642f..3bed24b 100644
--- a/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
+++ b/force-app/main/default/experiences/Consumable1/config/mainAppPage.json
@@ -1,8 +1,8 @@
 {
   "cmsSettings": {},
-  "currentThemeId": "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
+  "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": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "id": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "isRelaxedCSPLevel": true,
   "label": "main",
   "templateName": "PRM Community Template",
diff --git a/force-app/main/default/experiences/Consumable1/routes/accountManagement.json b/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
index f5d23d5..fbb82ef 100644
--- a/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
+++ b/force-app/main/default/experiences/Consumable1/routes/accountManagement.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "198e4bed-7a3a-4a56-a15a-d354e55d5624",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "a5aefe6e-da20-437c-8ff9-ef31a22b8d4a",
+  "activeViewId": "fd91a176-37cc-4c72-887d-8a32f8472825",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "4160137e-e9a7-47f3-8f55-2a7a6f94dacb",
   "label": "Account Management",
   "routeType": "account-management",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/cICList.json b/force-app/main/default/experiences/Consumable1/routes/cICList.json
new file mode 100644
index 0000000..2693dcf
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/routes/cICList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "8fd93390-583d-45eb-a6c5-e3b0c5480cfa",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "133bd09c-dc33-4bcd-8fcf-681f5fc571cc",
+  "label": "CIC List",
+  "routeType": "list-500",
+  "type": "route",
+  "urlPrefix": "case"
+}
diff --git a/force-app/main/default/experiences/Consumable1/routes/cICRelatedList.json b/force-app/main/default/experiences/Consumable1/routes/cICRelatedList.json
new file mode 100644
index 0000000..24ff496
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/routes/cICRelatedList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "4fd2378d-1de4-4c96-b33d-8051ad75bdf6",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "19ba552f-efed-4eb3-9b02-584625e7edd4",
+  "label": "CIC Related List",
+  "routeType": "relatedlist-500",
+  "type": "route",
+  "urlPrefix": "case"
+}
diff --git a/force-app/main/default/experiences/Consumable1/routes/campaignList.json b/force-app/main/default/experiences/Consumable1/routes/campaignList.json
index 20645b4..e5bb431 100644
--- a/force-app/main/default/experiences/Consumable1/routes/campaignList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/campaignList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "cccb42f4-95dd-426f-a700-cbe4c839764c",
+  "activeViewId": "4908488d-d41c-4c3d-9f3e-c885a408863c",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "6b80aa5c-e10f-4760-82e4-c07fd6939d02",
   "label": "Campaign List",
   "routeType": "list-701",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/caseDetail.json b/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
index 5f67153..1d15fa8 100644
--- a/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/caseDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "3b1b2646-af41-43d3-a519-528aa49f45f4",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "4601c961-03a6-4646-9c14-5db8084e379a",
+  "activeViewId": "b17204f0-44a2-4866-abaf-23f750a97ddd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "f4887cf8-32fc-4d06-ab40-bbe055a26662",
   "label": "Case Detail",
   "routeType": "detail-500",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/checkPassword.json b/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
index f6890fa..6ae9e96 100644
--- a/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
+++ b/force-app/main/default/experiences/Consumable1/routes/checkPassword.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "id": "86273d15-52e6-4761-b84b-fd899e3def47",
+  "activeViewId": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "id": "9c99cfbb-0aad-460f-9399-ef4943f6e535",
   "label": "Check Password",
   "routeType": "check-password",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/contactSupport.json b/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
index 41670a8..6afe2b7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
+++ b/force-app/main/default/experiences/Consumable1/routes/contactSupport.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "1237083a-e1c5-44da-a3c1-cb1d6c3f762b",
+  "activeViewId": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "8620c8eb-dd82-44a2-9c87-5fe5a029d55c",
   "label": "Contact Support",
   "pageAccess": "UseParent",
   "routeType": "contactsupport",
diff --git a/force-app/main/default/experiences/Consumable1/routes/createRecord.json b/force-app/main/default/experiences/Consumable1/routes/createRecord.json
index db0e4a0..1d461c6 100644
--- a/force-app/main/default/experiences/Consumable1/routes/createRecord.json
+++ b/force-app/main/default/experiences/Consumable1/routes/createRecord.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "ea1db874-7a52-4702-afc8-f7d4b8dbae5c",
+  "activeViewId": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a2259a30-2003-47b7-83a9-466f3e4d0aaf",
   "label": "Create Record",
   "routeType": "createrecord",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
index cf9c100..6281ce7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/dashboardDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "7f941e81-8998-459a-a76b-93f5807e3db7",
+  "activeViewId": "47937364-e71b-469a-b996-317032189c45",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "c5c8d6ff-ac51-41b6-8508-a408ce244a7d",
   "label": "Dashboard Detail",
   "routeType": "detail-01Z",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/dashboardList.json b/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
index 23d2298..c240a2a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/dashboardList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "f10a3529-b77e-4ebc-9b99-281160c97c7f",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "57493307-536a-4ebe-84db-00112d5e0e8d",
+  "activeViewId": "b59c266b-a1ad-47f9-bf26-a8295147505c",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "677a2606-2502-4451-8e5e-9a903153d902",
   "label": "Dashboard List",
   "routeType": "list-01Z",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/error.json b/force-app/main/default/experiences/Consumable1/routes/error.json
index fda5710..8af93a8 100644
--- a/force-app/main/default/experiences/Consumable1/routes/error.json
+++ b/force-app/main/default/experiences/Consumable1/routes/error.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "2d27ac00-e60f-444a-8627-23c58e43d9ad",
+  "activeViewId": "48f1f5ec-b27a-4874-83fa-15e857b27699",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "83bad28f-5c2c-4e3e-999c-5173c3d188dc",
   "label": "Error",
   "pageAccess": "UseParent",
   "routeType": "error",
diff --git a/force-app/main/default/experiences/Consumable1/routes/feedDetail.json b/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
index ab6cfd6..e102085 100644
--- a/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/feedDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "eb28719b-06b5-4397-bf8d-667ec408ca46",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "cfc32bfb-64dc-442c-9c4a-ed8a75b0b9cc",
+  "activeViewId": "fefd7f80-945b-489b-8a4e-615884934641",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "e7141d9b-41ac-4475-918a-40364d069e55",
   "label": "Feed Detail",
   "routeType": "feeditem-generic",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/fileDetail.json b/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
index d3e7116..96e9585 100644
--- a/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/fileDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "2322115a-ac65-4862-9104-912d42fca69a",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "b99c3313-97ee-4e8e-88e7-3156a4d86e82",
+  "activeViewId": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "4b6624be-47a1-4c1c-932e-ba1661e492d2",
   "label": "File Detail",
   "routeType": "detail-069",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/fileList.json b/force-app/main/default/experiences/Consumable1/routes/fileList.json
index 6936c93..47fabf7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/fileList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/fileList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "193807a6-e99f-4075-9811-62dda5b13d43",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "b891df7c-7ecf-4a9c-92d4-8bb6107eb215",
+  "activeViewId": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "582cdc1b-b836-41bf-bc54-91e86a17b0aa",
   "label": "File List",
   "routeType": "list-069",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/flow.json b/force-app/main/default/experiences/Consumable1/routes/flow.json
index 7979ff6..54ba316 100644
--- a/force-app/main/default/experiences/Consumable1/routes/flow.json
+++ b/force-app/main/default/experiences/Consumable1/routes/flow.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "4aa9507c-1470-43b3-8000-390325f6bd7d",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "c8358de2-e646-44de-b2da-2424e96bea67",
+  "activeViewId": "17c9c45c-4c81-49d0-985e-d6281d899320",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "366aef61-f77b-463e-9e3b-b64525248f29",
   "label": "Flow",
   "pageAccess": "UseParent",
   "routeType": "flow",
diff --git a/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json b/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
index c88088f..2401e3a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
+++ b/force-app/main/default/experiences/Consumable1/routes/forgotPassword.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "id": "543c3ca6-a340-46d3-a25b-82ce3864cf02",
+  "activeViewId": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "id": "696dc6cc-2e29-4d91-8947-826d95506b8b",
   "label": "Forgot Password",
   "routeType": "forgot-password",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/groupDetail.json b/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
index 32cc6d5..77105d6 100644
--- a/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/groupDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "ddfb3b5d-5ba5-4152-8103-754658eba70b",
+  "activeViewId": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "d65c3c39-9762-4205-b78a-8111168012f2",
   "label": "Group Detail",
   "routeType": "detail-0F9",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/groupList.json b/force-app/main/default/experiences/Consumable1/routes/groupList.json
index 9e3720a..565ea8a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/groupList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/groupList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "949c0ee3-6484-4ed7-a44f-aa417cec1835",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "34a31fa2-0d70-4d03-a4bd-d962306cb8e4",
+  "activeViewId": "87a9b140-31e2-4c28-9fa4-82135022e59d",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "68d9196c-9eac-4f7c-b1ae-ad2eb703855c",
   "label": "Group List",
   "routeType": "list-0F9",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/home.json b/force-app/main/default/experiences/Consumable1/routes/home.json
index 44f93ca..281d363 100644
--- a/force-app/main/default/experiences/Consumable1/routes/home.json
+++ b/force-app/main/default/experiences/Consumable1/routes/home.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "0b3166bc-2eec-43fa-8adf-532f629e9392",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "8e6532c1-df5e-4843-af7f-e01178398907",
+  "activeViewId": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "939c3a99-21d2-46b8-82dd-6713bce11e9c",
   "label": "Home",
   "pageAccess": "UseParent",
   "routeType": "home",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json b/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
index 6867f82..88492cb 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexAgencyInfo.json
@@ -1,8 +1,8 @@
 {
-  "activeViewId": "376ad65a-00b6-4198-aa04-19a6360969bc",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "5e5ad0fe-6812-4fd0-9c56-bfce5822bf96",
-  "label": "LexAgencyInfo",
+  "activeViewId": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "72138bd6-1956-4337-8eb3-3135b8091773",
+  "label": "lexAgencyInfo",
   "pageAccess": "UseParent",
   "routeType": "custom-lexagencyinfo",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
index acda2d1..3a4c33d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoods.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "cbb28431-553a-49de-8f9d-0d297c0dd897",
+  "activeViewId": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "faabccd4-5e3b-4646-b626-6a85b751c910",
   "label": "LexArriveGoods",
   "pageAccess": "UseParent",
   "routeType": "custom-lexarrivegoods",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
index ca4489f..d144063 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGoodsMain.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "f46aba62-01c3-4a20-93c6-f9b2362717e6",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "372e3324-9c48-41ca-8e6d-4b349f076f65",
+  "activeViewId": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "8e439ddc-a758-4cba-a5f8-c3295fc7349a",
   "label": "LexArriveGoodsMain",
   "pageAccess": "UseParent",
   "routeType": "custom-lexarrivegoodsmain",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json b/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
index e2153d7..e471837 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexArriveGsDetails.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "c7a297cc-a883-4507-b04c-965b15d7d470",
+  "activeViewId": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "e067f74a-448c-4b0e-aeb3-e0fc8d4bd724",
   "label": "LexArriveGsDetails",
   "pageAccess": "UseParent",
   "routeType": "custom-lexarrivegsdetails",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json b/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
index c627566..8ed687f 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexCancelRemoveBox.json
@@ -1,8 +1,8 @@
 {
-  "activeViewId": "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "3289956a-758b-4222-898c-604d006a99fe",
-  "label": "LexCancelRemoveBox",
+  "activeViewId": "b7569df4-3d59-4e39-9916-b444d62da530",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "9022f6fd-bd92-40a7-a7a8-11276aa04bda",
+  "label": "lexCancelRemoveBox",
   "pageAccess": "UseParent",
   "routeType": "custom-lexcancelremovebox",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json b/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
index b003312..c2cafac 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConInvoiceView.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "40788493-ac31-4a30-b873-956597a23a37",
+  "activeViewId": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a7d054c5-781a-4e86-8137-3d65615fd049",
   "label": "LexConInvoiceView",
   "pageAccess": "UseParent",
   "routeType": "custom-lexconinvoiceview",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
index 2016e5b..68c7f11 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumable.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "756785e1-4fb5-4ab3-b38a-58ea679a4361",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "0460cf80-25a2-4785-acb9-587a66def46e",
+  "activeViewId": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "92ab763f-0891-4b15-b0c9-6c769b8a00a1",
   "label": "LexConsumable",
   "pageAccess": "UseParent",
   "routeType": "custom-lexconsumable",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
index 888bfec..6f277a8 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccount.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "7db2303f-7e83-4c85-a7ad-12fa6672974b",
+  "activeViewId": "f724180a-789f-4a5f-909f-a3b6926cff21",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "790c190b-8bf4-4211-a8fb-172af3538e9f",
   "label": "LexConsumableAccount",
   "pageAccess": "UseParent",
   "routeType": "custom-lexconsumableaccount",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
index dd5eb0b..dc404f5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableAccountInfoPrint.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "5d615179-dd62-4481-a874-de16a69d7374",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "82091f6c-517f-4ee0-8ad2-8958cf953804",
+  "activeViewId": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "0b5b4633-9d43-4758-a5a1-7f3048846a66",
   "label": "LexConsumableAccountInfoPrint",
   "pageAccess": "UseParent",
   "routeType": "custom-lexconsumableaccountinfoprint",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json b/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
index 9852ab7..e18442e 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexConsumableOrderManage.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "0c6f8778-bba4-4726-97f6-b639cce7c99e",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "17e0e204-7337-4cc3-8ae8-386f15253878",
+  "activeViewId": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "6335d5ad-ddd3-4fc4-b256-dd3fc662034f",
   "label": "LexConsumableOrderManage",
   "pageAccess": "UseParent",
   "routeType": "custom-lexconsumableordermanage",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexInventory.json b/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
index 80d4186..52910c0 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexInventory.json
@@ -1,10 +1,10 @@
 {
-  "activeViewId": "5a24538d-0a99-40a3-a6a1-4496d0333a05",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "465ce810-60bc-45a4-92f4-8148664ee531",
-  "label": "LexInventory",
+  "activeViewId": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "347e4abc-85c2-477d-ae7a-0ac5bfc0728f",
+  "label": "lexInventory",
   "pageAccess": "UseParent",
-  "routeType": "custom-lexinventory",
+  "routeType": "custom-lex-inventory",
   "type": "route",
   "urlPrefix": "lexinventory"
 }
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json b/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
index 42544da..73e0e3b 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexOutboundorderImport.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "e8224149-f1b9-4c44-8839-4d9737739c72",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "839786f7-032b-4c35-b6b3-7e5ad0de3ac3",
+  "activeViewId": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "2b760536-1491-4c8d-b0e3-f9972354708d",
   "label": "LexOutboundorderImport",
   "pageAccess": "UseParent",
   "routeType": "custom-lexoutboundorderimport",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
index fefd0ed..f7f09e9 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexOverdueStock.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "2c0812bd-c08f-4e4a-980f-360b54f841c4",
+  "activeViewId": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "73006608-6ed7-459c-b9bc-14c6c16476f4",
   "label": "LexOverdueStock",
   "pageAccess": "UseParent",
   "routeType": "custom-lexoverduestock",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
index 89c991d..ffa9997 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexRemoveBox.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "f7bab43e-2170-4980-9b2c-126154272cb0",
+  "activeViewId": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "06d0bb54-97e9-4556-a6ee-5e9c7e34633a",
   "label": "LexRemoveBox",
   "pageAccess": "UseParent",
   "routeType": "custom-lexremovebox",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json b/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
index b03aeb9..3d6ec3c 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexSaleAndDelivery.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "28c40941-a2fa-4f30-a790-936542b1cf84",
+  "activeViewId": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "62628d80-2d75-4a25-aeaf-a0ce85407a6b",
   "label": "LexSaleAndDelivery",
   "pageAccess": "UseParent",
   "routeType": "custom-lexsaleanddelivery",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json b/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
index b2e13ed..c923ac7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexSummonsCreat.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "c2e9c913-ab1c-4b38-899b-136fb95066fb",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "94af1a52-11ac-4e16-8f30-f6fe250ccd1e",
+  "activeViewId": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "4021ee9a-4769-4dac-af20-5099288bae35",
   "label": "LexSummonsCreat",
   "pageAccess": "UseParent",
   "routeType": "custom-lexsummonscreat",
diff --git a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
index 83f8d05..4f76731 100644
--- a/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
+++ b/force-app/main/default/experiences/Consumable1/routes/lexTopPage.json
@@ -1,8 +1,8 @@
 {
-  "activeViewId": "09c93676-a531-4ba7-8708-cc47f8458c90",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "855eeb08-6e57-404b-a5f6-072349535002",
-  "label": "LexTopPage",
+  "activeViewId": "bda75bd7-499d-4d41-ad47-2d49173854dd",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "146bed7f-b8f1-4016-8a31-035874516b5d",
+  "label": "lexTopPage",
   "pageAccess": "UseParent",
   "routeType": "custom-lextoppage",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/login.json b/force-app/main/default/experiences/Consumable1/routes/login.json
index ffabca5..94a379c 100644
--- a/force-app/main/default/experiences/Consumable1/routes/login.json
+++ b/force-app/main/default/experiences/Consumable1/routes/login.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "id": "c7457673-c277-4525-81e4-00da62b21ee0",
+  "activeViewId": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "id": "bc26e928-8b62-4f80-9355-ef5553737e13",
   "label": "Login",
   "routeType": "login-home",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/loginError.json b/force-app/main/default/experiences/Consumable1/routes/loginError.json
index da8109c..d170cd5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/loginError.json
+++ b/force-app/main/default/experiences/Consumable1/routes/loginError.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "ba40442c-80fc-411f-8c02-9cfce2ab1372",
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "id": "b0404c8e-8a84-4ed9-800b-93e742025cef",
+  "activeViewId": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "id": "6b34ae60-30a7-46c8-8e80-657fa96816b1",
   "label": "Login Error",
   "routeType": "login-error",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json b/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
index 15451b0..c39322d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
+++ b/force-app/main/default/experiences/Consumable1/routes/mDFAndCoop.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "b253bc1d-fe4a-4156-91f4-88f4725a3616",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "3e75febe-ff75-4d4f-841d-28dc994a1da1",
+  "activeViewId": "51554054-4eaf-44f6-96bd-b90145e6e078",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "f9897b41-4fb8-433e-8895-82e47d6aa298",
   "label": "MDF and Coop",
   "routeType": "mdf",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/messages.json b/force-app/main/default/experiences/Consumable1/routes/messages.json
index 9b8635e..7066a0c 100644
--- a/force-app/main/default/experiences/Consumable1/routes/messages.json
+++ b/force-app/main/default/experiences/Consumable1/routes/messages.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "93d1b5dd-fc4b-464f-b034-2321557eb837",
+  "activeViewId": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "3929da47-f3e6-42a7-ad00-269ea899171d",
   "label": "Messages",
   "routeType": "messages",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/myAccount.json b/force-app/main/default/experiences/Consumable1/routes/myAccount.json
index 847fc5c..ede4fa6 100644
--- a/force-app/main/default/experiences/Consumable1/routes/myAccount.json
+++ b/force-app/main/default/experiences/Consumable1/routes/myAccount.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "42a42c86-6517-4e0e-a630-be5ab221baf1",
+  "activeViewId": "25eab78c-263e-4a55-8bff-ad852efc15c9",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "ddfd00c8-3c1c-463c-a5d6-78a97c47b79f",
   "label": "My Account",
   "routeType": "my-account",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
index c88a8f4..0e60ff7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/questionDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "c29033d4-ea89-4311-9a8f-9b1cee010f96",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "d4e8748f-c126-4d7f-a4e8-43e4314bf361",
+  "activeViewId": "d4ed7ed0-3745-461e-acd3-32108749ab93",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a91ac3c9-aca5-4723-ae43-bc9c7f231015",
   "label": "Question Detail",
   "routeType": "feeditem",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json b/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
index 23c707f..80464a5 100644
--- a/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/quipDocsRelatedList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "be244254-9e8f-46bd-83e0-a6cdb3780540",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "12cc102d-f664-49b7-8b25-c78d7939a8ed",
+  "activeViewId": "b076cb5b-405f-4199-b9be-7429234ce226",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "56d102f8-5197-4dca-a1d3-fec183274f67",
   "label": "Quip Docs Related List",
   "pageAccess": "UseParent",
   "routeType": "extrelated-quip",
diff --git a/force-app/main/default/experiences/Consumable1/routes/recordDetail.json b/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
index 73cdb56..1cde82f 100644
--- a/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/recordDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "d30889c1-09fc-407a-8d9d-155b305cce6f",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "63bae7d4-3412-48c3-9503-126a63811892",
+  "activeViewId": "c8075095-c3fd-4d07-8079-0eb063287ad7",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "de9cd95e-59e4-4622-8f8d-8fdb3768da70",
   "label": "Record Detail",
   "routeType": "detail",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/recordList.json b/force-app/main/default/experiences/Consumable1/routes/recordList.json
index 4ee4af5..e9084b7 100644
--- a/force-app/main/default/experiences/Consumable1/routes/recordList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/recordList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "f14a9999-9077-4660-a62f-b9df05228f6c",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "b63deca7-c984-4812-9b2a-f757908981a0",
+  "activeViewId": "568148b6-8356-45bb-a31e-e8c320ff9726",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "4bb09a90-41cc-4630-a450-d8545941e231",
   "label": "Record List",
   "pageAccess": "UseParent",
   "routeType": "list",
diff --git a/force-app/main/default/experiences/Consumable1/routes/register.json b/force-app/main/default/experiences/Consumable1/routes/register.json
index 71ceac1..f0f976a 100644
--- a/force-app/main/default/experiences/Consumable1/routes/register.json
+++ b/force-app/main/default/experiences/Consumable1/routes/register.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
-  "id": "2d8061dd-a482-4608-8514-113389805fc4",
+  "activeViewId": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
+  "id": "e8838dbc-c64c-4cd5-b34a-9dea25b08d42",
   "label": "Register",
   "routeType": "self-register",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json b/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
index d1002b9..6e2a5d4 100644
--- a/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/relatedRecordList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "2a182209-2527-4335-b672-176196ee6a0d",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "821d09c9-7732-4bb0-a002-f8fc3e825a20",
+  "activeViewId": "172db5bf-c37b-4cee-853b-212bf73517d7",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "0bcea7b6-93f9-47b9-a354-7c6ecc13b22f",
   "label": "Related Record List",
   "pageAccess": "UseParent",
   "routeType": "relatedlist",
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json b/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
index faf1862..cfcfe00 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportBuilder.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "059d5f4a-e616-4540-be96-a34b294fb2a4",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "20b2eb69-8eea-41f6-bef2-3a3e66f4ac0f",
+  "activeViewId": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "4cbb98c3-d712-4d7f-9516-d497244b5d7b",
   "label": "Report Builder",
   "routeType": "createreport",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportDetail.json b/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
index cd17a33..fd9efe2 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "fbba1bbe-83b3-4711-ab64-131ca5bf8e4e",
+  "activeViewId": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a3d550e0-17da-410b-9046-20710587176d",
   "label": "Report Detail",
   "routeType": "detail-00O",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/reportList.json b/force-app/main/default/experiences/Consumable1/routes/reportList.json
index 6ec5e89..a95746f 100644
--- a/force-app/main/default/experiences/Consumable1/routes/reportList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/reportList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "2f63d133-547c-46d3-ba43-4badc59db592",
+  "activeViewId": "f71c1609-6433-4cf0-8846-695e50897517",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "0334744b-2e69-4b21-bca0-46da443d17a2",
   "label": "Report List",
   "routeType": "list-00O",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/resources.json b/force-app/main/default/experiences/Consumable1/routes/resources.json
index d4ebedb..064d4e0 100644
--- a/force-app/main/default/experiences/Consumable1/routes/resources.json
+++ b/force-app/main/default/experiences/Consumable1/routes/resources.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "dc215254-3731-423c-ba11-3d87746598e8",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "84243d63-bbfd-4642-8fc2-923d714ca322",
+  "activeViewId": "2feda9aa-a785-4e98-9448-352e28d95b34",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "d3935a4f-b947-4b06-aaa7-a435e32b0d8f",
   "label": "Resources",
   "pageAccess": "UseParent",
   "routeType": "files",
diff --git a/force-app/main/default/experiences/Consumable1/routes/search.json b/force-app/main/default/experiences/Consumable1/routes/search.json
index 34b0cd5..763f3ab 100644
--- a/force-app/main/default/experiences/Consumable1/routes/search.json
+++ b/force-app/main/default/experiences/Consumable1/routes/search.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "74aeae6d-8d40-433e-8168-45175ee356a6",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "a891eb3e-9e90-410a-9016-65f1ad0dc887",
+  "activeViewId": "99b69c91-c8d8-42fe-91af-6f71e4612910",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "0bc852e1-bd84-4ab4-a37a-a680a15378e6",
   "label": "Search",
   "pageAccess": "UseParent",
   "routeType": "global-search",
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
index a0904ff..a79c5d4 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "363f8c18-dff6-46a3-91c7-f574cc32b412",
+  "activeViewId": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "6d5ad4ec-9290-4748-81ac-d75e71699bbb",
   "label": "Stream Detail",
   "routeType": "detail-0Fq",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/streamList.json b/force-app/main/default/experiences/Consumable1/routes/streamList.json
index aae8e1d..8a3eb9e 100644
--- a/force-app/main/default/experiences/Consumable1/routes/streamList.json
+++ b/force-app/main/default/experiences/Consumable1/routes/streamList.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "e1275716-f06a-4a27-a667-19c49eefb083",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "fa6fe95d-1642-4d25-8690-9b9a1504e9a0",
+  "activeViewId": "6ef6f17a-0dda-4824-8310-e283e961890f",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "328d83cb-799e-47d6-af05-0f3b2cd704e4",
   "label": "Stream List",
   "routeType": "list-0Fq",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json b/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
index f041210..88fd16d 100644
--- a/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable1/routes/topicCatalog.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "3912430c-3c10-4bf3-bf37-5a619a596491",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "ecc9aeb9-aacd-4c2a-ab2e-e2e1befce726",
+  "activeViewId": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "710677ce-88c2-4a7c-83bd-2e1a6ccce33f",
   "label": "Topic Catalog",
   "pageAccess": "UseParent",
   "routeType": "topic-catalog",
diff --git a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
index 7c1aa7e..c8d9482 100644
--- a/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
+++ b/force-app/main/default/experiences/Consumable1/routes/topicDetail.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "060ff5da-04b3-49de-8fb8-03decd8c188c",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "8a6adaa6-3a66-4924-aae5-ea1120239b86",
+  "activeViewId": "8f8238dc-8f81-4994-9933-b4dcb285776e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "77f8e584-3870-49e2-86c8-08389b371d5f",
   "label": "Topic Detail",
   "routeType": "topic",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/userProfile.json b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
index bbab40b..61baba4 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userProfile.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userProfile.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "b3764d11-d26d-4554-8747-e7f30fb722bd",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "a611aa58-e18f-4242-882d-e91bc8977624",
+  "activeViewId": "2245cd19-8057-487b-8284-d7f20c56e1f7",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a6b8fa86-82fc-41af-ad13-7bd0f38d383e",
   "label": "User Profile",
   "routeType": "detail-005",
   "type": "route",
diff --git a/force-app/main/default/experiences/Consumable1/routes/userSettings.json b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
index 4a75f07..8495442 100644
--- a/force-app/main/default/experiences/Consumable1/routes/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/routes/userSettings.json
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "8225f2be-2536-4868-afe9-ed11e1c1eb15",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "cf47d325-829c-4ce7-a2b3-2440777f63c4",
+  "activeViewId": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "7b23fd34-333f-4950-8543-98bea72908f6",
   "label": "User Settings",
   "routeType": "usersettings",
   "type": "route",
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277RelatedList.json"
new file mode 100644
index 0000000..38c8af3
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\344\273\252\350\241\250\346\235\277RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "9c09c70e-209c-4ed4-baa3-8dad00a95381",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "82e3cba0-cdd4-4ad2-906a-876165298af5",
+  "label": "浠〃鏉� Related List",
+  "routeType": "relatedlist-01Z",
+  "type": "route",
+  "urlPrefix": "dashboard"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
new file mode 100644
index 0000000..40164e1
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "d1ab2f20-ffeb-42ab-a74f-01c71e2d5e74",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "c195be57-9964-40c2-b12d-2836bd580514",
+  "label": "瀛︿細銉诲煿璁� Detail",
+  "routeType": "detail-701",
+  "type": "route",
+  "urlPrefix": "campaign"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json"
new file mode 100644
index 0000000..8c07a5d
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "0a522fab-0926-4aef-aed4-a88ce0f77c0d",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "c70d2e31-c9f1-47f2-b4c2-9d5a4c45d6ed",
+  "label": "瀛︿細銉诲煿璁� Related List",
+  "routeType": "relatedlist-701",
+  "type": "route",
+  "urlPrefix": "campaign"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204RelatedList.json"
new file mode 100644
index 0000000..789a555
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\260\217\347\273\204RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "95256c4b-4f81-4779-9782-9c1f067a3c0e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "ab778236-0b8e-42eb-9411-92f52aac464b",
+  "label": "灏忕粍 Related List",
+  "routeType": "relatedlist-0F9",
+  "type": "route",
+  "urlPrefix": "group"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230.json"
new file mode 100644
index 0000000..c8a9654
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230.json"
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "a6d83607-a4bc-4c64-872a-a4d28a96575d",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "c1a73a85-86b9-4710-84c6-1abb2ff21cf6",
+  "label": "搴撳瓨",
+  "pageAccess": "UseParent",
+  "routeType": "custom-inventory-view",
+  "type": "route",
+  "urlPrefix": "lexInventoryView"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json" "b/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json"
new file mode 100644
index 0000000..ac707cd
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json"
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "36bed1a3-91cc-436d-b1f6-398b8082f724",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "ad332521-8c7d-4288-9941-a7d0ebe44a9b",
+  "label": "搴撳瓨涓婁笅闄愮紪杈�",
+  "pageAccess": "UseParent",
+  "routeType": "custom-lex-product-limit-edit",
+  "type": "route",
+  "urlPrefix": "LexProductLimitEdit"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250RelatedList.json"
new file mode 100644
index 0000000..b6ef0e5
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\212\245\350\241\250RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "aa256afb-6656-4526-834f-3706e4a15bca",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "e2c13a29-0674-4854-8390-9a3e3df1b1ea",
+  "label": "鎶ヨ〃 Related List",
+  "routeType": "relatedlist-00O",
+  "type": "route",
+  "urlPrefix": "report"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json"
new file mode 100644
index 0000000..f00add9
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\226\207\344\273\266RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "74713a2e-dcbc-464b-a87a-d1231dc118a2",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "a6a5ab12-e9b1-4fc0-9fdf-a9142ef22669",
+  "label": "鏂囦欢 Related List",
+  "routeType": "relatedlist-069",
+  "type": "route",
+  "urlPrefix": "contentdocument"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json"
new file mode 100644
index 0000000..a0b81a5
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\226\260\345\273\272\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225.json"
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "375bc286-f467-4c6c-a3e1-be4bfbf27bea",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "bd66f475-4bea-4c64-a6c4-8ed16d217742",
+  "label": "鏂板缓娑堣�楀搧璁㈠崟",
+  "pageAccess": "UseParent",
+  "routeType": "custom-neworder",
+  "type": "route",
+  "urlPrefix": "neworder"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\265\201RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\265\201RelatedList.json"
new file mode 100644
index 0000000..340d936
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\265\201RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "e37f28a6-0d81-44ac-ab4d-5afbb6f43b64",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "874d9b00-d231-438c-b842-5e78d01ac371",
+  "label": "娴� Related List",
+  "routeType": "relatedlist-0Fq",
+  "type": "route",
+  "urlPrefix": "streams"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index ff0c838..0550293 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "293921b6-1a37-49a3-a225-be2f3471a41c",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "9d3bd2d5-0b87-4b44-adad-6044a25d08aa",
+  "activeViewId": "c331401c-5c71-4d88-9350-c5e8a79202c5",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "0bc8b231-a663-4b31-8bc2-7b3e5e625d81",
   "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
   "objectApiName": "Consumable_order__c",
   "routeType": "list-a2K",
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
index 98bd601..258d66f 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "34031253-cc77-4f4e-8baf-c77ca2b9cc2a",
+  "activeViewId": "3dd9b830-a644-429b-8b1c-e2770454179a",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "1c5bbf6d-ddab-45f3-a882-a7bac3128a9f",
   "label": "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
   "objectApiName": "Consumable_order__c",
   "routeType": "relatedlist-a2K",
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json" "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
index 6decf8e..9b0a5e6 100644
--- "a/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
+++ "b/force-app/main/default/experiences/Consumable1/routes/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
@@ -1,7 +1,7 @@
 {
-  "activeViewId": "edf32642-ece4-4435-94c9-82eb6b8f67a9",
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "id": "e7af9c90-036b-4cee-921f-06d6ef72f826",
+  "activeViewId": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "7283136d-99d5-4982-bb41-02e2ebc00e5a",
   "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
   "objectApiName": "Consumable_order__c",
   "routeType": "detail-a2K",
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json"
new file mode 100644
index 0000000..9850d46
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267List.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "ef48fff2-c579-4f2a-971d-251b61fd786e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "43d97466-c6d8-41c4-b93a-c0fccb403e19",
+  "label": "鐢ㄦ埛 List",
+  "routeType": "list-005",
+  "type": "route",
+  "urlPrefix": "profile"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267RelatedList.json" "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267RelatedList.json"
new file mode 100644
index 0000000..afbbd01
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/routes/\347\224\250\346\210\267RelatedList.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "75664e4d-fe1a-4473-ade4-9dca081ecd40",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "id": "7f3c9630-4b16-4605-8891-e7e316eda732",
+  "label": "鐢ㄦ埛 Related List",
+  "routeType": "relatedlist-005",
+  "type": "route",
+  "urlPrefix": "profile"
+}
diff --git a/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json b/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
index 7bb2a24..1657bd7 100644
--- a/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
+++ b/force-app/main/default/experiences/Consumable1/themes/partnerCentral.json
@@ -1,34 +1,34 @@
 {
-  "activeBrandingSetId": "da39013d-fbc0-4c27-a7a2-5f9d07bdb4bd",
+  "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}",
   "developerName": "prm",
-  "id": "dc3ec245-c32a-48fc-920e-8ff30c6cff7a",
+  "id": "0c81955a-9ad5-4639-a11d-03665e570a65",
   "label": "Partner Central",
   "layouts": {
-    "Inner": "27b0f619-7930-4846-b53d-3eb904a52e9e",
-    "Login": "d5b47306-6295-4d2d-a5d9-cb373be9c125",
-    "ServiceNotAvailable": "1ed3aeb9-9205-4229-bfb0-71096321a26b"
+    "Inner": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
+    "Login": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
+    "ServiceNotAvailable": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97"
   },
   "type": "theme",
   "views": [
     {
       "componentAttributes": {},
       "componentName": "salesforceIdentity:loginBody2",
-      "id": "d5b47306-6295-4d2d-a5d9-cb373be9c125",
+      "id": "84cd1ad9-7292-4b3d-9595-4e9b33dbb1ab",
       "label": "Login",
       "regions": [
         {
-          "id": "74f03049-e17f-419d-b642-3406729e5ffe",
+          "id": "a91c3512-ae18-4751-bcf0-80e8cd355d9b",
           "regionName": "header",
           "type": "region"
         },
         {
-          "id": "0744fcb0-7421-49a4-8a25-eef41dc46740",
+          "id": "b788957d-6263-4d64-8491-97ea0a5187a4",
           "regionName": "content",
           "type": "region"
         },
         {
-          "id": "74aa9402-e6be-4155-9d62-225d117a1754",
+          "id": "ba3b541d-6631-437f-a979-432ff99fdd30",
           "regionName": "footer",
           "type": "region"
         }
@@ -45,11 +45,11 @@
         "isPageWidthFixed": true
       },
       "componentName": "siteforce:prmBody",
-      "id": "27b0f619-7930-4846-b53d-3eb904a52e9e",
+      "id": "39faaefb-3ef8-4fa6-a453-e348651dc20c",
       "label": "Default",
       "regions": [
         {
-          "id": "16bdf3ff-1315-4546-88a6-de32558d62ab",
+          "id": "c5802569-2598-48b8-9441-b4c8f976a16c",
           "regionName": "customHeader",
           "type": "region"
         },
@@ -58,37 +58,25 @@
             {
               "componentAttributes": {
                 "maxAutoCompleteResults": 5,
-                "searchLabel": "鎼滅储...",
+                "searchLabel": "鎼滅储",
                 "searchObjects": [
                   {
-                    "isPublic": false,
-                    "name": "Opportunity"
-                  },
-                  {
-                    "isPublic": false,
-                    "name": "Campaign"
-                  },
-                  {
-                    "isPublic": false,
-                    "name": "ContentDocument"
+                    "isPublic": true,
+                    "name": "Agency_Report_Header__c"
                   },
                   {
                     "isPublic": true,
                     "name": "Consumable_order__c"
-                  },
-                  {
-                    "isPublic": true,
-                    "name": "Consumable_order_details2__c"
                   }
                 ]
               },
               "componentName": "forceCommunity:globalSearchInput",
-              "id": "8675f0f3-1f0a-4d4b-a1e5-f49da3a754d6",
+              "id": "3c8dc360-c5d6-41fd-b1b0-8caec0d2377b",
               "renditionMap": {},
               "type": "component"
             }
           ],
-          "id": "7af0cf8c-92cf-45b1-a808-2c4edea02007",
+          "id": "f6021099-2f13-462d-a2a5-3c8cd07eb5ad",
           "regionName": "search",
           "type": "region"
         },
@@ -113,12 +101,12 @@
                 "viewProfileLabel": "My Profile"
               },
               "componentName": "selfService:userProfileMenu",
-              "id": "e9f75e24-e895-4c54-83c3-936329504b74",
+              "id": "c241566b-9bf8-43a6-a068-c176ff75109e",
               "renditionMap": {},
               "type": "component"
             }
           ],
-          "id": "1f8acbb0-d430-44e9-a27f-695c6176b837",
+          "id": "6a60ad26-0295-4a78-ab90-28fcd2c0531e",
           "regionName": "profileMenu",
           "type": "region"
         },
@@ -131,22 +119,22 @@
                 "hideHomeText": false
               },
               "componentName": "forceCommunity:globalNavigation",
-              "id": "ef1a7404-2c49-4de2-82fd-cfcd351cc65a",
+              "id": "932fd9d7-f187-457d-83af-d59077849505",
               "renditionMap": {},
               "type": "component"
             }
           ],
-          "id": "ce986e45-573a-4449-821c-c1d048044cd6",
+          "id": "7475eca5-ac9b-46dd-bda0-15fee73ff99a",
           "regionName": "navBar",
           "type": "region"
         },
         {
-          "id": "d389ebfc-0fde-47e7-93c5-1181c3a80075",
+          "id": "f932ec44-4720-4579-b9bb-014a3c718815",
           "regionName": "customRegion",
           "type": "region"
         },
         {
-          "id": "773b1fa0-0bcd-4b2e-81f7-a88ac559a6bf",
+          "id": "0e9bcb14-01ed-4e78-b6a0-f04805ae5206",
           "regionName": "footer",
           "type": "region"
         }
@@ -164,16 +152,16 @@
         "showHero": true
       },
       "componentName": "siteforce:themeLayoutStarter",
-      "id": "1ed3aeb9-9205-4229-bfb0-71096321a26b",
+      "id": "16e1a319-5f46-4925-8a1d-7e4ee97b9b97",
       "label": "ServiceNotAvailable",
       "regions": [
         {
-          "id": "a29c8ac1-de42-4098-910c-b4c76b635e54",
+          "id": "a4d1a1d0-2316-47b2-8a3a-2e1a6fa7c860",
           "regionName": "themeHeader",
           "type": "region"
         },
         {
-          "id": "a2b35d26-5d76-47c4-9dd0-cfff946cd7c7",
+          "id": "649ab6db-a997-4384-970f-554fd7658ea8",
           "regionName": "themeFooter",
           "type": "region"
         }
diff --git a/force-app/main/default/experiences/Consumable1/variations/defaultNavigationMenuComponentProperties.json b/force-app/main/default/experiences/Consumable1/variations/defaultNavigationMenuComponentProperties.json
new file mode 100644
index 0000000..f7f8d83
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/variations/defaultNavigationMenuComponentProperties.json
@@ -0,0 +1,17 @@
+{
+  "componentVariants": [
+    {
+      "id": "39e44bcd-8522-4e13-96bf-d3b24382c053",
+      "propertyOverrides": {
+        "componentAttributes": {
+          "NavigationMenuEditorRefresh": "Test"
+        }
+      },
+      "targetId": "932fd9d7-f187-457d-83af-d59077849505",
+      "type": "componentVariant"
+    }
+  ],
+  "developerName": "Default_Navigation_Menu_Component_Properties",
+  "id": "8c3aca63-729b-4e95-82be-437704ec4497",
+  "type": "experienceVariation"
+}
diff --git a/force-app/main/default/experiences/Consumable1/views/accountManagement.json b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
index e7d9038..cbe9247 100644
--- a/force-app/main/default/experiences/Consumable1/views/accountManagement.json
+++ b/force-app/main/default/experiences/Consumable1/views/accountManagement.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "198e4bed-7a3a-4a56-a15a-d354e55d5624",
+  "id": "fd91a176-37cc-4c72-887d-8a32f8472825",
   "label": "Account Management",
   "regions": [
     {
-      "id": "202c6d5b-0e3e-4ee4-9327-bb9e056f5ccd",
+      "id": "262d4441-fd9c-4127-9986-4c9ad8587eba",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b>             </h1>             "
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "23086da8-7c2e-4db2-9d92-e2cb300415db",
+          "id": "3d0c495a-f911-45a0-9567-812a0743c581",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -25,11 +25,11 @@
         {
           "componentAttributes": {
             "tabsetConfig": {
-              "UUID": "65ec293d-c556-4ebb-a718-1d2091eebe82",
+              "UUID": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
               "activeTab": "tab1",
               "tabs": [
                 {
-                  "UUID": "507fb429-2282-49b5-8878-f05f01f9861a",
+                  "UUID": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -50,7 +50,7 @@
                   "tabName": "Members"
                 },
                 {
-                  "UUID": "c61e3f16-c77e-49f2-b596-d89451128362",
+                  "UUID": "03536177-264d-43e3-8c3f-1214755f8b7b",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -69,7 +69,7 @@
             }
           },
           "componentName": "forceCommunity:tabset",
-          "id": "65ec293d-c556-4ebb-a718-1d2091eebe82",
+          "id": "70bcdbb9-d991-42bc-b481-e7402ac6098d",
           "regions": [
             {
               "components": [
@@ -84,12 +84,12 @@
                     "showRowNumbers": false
                   },
                   "componentName": "forceCommunity:relatedList",
-                  "id": "1054405a-fda1-450b-a9ec-67e9be3839fb",
+                  "id": "a9efd81a-d6fa-448b-93cf-280e7c6ef46c",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "507fb429-2282-49b5-8878-f05f01f9861a",
+              "id": "a29aefd0-0fcc-4da9-9870-d36a8d0de93e",
               "regionLabel": "Members",
               "regionName": "tab1",
               "renditionMap": {},
@@ -102,12 +102,12 @@
                     "recordId": "{!CurrentUser.accountId}"
                   },
                   "componentName": "forceCommunity:accountBrandRecord",
-                  "id": "7b84436c-612b-4042-b9c4-411d9fbe0957",
+                  "id": "18ef9967-2369-484a-83db-f4c32494e9cc",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "c61e3f16-c77e-49f2-b596-d89451128362",
+              "id": "03536177-264d-43e3-8c3f-1214755f8b7b",
               "regionLabel": "Branding",
               "regionName": "tab2",
               "renditionMap": {},
@@ -119,12 +119,12 @@
           "type": "component"
         }
       ],
-      "id": "9d9976f8-dd44-4d6f-91c8-06440b957386",
+      "id": "994d71b3-70bd-4c11-a9a5-343ca297dc90",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "3583c796-50b6-4943-86ba-e0f908a892d2",
+      "id": "dd298082-15f8-418d-9f95-7384993b0791",
       "regionName": "footer",
       "type": "region"
     },
@@ -137,12 +137,12 @@
             "title": "Account Management"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "e6b1c498-01fb-4b0d-b21f-55bfa86e605b",
+          "id": "675eddaf-9bb9-4932-86dd-ee69780ecb3d",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "786a718c-93c1-484e-8839-716d2b615d06",
+      "id": "0736aa4d-5574-41f3-8504-6e9ab73263f2",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/cICList.json b/force-app/main/default/experiences/Consumable1/views/cICList.json
new file mode 100644
index 0000000..79a7483
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/views/cICList.json
@@ -0,0 +1,52 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "8fd93390-583d-45eb-a6c5-e3b0c5480cfa",
+  "label": "CIC List",
+  "regions": [
+    {
+      "id": "13c61a0d-ae56-45bd-8dfd-f4e180fe341e",
+      "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
+          },
+          "componentName": "forceCommunity:objectHome",
+          "id": "d7f341b6-2d1d-4487-882d-0e411a27ed16",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "9321449e-eba6-49b1-a8ae-140a8bbe07ed",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "dfcfc4bd-4f6d-4a9d-857c-1e460c60ea3f",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-500"
+}
diff --git a/force-app/main/default/experiences/Consumable1/views/cICRelatedList.json b/force-app/main/default/experiences/Consumable1/views/cICRelatedList.json
new file mode 100644
index 0000000..dc2022c
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/views/cICRelatedList.json
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "4fd2378d-1de4-4c96-b33d-8051ad75bdf6",
+  "label": "CIC Related List",
+  "regions": [
+    {
+      "id": "c4db92a7-d368-4d52-9868-fab9110f9f94",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "9f1d0e22-e08f-44b9-a6be-b0b2717f90aa",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "96759964-f58f-4fb1-8751-b807e3df6fcc",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "28ef7baf-73ad-4450-b282-7f360e7c067f",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-500"
+}
diff --git a/force-app/main/default/experiences/Consumable1/views/campaignList.json b/force-app/main/default/experiences/Consumable1/views/campaignList.json
index 46f0c7c..d559691 100644
--- a/force-app/main/default/experiences/Consumable1/views/campaignList.json
+++ b/force-app/main/default/experiences/Consumable1/views/campaignList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "f83414cc-cd96-4d24-94d6-1d6fdad65b83",
+  "id": "4908488d-d41c-4c3d-9f3e-c885a408863c",
   "label": "Campaign List",
   "regions": [
     {
-      "id": "8cd141df-47bb-44e7-88e8-d6cf2dcb60e0",
+      "id": "60c2bc90-4421-459e-b1ba-a2107f339447",
       "regionName": "header",
       "type": "region"
     },
@@ -15,11 +15,11 @@
         {
           "componentAttributes": {
             "tabsetConfig": {
-              "UUID": "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+              "UUID": "d016bcc8-d583-403f-98e1-b4cc52482162",
               "activeTab": "tab1",
               "tabs": [
                 {
-                  "UUID": "295af927-269e-4ae3-89c6-1065c44b9479",
+                  "UUID": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
                   "allowGuestUser": true,
                   "locked": false,
                   "seedComponents": [
@@ -38,7 +38,7 @@
                   "tabName": "Campaign Marketplace"
                 },
                 {
-                  "UUID": "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+                  "UUID": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
                   "allowGuestUser": true,
                   "locked": false,
                   "seedComponents": [
@@ -58,7 +58,7 @@
             }
           },
           "componentName": "forceCommunity:tabset",
-          "id": "8eb696d0-116a-43bd-aacf-3dcb9d42f82a",
+          "id": "d016bcc8-d583-403f-98e1-b4cc52482162",
           "regions": [
             {
               "components": [
@@ -67,7 +67,7 @@
                     "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": "ffe2df03-ba7f-4a7f-a8a2-c3e393c9cfaa",
+                  "id": "5d79ac34-0177-4289-b5a8-ca6411a73449",
                   "renditionMap": {},
                   "type": "component"
                 },
@@ -86,12 +86,12 @@
                     "titleField": "Name"
                   },
                   "componentName": "forceCommunity:campaignTileList",
-                  "id": "b697c485-7d58-4403-a0ca-3ad0490ca174",
+                  "id": "6759af65-a1cb-4ed7-857d-7d1e8f5345aa",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "295af927-269e-4ae3-89c6-1065c44b9479",
+              "id": "05cfd9b7-fe86-42d7-ae45-913d15406f64",
               "regionLabel": "Campaign Marketplace",
               "regionName": "tab1",
               "renditionMap": {},
@@ -117,12 +117,12 @@
                     "showSearchBar": true
                   },
                   "componentName": "forceCommunity:objectHome",
-                  "id": "468384df-73f0-459b-8b3b-99cb260ace82",
+                  "id": "b172d17f-5066-4094-8678-182496badab9",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "41da809c-e1f0-44f4-b742-c33cfecac7ff",
+              "id": "6b84f5c2-b5dd-4aae-b061-dbb84244686b",
               "regionLabel": "All Campaigns",
               "regionName": "tab2",
               "renditionMap": {},
@@ -134,12 +134,12 @@
           "type": "component"
         }
       ],
-      "id": "f05e4448-347d-4264-ba99-7d8afeb75c23",
+      "id": "535cdff9-cb2b-4795-a86f-7ab08bee59c0",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "7627cbac-8224-4c40-ac93-186f3a47f991",
+      "id": "3c3ec81e-d8af-40ff-9335-930d66638643",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/caseDetail.json b/force-app/main/default/experiences/Consumable1/views/caseDetail.json
index 418c9a8..9278367 100644
--- a/force-app/main/default/experiences/Consumable1/views/caseDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/caseDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "3b1b2646-af41-43d3-a519-528aa49f45f4",
+  "id": "b17204f0-44a2-4866-abaf-23f750a97ddd",
   "label": "Case Detail",
   "regions": [
     {
-      "id": "1eb1822e-40d4-40a9-8504-a3bc8ae79809",
+      "id": "9c67d8f8-f7eb-4b96-a1a7-16b8062b3d57",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:recordHeadline",
-          "id": "1602b68a-ea96-47ea-8132-0bba6301069a",
+          "id": "2c68dcfb-9f4e-4cac-b812-0ae412ff8733",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -36,18 +36,18 @@
             "timelineTabLabel": "Activity"
           },
           "componentName": "forceCommunity:recordHomeTabs",
-          "id": "eb5335d5-d3df-4512-91ae-50c5403ea737",
+          "id": "fd039f89-ba1f-4f3d-a270-52cbb83bb6e5",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "40f59663-263d-41c7-94ea-345dca5b494e",
+      "id": "744079bf-ab73-462e-a23f-4f17a7b40b13",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "c47a29f6-4120-46fd-9cfb-e9724d01b1e8",
+      "id": "c3923904-a96f-479d-94da-8529e773dada",
       "regionName": "footer",
       "type": "region"
     },
@@ -60,12 +60,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "f8cd34d0-3569-404e-ad02-b6abae393992",
+          "id": "d7c9dd3f-bed9-4be6-877e-a0aa3309ab58",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "28f1ae6f-7ab6-49c0-a8b1-4819fbedcae3",
+      "id": "6926117b-34c0-4fd7-b2c0-040443303e3e",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/checkPassword.json b/force-app/main/default/experiences/Consumable1/views/checkPassword.json
index a602251..d0fdc3c 100644
--- a/force-app/main/default/experiences/Consumable1/views/checkPassword.json
+++ b/force-app/main/default/experiences/Consumable1/views/checkPassword.json
@@ -1,44 +1,34 @@
 {
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "82d3f50a-42f2-4aa2-b028-7b07d878cd63",
+  "id": "14d5ae00-1629-429d-ac4f-b5abd28a21a3",
   "label": "Check Password",
   "regions": [
     {
       "components": [
         {
           "componentAttributes": {
-            "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勯偖绠�</span></p>"
+            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">璇锋鏌ユ偍鐨勯偖绠�</span></p>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "19245457-d13d-434e-9b0f-b0242a8ab8f4",
+          "id": "e9066c74-c45a-4512-a11b-755b5f5629bc",
           "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=\"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>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "402e03d5-588a-468f-9acf-adddef37b551",
-          "renderPriority": "NEUTRAL",
-          "renditionMap": {},
-          "type": "component"
-        },
-        {
-          "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",
+          "id": "87485c52-d378-475d-895e-caeb1bdd08ac",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "9985d44e-a0e1-4ea8-8392-69ecd11b717a",
+      "id": "ee29b16c-6260-473d-b315-a8b3e70d218f",
       "regionName": "content",
       "type": "region"
     },
@@ -51,12 +41,12 @@
             "title": "Check Password"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "d9766929-20bd-4383-bb47-d081a8982254",
+          "id": "cee2921c-7188-455b-b121-8633b148aac3",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "cfc14d85-84ee-4928-9a0e-a5b204930def",
+      "id": "e3ffa5e5-e5e0-49ac-b32f-953d1c6c7084",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json b/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
index 7b88f3c..af293b8 100644
--- a/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
+++ b/force-app/main/default/experiences/Consumable1/views/consumableDetailFix.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "edf32642-ece4-4435-94c9-82eb6b8f67a9",
+  "id": "ae18f3f9-5d00-46e8-96d1-86c0ec9719cc",
   "label": "ConsumableDetail_fix",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "2669d21c-e835-4689-a403-f77a18c9d715",
+              "UUID": "c5216591-0210-4c09-a832-9b7a8c57c03f",
               "columns": [
                 {
-                  "UUID": "e9dbbc4b-efc6-4508-9533-9280eec53143",
+                  "UUID": "192f0791-c2cd-4d37-953e-3b145ecdf320",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,7 +27,7 @@
             "sectionHeight": 115
           },
           "componentName": "forceCommunity:section",
-          "id": "2669d21c-e835-4689-a403-f77a18c9d715",
+          "id": "c5216591-0210-4c09-a832-9b7a8c57c03f",
           "regions": [
             {
               "components": [
@@ -36,13 +36,13 @@
                     "recordId": "{!recordId}"
                   },
                   "componentName": "forceCommunity:recordHeadline",
-                  "id": "73412524-f13e-4a0f-b81b-94cc87c0440c",
+                  "id": "6b924e95-ca67-4fab-87f2-d4d2286e13a7",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "e9dbbc4b-efc6-4508-9533-9280eec53143",
+              "id": "192f0791-c2cd-4d37-953e-3b145ecdf320",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -59,18 +59,18 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
+              "UUID": "6ff941f3-4e49-4606-b575-e6c1111b189a",
               "columns": [
                 {
-                  "UUID": "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
+                  "UUID": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "8",
                   "seedComponents": []
                 },
                 {
-                  "UUID": "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
-                  "columnKey": "a2a96",
+                  "UUID": "488034df-aeaa-4f35-a60f-f87855a1b359",
+                  "columnKey": "9f7d9",
                   "columnName": "Column 2",
                   "columnWidth": "4",
                   "seedComponents": []
@@ -80,7 +80,7 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "ca5f02db-0367-4e6f-8d40-9a4c8ea72d7b",
+          "id": "6ff941f3-4e49-4606-b575-e6c1111b189a",
           "regions": [
             {
               "components": [
@@ -89,13 +89,13 @@
                     "recordId": "{!recordId}"
                   },
                   "componentName": "forceCommunity:recordDetail",
-                  "id": "8804e9ec-b2a3-41f4-b8be-6a0443bea1e7",
+                  "id": "e13b2d88-d293-4f5f-92c3-114708265abb",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "4bd8dfe7-7509-4b99-ad0a-0b6c9eb193bf",
+              "id": "b39f19c2-e5bf-4dd1-8c92-f0e8ca28f43f",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -109,15 +109,15 @@
                     "width": "MEDIUM"
                   },
                   "componentName": "forceCommunity:relatedRecords",
-                  "id": "eda1b3f7-603a-4290-a4b4-0bdd5bfea4ec",
+                  "id": "b85bf391-627a-4855-b35c-06ad17df77e7",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "3aa51a7e-96bb-475b-96b3-7cd6fe4a14af",
+              "id": "488034df-aeaa-4f35-a60f-f87855a1b359",
               "regionLabel": "Column 2",
-              "regionName": "a2a96",
+              "regionName": "9f7d9",
               "renditionMap": {},
               "type": "region"
             }
@@ -127,7 +127,7 @@
           "type": "component"
         }
       ],
-      "id": "e0d975de-d0c9-499e-9c79-15b3de367011",
+      "id": "0dbd3738-5308-4691-90ef-2ca7435f6c0d",
       "regionName": "content",
       "type": "region"
     },
@@ -140,12 +140,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "d1ccd1e3-344a-42e4-b66e-81c4ac575f87",
+          "id": "d53c3fbf-b313-4cc9-ac51-c415bdb3a8c7",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "926e94d2-26ee-49b8-9085-abb739f639ee",
+      "id": "7edf4894-febc-4588-b8ec-a1600a9a04d3",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/contactSupport.json b/force-app/main/default/experiences/Consumable1/views/contactSupport.json
index 498b52e..04bc286 100644
--- a/force-app/main/default/experiences/Consumable1/views/contactSupport.json
+++ b/force-app/main/default/experiences/Consumable1/views/contactSupport.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsTwoCol66Layout",
   "dataProviders": [],
-  "id": "e8279a27-ff8f-42fc-9bd1-53b3f59350ab",
+  "id": "112e477b-4a73-4f9d-9e34-ebb2efff5acd",
   "label": "Contact Support",
   "regions": [
     {
-      "id": "4ad609eb-6693-4846-a08e-e4fa961e9991",
+      "id": "3fac5382-70c4-4d82-9a05-196fbcfce6ce",
       "regionName": "header",
       "type": "region"
     },
@@ -38,13 +38,13 @@
             "requestSummaryText": "Case summary"
           },
           "componentName": "forceCommunity:contactSupportForm",
-          "id": "31e9512a-f8de-4d46-8f19-5c2afaf7b18b",
+          "id": "6ccb7e63-0255-4dd9-995a-4d52b12e4311",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "d2619a80-c4a9-449f-8dd4-4305e7c1e81c",
+      "id": "ef1eb48b-62cf-4b6b-bb30-a9783f410efb",
       "regionName": "content",
       "type": "region"
     },
@@ -66,18 +66,18 @@
             "topicId": ""
           },
           "componentName": "forceCommunity:caseDeflection",
-          "id": "647280c4-1a9d-4551-a0fd-1323f11625af",
+          "id": "f2a0a519-1464-4325-a800-2ec01165be89",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "3c86f83b-c2fa-41ed-bef6-f6d97c96253c",
+      "id": "6dc7c8e1-bb5d-48b0-ba00-fa97b9cfeced",
       "regionName": "sidebar",
       "type": "region"
     },
     {
-      "id": "bacb957e-44f3-481a-aa70-7b45c0c9ba1e",
+      "id": "c2e93eba-7820-4af2-bd14-a67cca438b33",
       "regionName": "footer",
       "type": "region"
     },
@@ -90,12 +90,12 @@
             "title": "Contact Support"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "d0de04cd-88a3-4905-a36c-bbf4e97b7707",
+          "id": "dc9640dc-b460-4a6b-a845-7e753a94d360",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "0b6a520d-0f34-4411-a3c9-c360b06d30fa",
+      "id": "d377d055-e453-4ad9-a2ab-572a3e788983",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/createRecord.json b/force-app/main/default/experiences/Consumable1/views/createRecord.json
index b999d41..5f6746c 100644
--- a/force-app/main/default/experiences/Consumable1/views/createRecord.json
+++ b/force-app/main/default/experiences/Consumable1/views/createRecord.json
@@ -1,35 +1,22 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "0f63dfba-f74b-4011-a0d5-75fe665d7bfb",
+  "id": "d64df38f-9de1-4248-9c13-ef41d110ffd8",
   "label": "Create Record",
   "regions": [
     {
-      "id": "951aa7a1-efc5-4041-8929-3d980fe6f9b7",
+      "id": "0ef64b23-8a56-4d87-9984-219633feaf24",
       "regionName": "header",
       "type": "region"
     },
     {
-      "components": [
-        {
-          "componentAttributes": {
-            "actionApiName": "{!actionApiName}",
-            "isMicrobatch": false
-          },
-          "componentName": "forceCommunity:createRecordForm",
-          "id": "21c870a6-c4cb-476f-8dde-6906530b418e",
-          "renderPriority": "NEUTRAL",
-          "renditionMap": {},
-          "type": "component"
-        }
-      ],
-      "id": "7f501f3e-1f42-4cf8-925e-d0e654c13ff3",
+      "id": "33abd4a1-c8d6-4b2b-8df7-3ef0b829a56c",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "23111281-f438-4296-b47a-773feea9a17e",
+      "id": "63eee37e-e8ea-4cae-b2a7-81328a5fefab",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json b/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
index 5b2b002..65f4914 100644
--- a/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/dashboardDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "4544a0e2-5ddb-49d0-b154-3903b3e7fb68",
+  "id": "47937364-e71b-469a-b996-317032189c45",
   "label": "Dashboard Detail",
   "regions": [
     {
-      "id": "cf059051-9545-478c-a076-e7ff4543d95f",
+      "id": "646d2c85-c6e9-4db7-8a6f-3c118c0c5ee8",
       "regionName": "header",
       "type": "region"
     },
@@ -18,18 +18,18 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:dashboard",
-          "id": "a3426236-d100-4c2a-9655-6d6e3930b6df",
+          "id": "d0f9abce-c4ac-4e23-a574-19da9a5024c3",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "38ddc7db-4ed1-42e3-9ee6-ef8459588b7f",
+      "id": "e91e78ff-ac70-4d20-8301-fb1e76dedb9b",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "d8f6f3ba-bac7-47a6-aa9c-12121409f9f2",
+      "id": "b1e7a1e2-39aa-47b7-a37d-75824027907a",
       "regionName": "footer",
       "type": "region"
     },
@@ -42,12 +42,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "d12ac0ed-4451-4546-bb3f-07f3465b5d33",
+          "id": "6d83a6d3-edaf-4f22-ac0c-92d6b220fd30",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "f48d58f3-43e0-47a0-ab8b-61f57ce68b15",
+      "id": "558015ea-19cc-4c77-aba2-c53f3cc764d9",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/dashboardList.json b/force-app/main/default/experiences/Consumable1/views/dashboardList.json
index 428c949..2061c6b 100644
--- a/force-app/main/default/experiences/Consumable1/views/dashboardList.json
+++ b/force-app/main/default/experiences/Consumable1/views/dashboardList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "f10a3529-b77e-4ebc-9b99-281160c97c7f",
+  "id": "b59c266b-a1ad-47f9-bf26-a8295147505c",
   "label": "Dashboard List",
   "regions": [
     {
-      "id": "aace5538-56aa-4a21-bb35-9a40c211bcb0",
+      "id": "33cc3069-d9f2-464b-9053-91112d7480d4",
       "regionName": "header",
       "type": "region"
     },
@@ -15,18 +15,18 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:dashboardList",
-          "id": "1b31f86d-98da-4daf-b754-b394d38a581a",
+          "id": "760458df-b4cc-46a5-beac-b21fde008f88",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "45be9d35-4310-4df5-a2ce-56f3a70c91cb",
+      "id": "e38cff0d-f391-468b-a4cc-cf69b7eeabff",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "54a7dd8d-3042-44ce-834f-6a590085586d",
+      "id": "1045796b-cf40-4b2b-867e-ce02ce0a02dc",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/error.json b/force-app/main/default/experiences/Consumable1/views/error.json
index 57815bc..a98e867 100644
--- a/force-app/main/default/experiences/Consumable1/views/error.json
+++ b/force-app/main/default/experiences/Consumable1/views/error.json
@@ -1,32 +1,34 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "f02c5a75-f64e-4716-b209-f9f1ef46d49a",
+  "id": "48f1f5ec-b27a-4874-83fa-15e857b27699",
   "label": "Error",
   "regions": [
     {
-      "id": "04daa4a0-4d2d-46f9-bc70-f4ef28375c2d",
+      "id": "01af81bd-4eb5-4add-bd2a-5af47ca64f31",
       "regionName": "header",
       "type": "region"
     },
     {
       "components": [
         {
-          "componentAttributes": {},
-          "componentName": "c:lexCancelRemoveBox",
-          "id": "4edc7e53-4db8-47f7-a7e7-3af22d1b5191",
+          "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鈥檛 get to it, please ask the community administrator for help.</p>  </div>"
+          },
+          "componentName": "forceCommunity:htmlBlock",
+          "id": "24077521-3224-4633-840d-25c26a493f1d",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "a801a07b-dbc3-4650-9e01-934eabb7a789",
+      "id": "748f88b6-3627-4078-9abe-c618059a8613",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "e59b2192-4edb-4144-8f08-755e9e111518",
+      "id": "25077bd2-d3e5-440d-aa48-322dd23c2177",
       "regionName": "footer",
       "type": "region"
     },
@@ -39,12 +41,12 @@
             "title": "Error"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "f322e8e2-b32f-471c-a992-fdb40e009539",
+          "id": "5ba201e2-05bb-479d-b173-7efc99ae56c5",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "ac65174b-2219-479b-8ca4-6f679e28f7d4",
+      "id": "d8d0e969-4c0d-4f6f-aa06-be29638f5fa3",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/feedDetail.json b/force-app/main/default/experiences/Consumable1/views/feedDetail.json
index c56de96..839f04a 100644
--- a/force-app/main/default/experiences/Consumable1/views/feedDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/feedDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "eb28719b-06b5-4397-bf8d-667ec408ca46",
+  "id": "fefd7f80-945b-489b-8a4e-615884934641",
   "label": "Feed Detail",
   "regions": [
     {
-      "id": "6a9400e1-ad64-47ea-829f-6ce793c4ad02",
+      "id": "b3c377f9-ebc1-4ae5-8c28-f78f8bc9cdca",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "id": "{!recordId}"
           },
           "componentName": "forceCommunity:feedItemDetail",
-          "id": "59f29841-0c8d-40d7-83ba-c590f2214d4e",
+          "id": "41ed8fa1-1f73-4385-a28f-faa0ecd561e3",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "d66f961b-0bba-4472-9a69-13676f89b28e",
+      "id": "2bf7238a-fe13-4617-8f6b-cd74a8ee0780",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "04b45900-4d8a-4452-86c8-ca0c8b030bd5",
+      "id": "ba025857-7cad-4cea-9780-b8b86e89a9bf",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/fileDetail.json b/force-app/main/default/experiences/Consumable1/views/fileDetail.json
index e2c5062..29cc081 100644
--- a/force-app/main/default/experiences/Consumable1/views/fileDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/fileDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "2322115a-ac65-4862-9104-912d42fca69a",
+  "id": "cbccf1c1-b50f-4c66-9dbd-9be4accededd",
   "label": "File Detail",
   "regions": [
     {
-      "id": "d076ed42-1664-4b15-96ee-70c0eb0707ef",
+      "id": "f14be551-933a-4a05-944a-68e824e2f1f5",
       "regionName": "header",
       "type": "region"
     },
@@ -15,18 +15,18 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:fileDetailPage",
-          "id": "1782e7b6-53ac-4493-bffe-00fe18a9a42f",
+          "id": "122674c6-a847-4043-ae63-b059b3963a61",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "89a0e125-284e-4240-bf7a-52e32979cf3e",
+      "id": "c1598287-4d0a-4195-8935-e6bd18495b19",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "efd311f4-16ab-4cf8-9d82-bdeda1722dfb",
+      "id": "2c5abc89-16a5-4df8-a4c8-e3bc22a258dd",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/fileList.json b/force-app/main/default/experiences/Consumable1/views/fileList.json
index 12791b5..433007d 100644
--- a/force-app/main/default/experiences/Consumable1/views/fileList.json
+++ b/force-app/main/default/experiences/Consumable1/views/fileList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "193807a6-e99f-4075-9811-62dda5b13d43",
+  "id": "eace253f-203f-4414-a7a4-a2d9c47deb3d",
   "label": "File List",
   "regions": [
     {
-      "id": "af6a54e4-65cf-4412-831e-3d55625076ae",
+      "id": "86a4e739-1949-4199-9687-9d9e5a0e8b7b",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "pageSize": 25
           },
           "componentName": "forceCommunity:filesList",
-          "id": "11e918ad-fc08-4907-8d8c-5aaddd9a92e8",
+          "id": "8d8b9ad4-91c1-44c2-b566-b5ddec17c62d",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "4a7c43a0-6939-4ea5-b8a4-b69789506c76",
+      "id": "0ceef01d-d0aa-44fa-87e6-a36a92fe73ce",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "f720b89f-67f7-40d3-9eb0-f56d0fc7d379",
+      "id": "91694ac3-024d-4480-b8f2-b82180070fd1",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/flow.json b/force-app/main/default/experiences/Consumable1/views/flow.json
index d16697a..17bf5ff 100644
--- a/force-app/main/default/experiences/Consumable1/views/flow.json
+++ b/force-app/main/default/experiences/Consumable1/views/flow.json
@@ -1,35 +1,32 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "4aa9507c-1470-43b3-8000-390325f6bd7d",
+  "id": "17c9c45c-4c81-49d0-985e-d6281d899320",
   "label": "Flow",
   "regions": [
     {
-      "id": "4d7e2fae-45a7-4b69-9005-de342f942f38",
+      "id": "bf7ef746-6791-4aa9-a096-0038d427dee1",
       "regionName": "header",
       "type": "region"
     },
     {
       "components": [
         {
-          "componentAttributes": {
-            "flowArguments": "",
-            "flowName": "{!flowName}"
-          },
-          "componentName": "forceCommunity:flowCommunity",
-          "id": "45d0d38f-558e-4351-99c6-e14557f11731",
+          "componentAttributes": {},
+          "componentName": "c:RetrospectiveWeeklyReport",
+          "id": "fadeafaa-5cf8-497e-8561-cb2c463012c0",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "96c3caa0-6524-4903-8de2-aad59a4c6e03",
+      "id": "1e71465d-b903-4a32-b4bc-21003f85b882",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "6ac44c78-d53b-4560-bbff-73d0b87baa93",
+      "id": "496f34a6-ba4c-4796-8afd-00fed3cb7882",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/forgotPassword.json b/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
index 6006a0b..b6503fe 100644
--- a/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
+++ b/force-app/main/default/experiences/Consumable1/views/forgotPassword.json
@@ -1,28 +1,28 @@
 {
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "eac49d21-4e4d-4e8e-997e-42dfce021ff4",
+  "id": "367df6e8-480c-4b75-9718-1ebcfc8d57c1",
   "label": "Forgot Password",
   "regions": [
     {
       "components": [
         {
           "componentAttributes": {
-            "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 22px; color: rgb(255, 255, 255);\">閲嶇疆瀵嗙爜</span></p>"
+            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255); font-size: 22px;\">閲嶇疆瀵嗙爜</span></p>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "2b141c57-9556-45f3-9e15-90ac1419a02f",
+          "id": "78431e15-96d3-47e5-90a4-060c0580d9f1",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         },
         {
           "componentAttributes": {
-            "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 16px; color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
+            "richTextValue": "<p style=\"text-align: center;\"><span style=\"color: rgb(255, 255, 255);\">璇疯緭鍏ユ偍鐨勭敤鎴峰悕</span></p>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "203ce0df-48b9-4b50-85af-ba98cff2599e",
+          "id": "391e2f6e-25ba-4d60-8429-fa83c865f188",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -34,23 +34,23 @@
             "usernameLabel": "鐢ㄦ埛鍚�"
           },
           "componentName": "salesforceIdentity:forgotPassword2",
-          "id": "9afeb3da-d8a0-41df-8b00-4ca493eda07b",
+          "id": "ef09e7c2-8849-4559-a007-267530809bdb",
           "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;\"><a href=\"./\" rel=\"noopener noreferrer\" target=\"_self\" style=\"color: rgb(255, 255, 255); font-size: 16px;\">鍙栨秷</a></p>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "ac7cc923-2a73-45a7-a124-b94477b33e34",
+          "id": "79792fe3-b6d6-41d1-aeb6-912471e1b013",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e9992f81-cb4b-4485-a34c-4a7db847cad9",
+      "id": "53a5629c-91b2-4f5b-91ef-76d991ec923a",
       "regionName": "content",
       "type": "region"
     },
@@ -63,12 +63,12 @@
             "title": "Forgot Password"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "973d922a-76bf-4c04-91b9-f10851baf1c3",
+          "id": "a506de7f-74b7-47e4-84d0-8579f8925ebb",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "47d9db7d-c4bd-478e-9a55-3d796c30b606",
+      "id": "842b093a-48db-4342-b4f9-d7953055c798",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/groupDetail.json b/force-app/main/default/experiences/Consumable1/views/groupDetail.json
index c8464b2..4f22c23 100644
--- a/force-app/main/default/experiences/Consumable1/views/groupDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/groupDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "7b772cb6-1146-4bb7-8567-853ebfe7bb2c",
+  "id": "1f22553d-fa1f-41e2-afa6-bf930865e2fa",
   "label": "Group Detail",
   "regions": [
     {
-      "id": "060923b0-77f7-42e7-b254-d75fc65bc96b",
+      "id": "330444b1-bbd6-493f-8e30-9c7d914f351e",
       "regionName": "header",
       "type": "region"
     },
@@ -22,18 +22,18 @@
             "relatedTabLabel": "Related"
           },
           "componentName": "forceCommunity:groupRecordHomeTabs",
-          "id": "c30496d8-d218-46e9-895f-fa9ef9e054e2",
+          "id": "04f2c0f0-ba9f-4aba-87c9-fc060e93e50c",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "9c183d6e-53c2-4b3a-a3db-5c3657024407",
+      "id": "fd783466-f338-443f-b168-79fdb31885b4",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "ac91d64b-2f65-4f8a-ab26-d6ec7656960d",
+      "id": "8dd0118d-278b-4e47-a977-f67e4e0fe115",
       "regionName": "footer",
       "type": "region"
     },
@@ -46,12 +46,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "fdab4c93-fa91-4bc1-9c74-e99e5a54315c",
+          "id": "ae88a178-5983-43d9-87ba-7613de4d54ec",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "162e1f76-59b0-40b1-98fd-e38e325cce5e",
+      "id": "cabd2974-2029-44be-b37f-b7fd95ebb879",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/groupList.json b/force-app/main/default/experiences/Consumable1/views/groupList.json
index 6667ad4..dae0738 100644
--- a/force-app/main/default/experiences/Consumable1/views/groupList.json
+++ b/force-app/main/default/experiences/Consumable1/views/groupList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "949c0ee3-6484-4ed7-a44f-aa417cec1835",
+  "id": "87a9b140-31e2-4c28-9fa4-82135022e59d",
   "label": "Group List",
   "regions": [
     {
-      "id": "9a5c8668-57b0-4ed9-b08f-7db30276d775",
+      "id": "89649989-257d-4c62-ac2d-cfb067a7dab9",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Group List</b>             </h1>             "
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "cbff4378-dadd-486b-b610-0c737fcc355a",
+          "id": "0c8f9c88-77cb-432b-aad6-bfb98bb54388",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -25,18 +25,18 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:groupObjectHome",
-          "id": "c5348791-4e5f-4115-bc57-297af7a3560b",
+          "id": "0856cb72-ce49-46cb-b936-e908c1096841",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e9583cc1-1d2d-49a3-bab1-4e826e4cce53",
+      "id": "b21ee870-d315-48be-93c1-d4d79e5f1b53",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "cc1ad297-48af-47cf-b66f-373b81e275f1",
+      "id": "08886110-b15a-4ff9-9de1-3a1f81708cb5",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/home.json b/force-app/main/default/experiences/Consumable1/views/home.json
index 8178a9f..0b033aa 100644
--- a/force-app/main/default/experiences/Consumable1/views/home.json
+++ b/force-app/main/default/experiences/Consumable1/views/home.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsTwoCol84Layout",
   "dataProviders": [],
-  "id": "d47db83f-301d-4624-a8db-4474a6a30bd9",
+  "id": "060f3385-936a-41da-8086-58f66522aeea",
   "label": "Home",
   "regions": [
     {
@@ -12,13 +12,13 @@
             "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": "19cbd1e7-a45d-47b4-bdad-385c5562b1b8",
+          "id": "757bc2a8-8fc2-4080-8a6c-79cd5c948d16",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "10ac200f-b20b-4ad8-8f0d-040c3a4ba494",
+      "id": "8f13358a-c852-482b-ac84-0aa6ead20c98",
       "regionName": "header",
       "type": "region"
     },
@@ -29,7 +29,7 @@
             "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": "f55d8364-8d18-4c91-b733-ef2e9fbeead2",
+          "id": "c0931ab3-1d66-4aba-8bdf-76d43261d6da",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -37,11 +37,11 @@
         {
           "componentAttributes": {
             "tabsetConfig": {
-              "UUID": "77ed0454-75bd-4886-bc4b-6e90cc656e73",
+              "UUID": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
               "activeTab": "tab1",
               "tabs": [
                 {
-                  "UUID": "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
+                  "UUID": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
                   "allowGuestUser": true,
                   "locked": false,
                   "seedComponents": [
@@ -54,7 +54,7 @@
                   "tabName": "Business Summary"
                 },
                 {
-                  "UUID": "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
+                  "UUID": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
                   "allowGuestUser": true,
                   "locked": false,
                   "seedComponents": [
@@ -73,22 +73,22 @@
             }
           },
           "componentName": "forceCommunity:tabset",
-          "id": "77ed0454-75bd-4886-bc4b-6e90cc656e73",
+          "id": "be388d96-ba83-4ae5-bc04-71413fcb1c48",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {
                     "height": "485",
-                    "recordId": "01Z10000001cpWqEAI"
+                    "recordId": "01Z100000013zqGEAQ"
                   },
                   "componentName": "forceCommunity:dashboard",
-                  "id": "8a7ab317-f6e5-4781-8734-86cf083bef93",
+                  "id": "d4f4c8c7-e1cc-43e0-bdf7-a91c8f3f7d77",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "c6a30d6c-fc5b-4287-ae6c-eeb943d82d95",
+              "id": "d174ad4b-8cba-41fa-ba18-dff027c9c474",
               "regionLabel": "Business Summary",
               "regionName": "tab1",
               "renditionMap": {},
@@ -108,12 +108,12 @@
                     "type": "Home"
                   },
                   "componentName": "forceCommunity:forceCommunityFeed",
-                  "id": "0965c626-6474-43f8-8064-7f2a06272adc",
+                  "id": "89169035-2123-484c-a320-aa12d136b737",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "f0c897ae-e9b5-4eff-b7e8-b3b461359b4c",
+              "id": "26e87aa3-7dba-4973-a3c4-041aec610bb5",
               "regionLabel": "News & Updates",
               "regionName": "tab2",
               "renditionMap": {},
@@ -125,7 +125,7 @@
           "type": "component"
         }
       ],
-      "id": "8642333f-fe8d-4b21-8526-34a61169f1dc",
+      "id": "d0a93f84-0c8e-4330-91fa-ae3a171ac07c",
       "regionName": "content",
       "type": "region"
     },
@@ -154,7 +154,7 @@
             "label": "Quick Create"
           },
           "componentName": "forceCommunity:createRecordButton",
-          "id": "bd29d6d1-7296-4e0f-b89b-6670b88e8415",
+          "id": "a794a745-990f-481b-9cf2-5cdd5eec12e6",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -168,7 +168,7 @@
             "title": "Lead Inbox"
           },
           "componentName": "forceCommunity:leadInbox",
-          "id": "330e6363-913a-4cc3-a7bc-042c71d21073",
+          "id": "cc30815c-4721-411d-94ad-af5c53d4af0d",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -191,7 +191,7 @@
             "showSearchBar": true
           },
           "componentName": "forceCommunity:objectHome",
-          "id": "b1ba9dd2-888a-4d31-9d43-863a18ae7a92",
+          "id": "ec72b889-1cee-4d5a-a9a6-87f43359b3b5",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -214,18 +214,18 @@
             "showSearchBar": true
           },
           "componentName": "forceCommunity:objectHome",
-          "id": "94bf80cd-edef-47dd-b710-bbcbeab44d75",
+          "id": "7653914f-b749-49f2-a483-6b268b59369f",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "78ad9488-9cad-453f-9ee1-053f31dd7d83",
+      "id": "e39b35aa-8bd4-4a48-b7e7-dc1e2505aaeb",
       "regionName": "sidebar",
       "type": "region"
     },
     {
-      "id": "5640820f-3232-4372-8fbb-2ab9bf9b9979",
+      "id": "864fe56c-bda6-4c9a-8869-8025ac329f4a",
       "regionName": "footer",
       "type": "region"
     },
@@ -238,12 +238,12 @@
             "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "0dfbf9f2-6bd0-4150-b2a2-29107b376fef",
+          "id": "b403e241-261c-4abc-a01c-4960c5b43ea3",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "9b4f717e-09a8-44bd-8e53-d8e807d0d800",
+      "id": "0110900c-6b38-40f9-a6fb-16fe86ceaabe",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
index 5321834..36f6629 100644
--- a/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
+++ b/force-app/main/default/experiences/Consumable1/views/homeFlexible.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "0b3166bc-2eec-43fa-8adf-532f629e9392",
+  "id": "d22f1a01-e0a0-44df-b5e2-808abb2391f5",
   "label": "Home_Flexible",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "8ae08b67-88c4-492b-98a8-924b20bb1544",
+              "UUID": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
               "columns": [
                 {
-                  "UUID": "10b668a2-336e-4764-b5b8-303f9939b7e3",
+                  "UUID": "b6706b54-3422-40d2-a719-0162d2a20aa5",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,16 +27,16 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "8ae08b67-88c4-492b-98a8-924b20bb1544",
+          "id": "41cc4b3a-7166-49bc-b065-8d15e99a7937",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {
-                    "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; font-family: sans-serif; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
+                    "richTextValue": "<p style=\"text-align: center;\"><span style=\"font-size: 48px; color: rgb(0, 71, 178);\">娆㈣繋鐧诲綍娑堣�楀搧杩芥函绯荤粺</span></p>"
                   },
                   "componentName": "forceCommunity:richTextInline",
-                  "id": "d14e9b8c-a3d9-40cb-8ad0-5161fe285a74",
+                  "id": "a970dbc1-3bd6-4786-9358-4d23aefe0476",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
@@ -44,7 +44,7 @@
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexLicenceReminder",
-                  "id": "e0232bc3-f6c4-4671-b26e-160b3d73a0a4",
+                  "id": "5f083ad9-6878-4cea-9c61-ab8a1c17593b",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
@@ -52,16 +52,16 @@
                 {
                   "componentAttributes": {
                     "height": "800",
-                    "recordId": "01Z6D000000EvOnUAK"
+                    "recordId": "01Z0l000000cnvqEAA"
                   },
                   "componentName": "forceCommunity:dashboard",
-                  "id": "e0024c07-3f6e-4822-9079-47ad41f4c3a8",
+                  "id": "345cf353-5531-484c-a94c-a120ecb854e5",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "10b668a2-336e-4764-b5b8-303f9939b7e3",
+              "id": "b6706b54-3422-40d2-a719-0162d2a20aa5",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -73,7 +73,7 @@
           "type": "component"
         }
       ],
-      "id": "1bac6fb4-0163-4896-8cd7-85b1f34df29f",
+      "id": "52b2abe8-346e-43db-b1ca-9254d387e8db",
       "regionName": "content",
       "type": "region"
     },
@@ -86,12 +86,12 @@
             "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "84e91754-c40d-4c64-a0e4-9bfae8320536",
+          "id": "2762cc02-0105-42d7-9e2e-08ed9a61c1ca",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "1c72742c-4f76-41b6-b8f2-7582c4245d05",
+      "id": "f04df81d-a2d5-4a8b-b937-e0c26399e6b2",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json b/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
index 078a92c..95648ca 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexAgencyInfo.json
@@ -1,9 +1,9 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "376ad65a-00b6-4198-aa04-19a6360969bc",
-  "label": "LexAgencyInfo",
+  "id": "ace4cc2b-a063-40be-94c6-c5bdabeb00e0",
+  "label": "lexAgencyInfo",
   "regions": [
     {
       "components": [
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
+              "UUID": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
               "columns": [
                 {
-                  "UUID": "2db9074f-7efa-4fc1-aef6-e94f4af43def",
+                  "UUID": "55056592-e02c-455e-b831-5f29ba25ae8b",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "d682942a-eb4a-46cc-b2ba-ee37ee9f7974",
+          "id": "5bae00dc-a841-45bc-af8f-3607536ecc2b",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexAgencyInfo",
-                  "id": "7762e10b-5ce6-4594-ac4e-648a78b6c9b2",
+                  "id": "6324c43f-2751-4e38-bf86-5a8d7d2df87d",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "2db9074f-7efa-4fc1-aef6-e94f4af43def",
+              "id": "55056592-e02c-455e-b831-5f29ba25ae8b",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "2f459a20-131e-4548-ab46-f9920697d1d7",
+      "id": "d0b67e99-b73f-4016-b342-44b5bd5004de",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "缁忛攢鍟嗕俊鎭� ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "2bacf8a5-3038-42e9-b2e0-3fee8cc95ea3",
+          "id": "dea6c82c-c9c5-41cc-960b-f7be4c8540ff",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "ce682a09-6e95-438e-9f22-d2fb11703354",
+      "id": "74d33395-e564-480d-9df2-5ca9d246845d",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
index 2a73665..bd314d1 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGoods.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "ec872079-c8a8-4c21-a0f2-84a95d4a93e5",
+  "id": "23ddff87-c778-4457-b0f7-07029a8a9ffd",
   "label": "LexArriveGoods",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "8aedf101-f8cf-43c7-bb42-da69a742aa74",
+              "UUID": "888145dd-72c9-4e26-a813-21c7346e0e39",
               "columns": [
                 {
-                  "UUID": "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
+                  "UUID": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "8aedf101-f8cf-43c7-bb42-da69a742aa74",
+          "id": "888145dd-72c9-4e26-a813-21c7346e0e39",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexArriveGoods",
-                  "id": "76c84633-d7e3-48e5-bea6-6b9bd9d53b84",
+                  "id": "3483355f-5db7-43e9-9501-a0868434e472",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "c73eacf8-7d9a-4ed8-a53a-833c19b39b47",
+              "id": "ea876df4-d4fa-4c11-8588-6076a3b87f79",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "54f6208b-cf85-4f6d-ab18-a932c63b5761",
+      "id": "a09b4773-f3c4-45c1-9d61-7a08c3e9b1b2",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍏ュ簱/杩斿搧 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "930825d9-d67b-4d95-8ebf-1b16db181e7c",
+          "id": "3363f170-a3c6-42c2-8615-cb89c4665710",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "7fbb47ad-d923-4a89-ae79-922b35d71571",
+      "id": "03bed34c-102a-4081-9ffa-5a71d359716b",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
index a874b32..89f83c4 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGoodsMain.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "f46aba62-01c3-4a20-93c6-f9b2362717e6",
+  "id": "e8d527e1-b86c-4449-bf5c-1ed05301648b",
   "label": "LexArriveGoodsMain",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
+              "UUID": "196f0047-adf4-4653-b3b1-502f0132ac63",
               "columns": [
                 {
-                  "UUID": "d25ba467-5924-40aa-bcdd-e1ac8643be08",
+                  "UUID": "8d475e45-01bc-4767-849a-8386d433285d",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "c31d034f-cc57-4be4-ad72-4431e59d3dc3",
+          "id": "196f0047-adf4-4653-b3b1-502f0132ac63",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexArriveGoodsMain",
-                  "id": "1d0f8205-b81b-446f-866b-237e69f338d9",
+                  "id": "af3b9e79-413e-4e41-94a5-9e22511c69da",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "d25ba467-5924-40aa-bcdd-e1ac8643be08",
+              "id": "8d475e45-01bc-4767-849a-8386d433285d",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "7efb4626-0f15-4ee3-9418-cb6419fb0bcd",
+      "id": "6d407bee-c7b6-4862-928b-6ace9e3b1e07",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍏ュ簱/杩斿搧 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "71e9fe84-4f41-453b-a6b5-35ed5cdbfadc",
+          "id": "505a452b-9d0e-4607-9c6e-5a1de7c8d722",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "da8c93ee-69b0-47b5-83bb-61150b2aa560",
+      "id": "260b9853-f9b6-4b32-be09-325a251d890a",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
index 87a28dc..ed62c68 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexArriveGsDetails.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "91695311-fdcc-4e42-87ca-c97cfd56a2b0",
+  "id": "ccdc4c02-3ec5-4c8c-bb43-af7c391c0876",
   "label": "LexArriveGsDetails",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+              "UUID": "8743236b-840d-4987-8168-2449baaa559c",
               "columns": [
                 {
-                  "UUID": "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+                  "UUID": "861293f5-2153-4223-b8a6-ae59bc2843f0",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "08f6ef6f-e105-4de7-9aaa-1f114864bdc7",
+          "id": "8743236b-840d-4987-8168-2449baaa559c",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexArriveGsDetails",
-                  "id": "18ff9dd3-7039-4ffb-8d15-faa606335456",
+                  "id": "967bc21a-73f4-4af3-90e3-8961f1903457",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "08d81f90-ef1a-4686-a0e9-cc3913ed0973",
+              "id": "861293f5-2153-4223-b8a6-ae59bc2843f0",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "2ed898cb-77b1-437e-8eca-16a3a98927e0",
+      "id": "fed879a2-37ad-4d00-ac2b-6a7d45f219e0",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍒拌揣 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "961b31ea-175a-4e22-8256-be31f553c70c",
+          "id": "1bde528a-2d7c-4e45-a5ae-cf6b4e730c1b",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "034871d6-1f2c-43f2-81d3-0e46a864ad33",
+      "id": "123c9d6e-48b4-4a79-9c2c-cf348022512a",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
index 5e6c009..7705705 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexCancelRemoveBox.json
@@ -1,9 +1,9 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "5fd84b73-2065-46d3-b121-2f8a77b76a3a",
-  "label": "LexCancelRemoveBox",
+  "id": "b7569df4-3d59-4e39-9916-b444d62da530",
+  "label": "lexCancelRemoveBox",
   "regions": [
     {
       "components": [
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "e015f78b-3948-452d-9df3-fb57eaf1144a",
+              "UUID": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
               "columns": [
                 {
-                  "UUID": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+                  "UUID": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "e015f78b-3948-452d-9df3-fb57eaf1144a",
+          "id": "67efdf26-a8b9-4ccc-a78a-7c4237367233",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexCancelRemoveBox",
-                  "id": "de961c6a-bc79-4956-aaf1-9b9a9329cd7b",
+                  "id": "18cfcc0d-2e74-4439-b0e4-374d6173769c",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "dda851ea-a46f-4c8b-8cf7-52db66e6864a",
+              "id": "9e34f640-834f-4c40-b4e2-86cbb2f8eb01",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "63a06f7d-bca6-430e-b51f-04c307c741f9",
+      "id": "144d67b6-b37a-48bb-8d3f-c5a642a2eb15",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍙栨秷鎷嗙洅 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "鍙栨秷鎷嗙洅~娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "495b4819-9802-4a8b-af22-b33a65ed6dde",
+          "id": "9a46d997-620e-4c7b-b471-14f9f099ed5f",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "fc3783d1-cb91-473f-87a0-62c480010a60",
+      "id": "b0e97eeb-db76-4ec4-9d1a-4020dcecb04e",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json b/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
index 2d93d3c..0c2cdbf 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConInvoiceView.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "4bbfb3d2-f8f2-4b23-b5cf-711d448a2b51",
+  "id": "def29cb0-a769-4ec4-8e98-f1d9e4433e76",
   "label": "LexConInvoiceView",
   "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": "af1fd8e8-0495-4aa4-a724-b200588463eb",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "73c51c99-c8ed-45c9-ab83-89ff66ca5239",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexConInvoiceView",
+          "id": "188f5457-5ba8-4c48-b154-fac11122d6fa",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "87b7dcd5-40d6-4441-9443-26d7647ded5c",
+      "id": "97ef1ee1-bf76-4af8-8fb0-67e0f93c9b20",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "01bd66d3-16ee-49b0-8957-6c65fc9e6d35",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "d892a453-fd5d-41e9-a86a-2a5939d74274",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍙戠エ ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "0dacce9e-e531-41b1-ad79-6a6efefc9dd1",
+          "id": "c117564e-23b4-4cd3-8d91-0f58a569c5b5",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "d415f744-fe96-4c81-90b0-73d1b66dafbb",
+      "id": "0499e9da-7082-412c-8a76-3a002f26f75f",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumable.json b/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
index d481027..baea46d 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumable.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "756785e1-4fb5-4ab3-b38a-58ea679a4361",
+  "id": "a3a6bd48-fa28-4210-b2f1-396f0169df2f",
   "label": "LexConsumable",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "57a191f6-fa19-4876-98e5-da8c72cb9258",
+              "UUID": "105e0268-90b6-4f6e-b018-41d4f9d70489",
               "columns": [
                 {
-                  "UUID": "6972e5ef-d04e-4c93-a2e6-07c797f78748",
+                  "UUID": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "57a191f6-fa19-4876-98e5-da8c72cb9258",
+          "id": "105e0268-90b6-4f6e-b018-41d4f9d70489",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexConsumable",
-                  "id": "f9cc8cb4-e94e-4c9e-aeac-91e4cc01875f",
+                  "id": "28c07586-c606-4466-93f4-7da43f4323cb",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "6972e5ef-d04e-4c93-a2e6-07c797f78748",
+              "id": "b4cd3a78-9020-48a5-947f-c39b796b7d5f",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "c7989e63-0c78-4086-8ad3-f9db0c99411a",
+      "id": "2094f211-8183-43a9-84d9-2b41cbc84990",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "璁㈠崟绠$悊 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "ee494697-6008-45fc-a3c8-0bc4b904974b",
+          "id": "19440ece-25e3-40df-ae9d-788b112b92f1",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "77747bb3-667b-42f0-8885-822eb331d6c9",
+      "id": "d3987b2a-05ec-4b44-a249-70a07a38d553",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
index a0d58ec..7e80884 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccount.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "65a5c9a4-0cc9-4b00-872b-b90bc1e47411",
+  "id": "f724180a-789f-4a5f-909f-a3b6926cff21",
   "label": "LexConsumableAccount",
   "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": "5ad65eac-4ab2-4e31-823f-241cd8a31b77",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "600f91f5-1068-4b1f-8a86-d0a193bce882",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexConsumableAccount",
+          "id": "918c23ca-5bf3-4ed0-80cf-70c22fdc15e5",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "da25695d-f912-48f0-a829-ff77681dea16",
+      "id": "53e16625-5ad6-4555-a03e-5ddfc7ed6200",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "08d8f81e-8b77-4c51-bc72-53efd131a367",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "684378e9-c38e-49ee-acc0-ea99f8730e7d",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "瀹㈡埛 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "34026022-6682-46cb-920f-4c24fbf656f8",
+          "id": "8922f5cd-dab7-49b9-98d6-dc3193827188",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "149173b3-ab4a-47d1-824b-c73e4cee068d",
+      "id": "0890434c-63ef-4621-b17e-8b995d014686",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
index 1eb0454..cfda22f 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableAccountInfoPrint.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "5d615179-dd62-4481-a874-de16a69d7374",
+  "id": "469dc013-dd9c-46d5-a4e8-57e7b4718b74",
   "label": "LexConsumableAccountInfoPrint",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "e9f987a3-92bd-470f-9afb-7804ecfcf578",
+              "UUID": "74ce3d06-cf05-449f-882f-88400116354b",
               "columns": [
                 {
-                  "UUID": "81d173bc-f9c3-4758-bc9e-570e99d92545",
+                  "UUID": "1803a98f-aa73-4a73-b8ec-518365d169ec",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "e9f987a3-92bd-470f-9afb-7804ecfcf578",
+          "id": "74ce3d06-cf05-449f-882f-88400116354b",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexConsumableAccountInfoPrint",
-                  "id": "03fc88cd-8285-4d6e-878b-5c75456032a2",
+                  "id": "4b082cd8-767e-43f5-94b6-cb5a3113c88a",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "81d173bc-f9c3-4758-bc9e-570e99d92545",
+              "id": "1803a98f-aa73-4a73-b8ec-518365d169ec",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "4ff49dcd-f175-4fb8-a368-30195f218e22",
+      "id": "66e4d1fa-43ae-4e10-8387-2fc761caf3d9",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "瀹㈡埛璇︾粏淇℃伅 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "LexConsumableAccountInfoPrint"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "d08e3a38-3069-4275-b3f5-6db7c28ced59",
+          "id": "41c17f3c-ec08-40cd-b41f-2e14e13f3277",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "6b25d2b2-bb26-48ff-9e0f-226821b3d62a",
+      "id": "fc6c01a8-09c5-4bd9-80eb-e36d3a65bb84",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json b/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
index 6ec201a..25c9d5a 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexConsumableOrderManage.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "0c6f8778-bba4-4726-97f6-b639cce7c99e",
+  "id": "adc3f3b5-03a9-4f8d-9284-7ff06dc338af",
   "label": "LexConsumableOrderManage",
   "regions": [
     {
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "c816a792-e9df-4280-a595-4f7a2de81a72",
+              "UUID": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
               "columns": [
                 {
-                  "UUID": "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
+                  "UUID": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "c816a792-e9df-4280-a595-4f7a2de81a72",
+          "id": "e755f4ef-9468-4884-b2d6-db7da95af5f6",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexConsumableOrderManage",
-                  "id": "480e4dee-4c0b-43d9-b81a-ba3ecd96f4e3",
+                  "id": "bcc9fb43-5bc7-4e22-b4db-4590542b0d63",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "0dc2ef0d-dfb8-4347-814b-251e3e16b10b",
+              "id": "c3e44009-7b50-45e6-b4e1-81dc6b85c17c",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "5425b128-bc13-4529-9741-c37eca368806",
+      "id": "61d4e85c-8cf2-4c5a-9a25-5f7dd8797e86",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "璁㈠崟绠$悊 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "01bf62a2-fff9-4f38-8cea-6c4a8df40eda",
+          "id": "ecb86434-590f-47cf-a6b7-b4a2e03f8a45",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "44d87bc4-7c1d-43ce-acc5-e20a018fc57d",
+      "id": "ea264f2a-7bd5-4f4a-97e8-fbddc045e948",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexInventory.json b/force-app/main/default/experiences/Consumable1/views/lexInventory.json
index c268e94..72aebf5 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexInventory.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexInventory.json
@@ -1,9 +1,9 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "5a24538d-0a99-40a3-a6a1-4496d0333a05",
-  "label": "LexInventory",
+  "id": "86cd7e17-9d77-47e1-906e-f87e8a36b5e0",
+  "label": "lexInventory",
   "regions": [
     {
       "components": [
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
+              "UUID": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
               "columns": [
                 {
-                  "UUID": "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
+                  "UUID": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "01395e1f-fbd3-4be4-9cf0-24df23b8b820",
+          "id": "d5972ccb-1ae1-42b2-bc91-1de65e0b8821",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexInventory",
-                  "id": "567f3188-aa85-40b7-b2fa-9caf501e4b44",
+                  "id": "f87bb2fd-5cac-490f-ad2b-c0c96882413c",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "c27de1cb-1805-4399-a99e-cbd7ff3ecd10",
+              "id": "fed2ff4a-a0a3-4358-ab0a-593e1ce77c14",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "45b8b9b5-bc3e-45f2-b8fb-a5c5b77924b6",
+      "id": "6f5860dd-27a5-44e6-8c5d-2d1011245d0d",
       "regionName": "content",
       "type": "region"
     },
@@ -62,20 +62,20 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "搴撳瓨鐩樼偣 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "鐩樼偣~娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "49bde76e-3088-4ae0-91e2-a0d7f68a7ca6",
+          "id": "7eb8f5a5-046e-44af-ba4f-c2805b21ef82",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "9e364a81-0317-445a-b308-8746e418eea6",
+      "id": "e30387d3-bc5d-45e1-9b2f-4c232581c35a",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
   ],
   "themeLayoutType": "Inner",
   "type": "view",
-  "viewType": "custom-lexinventory"
+  "viewType": "custom-lex-inventory"
 }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
index 9af97c4..514a9da 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexOutboundorderImport.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "e8224149-f1b9-4c44-8839-4d9737739c72",
+  "id": "f8b18a5a-4f37-46d3-946e-3c5307c081e6",
   "label": "LexOutboundorderImport",
   "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": "68e59073-ba5b-46d7-b8cd-552587a748a2",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "fbfcccd6-3c29-49b4-9a8b-ce0fadccab60",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexOutboundorderImport",
+          "id": "3a2da04d-2fb3-4dc7-aadc-40c9a0fb049e",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "f58362fc-b12d-41ba-bb99-fce2e6dba3fb",
+      "id": "280aa141-39f4-4ce6-8d22-f8c7132cc3bf",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "396f0d91-64bb-48dd-a3c8-428458d7b4d1",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "a2a09aa1-691c-44b4-b20a-6450cfe54c0b",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍑哄簱 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "e562ea3b-ac29-4271-9010-481f74d59780",
+          "id": "20aa6845-e7bd-4cec-814f-c8a4422f0dd6",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "ddc00cfb-8eb3-49b7-8d9a-44ac4fe1979b",
+      "id": "bb3f92d2-e08e-411c-9a7b-196a86da29d6",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json b/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
index 28ec6e3..7d8b505 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexOverdueStock.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "b0f2e8e7-62fd-42f3-bf3a-4bdf40b02bf4",
+  "id": "38d1e97a-0728-46a2-bee1-0c72ff1d6570",
   "label": "LexOverdueStock",
   "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": "1840dac3-e335-4628-b86b-d46d31831af5",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "4d9b4158-4336-47ad-8d7f-f2814c843237",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexOverdueStock",
+          "id": "4a56ea96-8dbf-466a-8bae-c63c91494b47",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "70a9cbdd-d242-44d6-9ade-f12aa57a6101",
+      "id": "a4b13816-1cc1-4942-aac1-cd4a877f682a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "1bef605d-91f2-4557-bd39-00d4b2427d95",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "e77e1337-6376-42be-847a-d4bd459d81ce",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "杩囨湡搴撳瓨閿�瀛� ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "杩囨湡搴撳瓨閿�瀛榽娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "65ba038f-9318-496d-9863-751d9b084cb0",
+          "id": "0f5328a8-e4da-44d4-aa05-943f2aeb1a05",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "87ad5976-ac2f-446f-aa1e-f9a0d34525fb",
+      "id": "6da76625-3ea0-4b35-b08e-99dd6de43df8",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json b/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
index 88a99f3..e431d91 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexRemoveBox.json
@@ -1,9 +1,9 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "b4a2ba1b-3827-4ec7-8f8e-5461c3893ce0",
-  "label": "LexRemoveBox",
+  "id": "8feef62c-b227-4815-b93f-fe0fe07a34bd",
+  "label": "lexRemoveBox",
   "regions": [
     {
       "components": [
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "c8d284bf-b761-4de7-88ad-d976e03783c2",
+              "UUID": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
               "columns": [
                 {
-                  "UUID": "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
+                  "UUID": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "c8d284bf-b761-4de7-88ad-d976e03783c2",
+          "id": "f3c5d228-c50a-4ecc-8a29-f06be86bb4ac",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexRemoveBox",
-                  "id": "ff8f68eb-eb9b-40db-94ca-6aec9fb379c3",
+                  "id": "d16c00a3-c5f4-4385-91f3-834488f39600",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "74d9ee71-cdf0-46f9-87e0-56feb724f0de",
+              "id": "c05d007d-f593-42c1-a4b4-1cbf7095d56b",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "e555311d-b588-4ab1-add1-4f830b0ebc03",
+      "id": "8e5500f1-3f43-475d-a41f-26a35a4fd06e",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鎷嗙洅 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "鎷嗙洅 ~娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "ad6dcd28-5872-4bac-b016-ea09e096a6c3",
+          "id": "c044df7e-0f7d-459b-9082-4e5b89bca9e1",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "7c28cb01-e082-404a-81a8-7afe5f78c023",
+      "id": "06074999-fc27-4540-a8d6-a467900db79e",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json b/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
index a90d8f3..1a65064 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexSaleAndDelivery.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "e5d81e8f-b0a5-4bf3-b11b-08dd8fef1a3c",
+  "id": "f5a6e76f-41cd-4eb3-8652-695bcce0e678",
   "label": "LexSaleAndDelivery",
   "regions": [
     {
+      "id": "1f0946e1-1735-4650-a205-dd61df8759d4",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
       "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": []
-                }
-              ]
-            },
-            "sectionHeight": 300
-          },
-          "componentName": "forceCommunity:section",
-          "id": "02b47908-d44c-4ffe-89b4-6aad09343bd0",
-          "regions": [
-            {
-              "components": [
-                {
-                  "componentAttributes": {},
-                  "componentName": "c:lexSaleAndDelivery",
-                  "id": "b77b243f-d2ce-42ff-8349-048ba0100837",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "a1846e1c-c395-4e77-9218-5375bac83cb8",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexSaleAndDelivery",
+          "id": "e3313269-05be-4724-aa4e-db0958a1ddd0",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "ed598892-294e-43c2-b91c-4df7dae88a1b",
+      "id": "3367d193-f337-49ca-95ca-6ac1caaa7349",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "e25f498e-41fb-4f4d-8dfe-fbf9a069cb93",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍑哄簱 ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "5ee61636-ae06-4737-9d50-20fd9a6971db",
+          "id": "84ec3d27-0378-42f8-a3ac-3fd350b72067",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e27b9d74-50aa-4022-bffa-7f6a08f707b8",
+      "id": "430f1ad6-c368-493e-b311-28818c66e9cd",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json b/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
index df400e3..27b35e2 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexSummonsCreat.json
@@ -1,59 +1,33 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
-  "componentName": "siteforce:dynamicLayout",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "c2e9c913-ab1c-4b38-899b-136fb95066fb",
+  "id": "b7e402c5-b5ed-4d2c-8cd1-a7c189bfbcda",
   "label": "LexSummonsCreat",
   "regions": [
     {
+      "id": "6388ef86-a800-4056-811f-d56f7381b8a1",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
       "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": []
-                }
-              ]
-            },
-            "sectionHeight": 300
-          },
-          "componentName": "forceCommunity:section",
-          "id": "2f081513-f8b1-4a18-93ed-07528785644e",
-          "regions": [
-            {
-              "components": [
-                {
-                  "componentAttributes": {},
-                  "componentName": "c:lexSummonsCreat",
-                  "id": "78274e15-2cc6-4863-8ce4-2d10e89d802f",
-                  "renderPriority": "NEUTRAL",
-                  "renditionMap": {},
-                  "type": "component"
-                }
-              ],
-              "id": "0034a928-ed12-4a8f-8b61-e2a879be675e",
-              "regionLabel": "Column 1",
-              "regionName": "1",
-              "renditionMap": {},
-              "type": "region"
-            }
-          ],
+          "componentAttributes": {},
+          "componentName": "c:lexSummonsCreat",
+          "id": "2cf76214-9746-4039-aa9f-8d956261bf1e",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "74103ed0-eb74-4ae0-a9f5-aa1bed790517",
+      "id": "5080fa3e-dede-46af-8878-00cefafbea4a",
       "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "9138e351-3acd-45bd-8f86-81f98fc33515",
+      "regionName": "footer",
       "type": "region"
     },
     {
@@ -62,15 +36,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "鍑哄簱鍗曟槑缁� ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "569ba6aa-c702-4a13-aed6-79a792706f37",
+          "id": "08468c2f-c8ee-4a89-b3a4-e8a329634e17",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "cf2865b2-d5a1-434f-b53f-927218bca79c",
+      "id": "29505c19-f110-4803-a463-159e2e71fb3d",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/lexTopPage.json b/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
index 9a07076..b467e71 100644
--- a/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
+++ b/force-app/main/default/experiences/Consumable1/views/lexTopPage.json
@@ -1,9 +1,9 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "09c93676-a531-4ba7-8708-cc47f8458c90",
-  "label": "LexTopPage",
+  "id": "bda75bd7-499d-4d41-ad47-2d49173854dd",
+  "label": "lexTopPage",
   "regions": [
     {
       "components": [
@@ -13,10 +13,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "3493c458-56a0-4990-8499-772754716049",
+              "UUID": "5d2f345c-27a4-493e-b41b-0aa663636b99",
               "columns": [
                 {
-                  "UUID": "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
+                  "UUID": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
                   "columnKey": "1",
                   "columnName": "Column 1",
                   "columnWidth": "12",
@@ -27,20 +27,20 @@
             "sectionHeight": 300
           },
           "componentName": "forceCommunity:section",
-          "id": "3493c458-56a0-4990-8499-772754716049",
+          "id": "5d2f345c-27a4-493e-b41b-0aa663636b99",
           "regions": [
             {
               "components": [
                 {
                   "componentAttributes": {},
                   "componentName": "c:lexTopPage",
-                  "id": "a987052c-27fc-4881-a10a-76813f6f1a37",
+                  "id": "bcc522fd-ec7f-44db-a05e-54157d9c1f3b",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "9eb85cd6-22f0-4d6c-89bf-bfdf13eb4889",
+              "id": "c9d294f7-8319-44f8-ba80-34ec0c7b6bc7",
               "regionLabel": "Column 1",
               "regionName": "1",
               "renditionMap": {},
@@ -52,7 +52,7 @@
           "type": "component"
         }
       ],
-      "id": "fef29330-80e6-40e7-83ce-74b60dd68887",
+      "id": "34880e8c-124a-46db-ab66-c8ab4dc1af9c",
       "regionName": "content",
       "type": "region"
     },
@@ -62,15 +62,15 @@
           "componentAttributes": {
             "customHeadTags": "",
             "description": "",
-            "title": "璁㈠崟鎻愮ず ~ 娑堣�楀搧绠$悊绯荤粺"
+            "title": "娑堣�楀搧绠$悊绯荤粺"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "6dbf3064-0f5f-4648-a787-4a09f1d915fe",
+          "id": "638a5a1c-d763-42b1-9ffa-f45692336891",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "8cd1759d-130c-40a0-99b0-395cdd92cdc8",
+      "id": "9f86202b-a3f8-4a98-9255-352caf7a80c8",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/login.json b/force-app/main/default/experiences/Consumable1/views/login.json
index 51663e1..bd6d05d 100644
--- a/force-app/main/default/experiences/Consumable1/views/login.json
+++ b/force-app/main/default/experiences/Consumable1/views/login.json
@@ -1,20 +1,12 @@
 {
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "7c2dd152-d6d3-4652-bbfe-cb8e11d83c43",
+  "id": "4c2e26c5-f1ea-42e0-85f6-371bc184fe49",
   "label": "Login",
   "regions": [
     {
       "components": [
-        {
-          "componentAttributes": {},
-          "componentName": "salesforceIdentity:communityLogo2",
-          "id": "a96beff8-2727-4f74-b08a-e908ab6e72be",
-          "renderPriority": "NEUTRAL",
-          "renditionMap": {},
-          "type": "component"
-        },
         {
           "componentAttributes": {
             "forgotPasswordLabel": "蹇樿瀵嗙爜锛�",
@@ -27,25 +19,13 @@
             "usernameLabel": "鐢ㄦ埛鍚�"
           },
           "componentName": "salesforceIdentity:loginForm2",
-          "id": "2de8135d-cb57-4614-9afe-2453f1cbe676",
-          "renderPriority": "NEUTRAL",
-          "renditionMap": {},
-          "type": "component"
-        },
-        {
-          "componentAttributes": {
-            "headerText": "",
-            "showHeader": false,
-            "useCommunityDomainSso": true
-          },
-          "componentName": "salesforceIdentity:socialLogin2",
-          "id": "f4d72a64-5e5f-48d8-8bb7-4253a8309b40",
+          "id": "d6a2d892-7104-4e50-8da1-d4b81c2fd790",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "11b4798e-fa84-4594-beea-500d991e23f2",
+      "id": "0249aee3-9513-4ce4-bc73-57051629556f",
       "regionName": "content",
       "type": "region"
     },
@@ -58,14 +38,51 @@
             "title": "Login"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "c72bcc7d-29ea-40e6-969c-c818f267f8f4",
+          "id": "a508199c-9ac8-499b-9259-710b933385c9",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "02d41dc1-9a37-47cf-90c8-438d40bba670",
+      "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",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ad5d0647-ce12-47ee-8439-a47a35d876ce",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "70260364-5f55-47f8-9e09-bf445957eea1",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "b50b01b5-4352-4dce-850c-f4d477bb871b",
+      "regionName": "footer",
+      "type": "region"
     }
   ],
   "themeLayoutType": "Login",
diff --git a/force-app/main/default/experiences/Consumable1/views/loginError.json b/force-app/main/default/experiences/Consumable1/views/loginError.json
index 7446d54..69201dc 100644
--- a/force-app/main/default/experiences/Consumable1/views/loginError.json
+++ b/force-app/main/default/experiences/Consumable1/views/loginError.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "ba40442c-80fc-411f-8c02-9cfce2ab1372",
+  "id": "a8ddd7f3-7895-497a-bb20-7f0ce5c387aa",
   "label": "Login Error",
   "regions": [
     {
-      "id": "18c0d543-48fc-4503-82bf-96cb3cb61e53",
+      "id": "79334ce5-8806-43ed-824a-36948d933f87",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "98a859f9-d38a-4454-b376-39558ba5a564",
+          "id": "a7518e76-7f61-466f-a82a-9880b806f1af",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "6778281e-69dc-4122-abff-15414362a3e3",
+      "id": "72829da8-38fa-478c-a4d8-70e3cbb74749",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "562ba090-15e4-4844-baa3-568c08ef67be",
+      "id": "0e1faede-f160-45cf-83d8-9c0256af66dc",
       "regionName": "footer",
       "type": "region"
     },
@@ -41,12 +41,12 @@
             "title": "Login Error"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "1367586b-b337-4e9b-b465-e2acd34738f8",
+          "id": "8afbbb1d-2436-4920-83de-2485490447f8",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "012e5756-ea8f-4d49-9778-29654974830d",
+      "id": "d30d0bbc-dc48-4a9e-a6a4-56831143992b",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json b/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
index 2a46b71..8b7da27 100644
--- a/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
+++ b/force-app/main/default/experiences/Consumable1/views/mDFAndCoop.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "b253bc1d-fe4a-4156-91f4-88f4725a3616",
+  "id": "51554054-4eaf-44f6-96bd-b90145e6e078",
   "label": "MDF and Coop",
   "regions": [
     {
-      "id": "b9dd4ac2-817d-4d34-874f-58def515fa47",
+      "id": "698ada79-fc75-4ade-807e-75c384962660",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "richTextValue": "             <p>                 <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span>             </p>        "
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "d8f1484b-ac5d-4563-adc7-7c5635d6cf40",
+          "id": "f49e0798-27c8-4219-84fa-8b3c270c0052",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -25,11 +25,11 @@
         {
           "componentAttributes": {
             "tabsetConfig": {
-              "UUID": "08adad9c-71b1-4370-8572-a165f1f855a9",
+              "UUID": "e9ff9632-77ea-4754-b16c-2bce71e42671",
               "activeTab": "tab1",
               "tabs": [
                 {
-                  "UUID": "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
+                  "UUID": "37fc97f7-cde7-4498-aee2-80be33c2c147",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -45,7 +45,7 @@
                   "tabName": "Fund Allocations"
                 },
                 {
-                  "UUID": "24cea51a-4f10-469b-ab68-750473d6a847",
+                  "UUID": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -61,7 +61,7 @@
                   "tabName": "Fund Requests"
                 },
                 {
-                  "UUID": "46f65d8c-5983-4c38-9ea8-df27e49d3084",
+                  "UUID": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -81,7 +81,7 @@
             }
           },
           "componentName": "forceCommunity:tabset",
-          "id": "08adad9c-71b1-4370-8572-a165f1f855a9",
+          "id": "e9ff9632-77ea-4754-b16c-2bce71e42671",
           "regions": [
             {
               "components": [
@@ -103,12 +103,12 @@
                     "showSearchBar": true
                   },
                   "componentName": "forceCommunity:objectHome",
-                  "id": "26811630-f8f1-4326-91cc-25e8d8f712b3",
+                  "id": "3531b597-cb4c-4535-a558-8092b6fa8978",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "dcaa5816-93b6-44fe-ae88-a3854c2c8863",
+              "id": "37fc97f7-cde7-4498-aee2-80be33c2c147",
               "regionLabel": "Fund Allocations",
               "regionName": "tab1",
               "renditionMap": {},
@@ -134,12 +134,12 @@
                     "showSearchBar": true
                   },
                   "componentName": "forceCommunity:objectHome",
-                  "id": "8a6128de-fe3d-4cf1-b3a3-a81eefa1afd5",
+                  "id": "78d6e688-cf9c-4af1-ade6-6daeb2457ba7",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "24cea51a-4f10-469b-ab68-750473d6a847",
+              "id": "0c982ce9-9469-4a57-83f8-9dafc5a699cf",
               "regionLabel": "Fund Requests",
               "regionName": "tab2",
               "renditionMap": {},
@@ -165,12 +165,12 @@
                     "showSearchBar": true
                   },
                   "componentName": "forceCommunity:objectHome",
-                  "id": "d838a652-cd5d-4c9c-bce0-37ec29b10b2b",
+                  "id": "2b94ac35-0ffc-4846-a564-8ce23c8c82b5",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "46f65d8c-5983-4c38-9ea8-df27e49d3084",
+              "id": "cd13853b-84c0-4cd1-ae7d-efeb14ded580",
               "regionLabel": "Fund Claims",
               "regionName": "tab3",
               "renditionMap": {},
@@ -182,12 +182,12 @@
           "type": "component"
         }
       ],
-      "id": "4a8ad10b-ad7d-4821-90e2-73e4e75738fe",
+      "id": "8af61955-d97e-44f2-b708-b0b1f86dd6e4",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "d8a1fe61-f24d-4969-bfa9-9745db5d1021",
+      "id": "1b5dacc9-d26b-484f-8de0-f7bee7b2b519",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/messages.json b/force-app/main/default/experiences/Consumable1/views/messages.json
index 590fccd..f1212ce 100644
--- a/force-app/main/default/experiences/Consumable1/views/messages.json
+++ b/force-app/main/default/experiences/Consumable1/views/messages.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "55f1ae5d-c9ac-44ad-bb27-4c22dddc2a2e",
+  "id": "a4397b8d-c4ab-44d4-b2dc-cce577b9d2c8",
   "label": "Messages",
   "regions": [
     {
@@ -10,13 +10,13 @@
         {
           "componentAttributes": {},
           "componentName": "forceChatter:messages",
-          "id": "e42525c8-73ea-4e9f-8306-81021473d168",
+          "id": "76859eb9-b786-4b53-9285-b3a81a95cd53",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "a60f42f5-2ed2-4a01-93e5-dff8f3f5552f",
+      "id": "665047c1-c182-448a-bab3-d5a0d581d5bb",
       "regionName": "content",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/myAccount.json b/force-app/main/default/experiences/Consumable1/views/myAccount.json
index 182110b..1659cc3 100644
--- a/force-app/main/default/experiences/Consumable1/views/myAccount.json
+++ b/force-app/main/default/experiences/Consumable1/views/myAccount.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:dynamicLayout",
   "dataProviders": [],
-  "id": "2cd7a2df-9e65-4663-9e35-9b4134b4beb1",
+  "id": "25eab78c-263e-4a55-8bff-ad852efc15c9",
   "label": "My Account",
   "regions": [
     {
-      "id": "23da0649-b638-4675-96dc-b2c9ab32b443",
+      "id": "c1b1b648-5ba6-4a83-8907-be9c4abd0d6d",
       "regionName": "header",
       "type": "region"
     },
@@ -18,10 +18,10 @@
             "backgroundOverlay": "rgba(0,0,0,0.5)",
             "contentAreaWidth": 100,
             "sectionConfig": {
-              "UUID": "f07182ad-75fc-4431-b6ba-400214c3d0ac",
+              "UUID": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
               "columns": [
                 {
-                  "UUID": "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
+                  "UUID": "8086ee04-373f-44dc-a32d-1b3949308dcf",
                   "columnKey": "col1",
                   "columnName": "column 1",
                   "columnWidth": "12",
@@ -47,7 +47,7 @@
             "sectionHeight": 32
           },
           "componentName": "forceCommunity:section",
-          "id": "f07182ad-75fc-4431-b6ba-400214c3d0ac",
+          "id": "dd822d23-1af7-4fff-b81a-8b05999fc3d8",
           "regions": [
             {
               "components": [
@@ -56,7 +56,7 @@
                     "recordId": "{!CurrentUser.accountId}"
                   },
                   "componentName": "forceCommunity:recordHeadline",
-                  "id": "76e15d29-c38a-4c72-94b5-08c54a39de76",
+                  "id": "0498afe2-2170-4e41-9a7b-5d96e1a9820b",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
@@ -75,13 +75,13 @@
                     "timelineTabLabel": "Activity"
                   },
                   "componentName": "forceCommunity:recordHomeTabs",
-                  "id": "7d8fefed-3819-4d75-8e8a-4757c623ab25",
+                  "id": "9151bf03-f322-4ccf-93dc-3367571ea0f6",
                   "renderPriority": "NEUTRAL",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "3e85aad9-15c8-45da-bc0d-22dc37dd17d0",
+              "id": "8086ee04-373f-44dc-a32d-1b3949308dcf",
               "regionLabel": "column 1",
               "regionName": "col1",
               "renditionMap": {},
@@ -93,12 +93,12 @@
           "type": "component"
         }
       ],
-      "id": "b79a556f-e9df-45e1-bdab-1be9be91cfff",
+      "id": "c12e8d8d-e1f3-43b9-8543-5c285db3c848",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "f4a5b0fd-e283-47e3-9183-5364ef798372",
+      "id": "c6a9fc30-77e8-458b-a7f2-2f4d9fefc79b",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/neworder.json b/force-app/main/default/experiences/Consumable1/views/neworder.json
new file mode 100644
index 0000000..954b441
--- /dev/null
+++ b/force-app/main/default/experiences/Consumable1/views/neworder.json
@@ -0,0 +1,71 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:dynamicLayout",
+  "dataProviders": [],
+  "id": "375bc286-f467-4c6c-a3e1-be4bfbf27bea",
+  "label": "neworder",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "background": "background: rgba(0,0,0,0)",
+            "backgroundOverlay": "rgba(0,0,0,0.5)",
+            "contentAreaWidth": 100,
+            "sectionConfig": {
+              "UUID": "08d89588-c1ce-4bc1-9bdd-d012e47b026f",
+              "columns": [
+                {
+                  "UUID": "83df4bfa-1d2a-4829-9ba9-65834d4f3f05",
+                  "columnKey": "1",
+                  "columnName": "Column 1",
+                  "columnWidth": "12",
+                  "seedComponents": []
+                }
+              ]
+            },
+            "sectionHeight": 300
+          },
+          "componentName": "forceCommunity:section",
+          "id": "08d89588-c1ce-4bc1-9bdd-d012e47b026f",
+          "regions": [
+            {
+              "id": "83df4bfa-1d2a-4829-9ba9-65834d4f3f05",
+              "regionLabel": "Column 1",
+              "regionName": "1",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "1c6349c5-8998-4e97-9ba1-2d71ee91f017",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "neworder"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "6e91d4af-e050-40e5-b64a-b1643c6a8624",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "e35f5e98-87aa-4104-8e79-549130296571",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "custom-neworder"
+}
diff --git a/force-app/main/default/experiences/Consumable1/views/questionDetail.json b/force-app/main/default/experiences/Consumable1/views/questionDetail.json
index 4436c56..c422177 100644
--- a/force-app/main/default/experiences/Consumable1/views/questionDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/questionDetail.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsTwoCol84Layout",
   "dataProviders": [],
-  "id": "c29033d4-ea89-4311-9a8f-9b1cee010f96",
+  "id": "d4ed7ed0-3745-461e-acd3-32108749ab93",
   "label": "Question Detail",
   "regions": [
     {
@@ -18,13 +18,13 @@
             "uniqueNameOrId": "{!recordId}"
           },
           "componentName": "forceCommunity:headline",
-          "id": "84f7129f-6ae2-44fa-8479-fda420f20cf4",
+          "id": "30e7636a-9f44-4386-927f-dc05e6dca7c3",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "eb922188-1611-42f3-be3f-671128373c93",
+      "id": "5dc8a770-ab6e-425f-9737-c564f0ff61b8",
       "regionName": "header",
       "type": "region"
     },
@@ -35,13 +35,13 @@
             "id": "{!feedItemId}"
           },
           "componentName": "forceCommunity:feedItemDetail",
-          "id": "5f16c8ce-8910-4700-bf92-03bebb56d251",
+          "id": "541c18f5-73d0-4d1e-a815-5a6779bde321",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "23ae6845-c63c-4df8-b294-1460939daf5b",
+      "id": "d3c4b9c8-ec9d-4b90-bc4b-c0553ae852e6",
       "regionName": "content",
       "type": "region"
     },
@@ -54,7 +54,7 @@
             "title": "Related Questions"
           },
           "componentName": "selfService:similarQuestions",
-          "id": "2560050a-7f4a-4fe3-833b-4086f89d7cae",
+          "id": "3ec73f50-3c08-4ffa-9e59-13ffc1fd8262",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -65,18 +65,18 @@
             "title": ""
           },
           "componentName": "forceCommunity:recommendations",
-          "id": "fefd9c6b-eac3-425b-a0a6-2721a4131d4f",
+          "id": "034fc1f4-bc73-4cc7-b3de-62ce6abadbd5",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "386f4a49-d920-4888-a249-1ae1f4c1b0d8",
+      "id": "c3057ca7-1e03-44b2-854d-944c6b2710c6",
       "regionName": "sidebar",
       "type": "region"
     },
     {
-      "id": "efd4c33f-e3bf-4021-abf9-be0b741a0cd7",
+      "id": "9b430d39-728f-4c02-8d61-7140d62ff5b7",
       "regionName": "footer",
       "type": "region"
     },
@@ -89,12 +89,12 @@
             "title": "{!Record.Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "f0017168-74ce-4587-8af7-4c5e0dc965eb",
+          "id": "b5bcdcc8-6b0b-4742-916f-7690109d3a8e",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "05ba98f5-e29b-47ce-8099-b16e50e34f30",
+      "id": "e66b0876-ced9-4b9e-a9dc-d3ca8b04dd3b",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json b/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
index 3729346..11e89cc 100644
--- a/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
+++ b/force-app/main/default/experiences/Consumable1/views/quipDocsRelatedList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "be244254-9e8f-46bd-83e0-a6cdb3780540",
+  "id": "b076cb5b-405f-4199-b9be-7429234ce226",
   "label": "Quip Docs Related List",
   "regions": [
     {
-      "id": "2a9b05d7-cafd-4e4d-8f30-067e7e2f45ed",
+      "id": "e701d724-1504-44c7-92a3-ea1ec941cf73",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "parentRecordId": "{!recordId}"
           },
           "componentName": "forceCommunity:relatedQuipItemsView",
-          "id": "a2c16258-72fb-4eb3-8b04-b80f8b4beafb",
+          "id": "a9d4f298-cfdd-48b7-ace5-0c47aadf2876",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "9bc5f2b8-7b65-47fc-a3d5-1d83ada44a72",
+      "id": "b12e6374-255d-413c-93a1-d14857aaf21a",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "73a8a853-5872-4055-8a42-9723c11db0e9",
+      "id": "a6b90480-6c77-4df3-a631-065e1f4f2c1b",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/recordDetail.json b/force-app/main/default/experiences/Consumable1/views/recordDetail.json
index 13612d3..95616d5 100644
--- a/force-app/main/default/experiences/Consumable1/views/recordDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/recordDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "d30889c1-09fc-407a-8d9d-155b305cce6f",
+  "id": "c8075095-c3fd-4d07-8079-0eb063287ad7",
   "label": "Record Detail",
   "regions": [
     {
-      "id": "58b8dc89-c614-4b2a-be76-1cd2733c7a2d",
+      "id": "6da91020-2e9a-45bb-824c-c649aa91eb2b",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:recordHeadline",
-          "id": "d6471194-6314-4cc2-ad8d-8844760b584f",
+          "id": "90d97e07-565d-4df0-b939-466bdcd3af4a",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -36,18 +36,18 @@
             "timelineTabLabel": "Activity"
           },
           "componentName": "forceCommunity:recordHomeTabs",
-          "id": "43f7a144-34dd-4fe7-a4d6-9b4ce60a2633",
+          "id": "8857f111-6bd5-4e6e-aeaf-c5222f826b61",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "79ac024a-2855-4c3d-ad2e-1529cb3588a7",
+      "id": "bf3bbcd3-bf99-43a1-a4d8-139ede220c94",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "73ccaf9e-c514-4a24-aaf6-c5c0d176c356",
+      "id": "b0395436-3796-48d1-be24-0fdc721d91a3",
       "regionName": "footer",
       "type": "region"
     },
@@ -60,12 +60,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "23c28297-68e4-4693-b7c2-eddb3a672965",
+          "id": "0a293aa4-d48c-4b46-8a04-30d0a0e02f54",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "06f1cca0-baa5-4d1c-b943-72735f101956",
+      "id": "24d73a32-25b2-404e-8b51-64f354ada477",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/recordList.json b/force-app/main/default/experiences/Consumable1/views/recordList.json
index 0c5d6e8..9635931 100644
--- a/force-app/main/default/experiences/Consumable1/views/recordList.json
+++ b/force-app/main/default/experiences/Consumable1/views/recordList.json
@@ -1,47 +1,32 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "f14a9999-9077-4660-a62f-b9df05228f6c",
+  "id": "568148b6-8356-45bb-a31e-e8c320ff9726",
   "label": "Record List",
   "regions": [
     {
-      "id": "c142f9c9-d513-4938-8678-c78cb05ca097",
+      "id": "26cdcc22-9daa-47ef-99dc-be188646430f",
       "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
-          },
-          "componentName": "forceCommunity:objectHome",
-          "id": "9cf46f79-994f-4674-9cf3-8f1309488f9e",
+          "componentAttributes": {},
+          "componentName": "c:RetrospectiveWeeklyReport",
+          "id": "9a2492e1-96b7-48dc-bfb4-c01067848016",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "2d62ef08-0512-4116-8b2c-877e41412967",
+      "id": "e56df536-cc19-4136-97d0-fe33a9209a61",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "53ed7ccf-2c5e-428f-84aa-9c122f0a2031",
+      "id": "24a8ec26-2d89-4203-9025-61f05c4d8a2b",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/register.json b/force-app/main/default/experiences/Consumable1/views/register.json
index 25ecd2f..e46899e 100644
--- a/force-app/main/default/experiences/Consumable1/views/register.json
+++ b/force-app/main/default/experiences/Consumable1/views/register.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "7756c67f-7774-4fe1-b1c2-eecb19f9c6a5",
+  "appPageId": "bfbf7350-cdcd-4e2c-97a5-ab51f2aa3b9d",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "7cadb098-b80c-40d4-a33c-714c36f8a2f3",
+  "id": "3af8afbb-87fe-417d-818c-7e8a8f00faf6",
   "label": "Register",
   "regions": [
     {
@@ -10,7 +10,7 @@
         {
           "componentAttributes": {},
           "componentName": "salesforceIdentity:communityLogo2",
-          "id": "03d0e758-407a-4e8e-83ee-5a0ab3c4e2a0",
+          "id": "9c0037ff-0d41-4d35-b8c6-4dc80d41c19a",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -20,7 +20,7 @@
             "richTextValue": "<div style=\"text-align: center;\" class=\"inverseTextColor\">Join the community to receive personalized information and customer support.</div>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "59a3555f-3c74-470e-a473-bb10cbe44afb",
+          "id": "76521ecb-efe5-42bf-870c-0689113e2470",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -39,7 +39,7 @@
             "submitButtonLabel": "Sign Up"
           },
           "componentName": "salesforceIdentity:selfRegister2",
-          "id": "b4dd7cc4-4fc4-4f38-bd0e-c89b1f32590b",
+          "id": "a9570792-c915-4d1a-9118-10d822a486ca",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -51,7 +51,7 @@
             "useCommunityDomainSso": true
           },
           "componentName": "salesforceIdentity:socialLogin2",
-          "id": "3af49aa2-c5df-472d-a9f8-d1320b632c9a",
+          "id": "ebe05af6-96dc-4fce-9e84-4d4f3431c32a",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -61,13 +61,13 @@
             "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Already have an account?</a></div>"
           },
           "componentName": "forceCommunity:richTextInline",
-          "id": "a1dd5955-819a-4921-80e5-29882955ca7e",
+          "id": "b28a8b4b-abd0-4e0e-a7d3-906c8325d1b6",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "4d46ac5c-75c6-4730-a2ac-bc191a179149",
+      "id": "8ba378ad-f887-47f5-854b-ad866edaecc6",
       "regionName": "content",
       "type": "region"
     },
@@ -80,12 +80,12 @@
             "title": "Register"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "fce946a1-2d69-4ed8-bf94-2a246fc10291",
+          "id": "14c2fe6e-169e-43ca-9cba-8b06e14820b5",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "7d12b5c7-f9c8-45e9-a4e8-71d4639011af",
+      "id": "e6ab04a5-8f13-41ee-bc2c-f40309ba6b5e",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json b/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
index 1f008e0..59d57d6 100644
--- a/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
+++ b/force-app/main/default/experiences/Consumable1/views/relatedRecordList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "2a182209-2527-4335-b672-176196ee6a0d",
+  "id": "172db5bf-c37b-4cee-853b-212bf73517d7",
   "label": "Related Record List",
   "regions": [
     {
-      "id": "6caa2d71-5392-4b0c-b738-9ac48f16aa52",
+      "id": "0b2e1664-3809-4c37-b7e4-20b63faf9e5e",
       "regionName": "header",
       "type": "region"
     },
@@ -23,18 +23,18 @@
             "showRowNumbers": true
           },
           "componentName": "forceCommunity:relatedList",
-          "id": "d476d8c7-4802-4819-951f-39a101f6be63",
+          "id": "2ba8fce5-1fdb-4d3d-804e-f6790c20e360",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "715ead5b-8d41-4edc-bf80-4daebe3464c7",
+      "id": "766cafb3-a3bf-47f0-aca8-e6358ffe63e7",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "d6ef29fb-2766-4065-a1c9-2e251d3a24da",
+      "id": "e07e0baf-8c53-44c3-b957-5e12464c2137",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/reportBuilder.json b/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
index 4160705..e62d8ef 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportBuilder.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "059d5f4a-e616-4540-be96-a34b294fb2a4",
+  "id": "8e5cdbce-69e6-41cf-9d28-bf22b82ab29f",
   "label": "Report Builder",
   "regions": [
     {
-      "id": "b0668fae-e6be-4e0f-85ad-0bd2ff51e3f4",
+      "id": "dba98a8a-984b-42ed-9b2c-c979fbc59d0b",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:reportBuilder",
-          "id": "2d38f9cf-474d-490e-92d0-ab02343f9c7a",
+          "id": "6beb6fa8-c9bf-4990-b075-edd5e3022e32",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "69520259-ca39-49a9-bc51-28a53ce45025",
+      "id": "d727fea1-1d73-48c4-b2ac-be189e71a38b",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "2bcf6747-9ca7-4726-8e9a-dd1334643433",
+      "id": "529179bd-e9d3-4070-b7b8-e657e5f5a36b",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/reportDetail.json b/force-app/main/default/experiences/Consumable1/views/reportDetail.json
index 60dc5ef..ebc47e2 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "66e48eb0-9203-4842-9fde-8b4e7e63b8ac",
+  "id": "ac90421b-0cd9-4c2e-a836-ee4567ce8d1f",
   "label": "Report Detail",
   "regions": [
     {
-      "id": "993df7e2-02c2-4043-80f2-75b1fc26b624",
+      "id": "b8a2ac35-b501-4034-a616-5f54591b17d0",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:reportPage",
-          "id": "a1126338-71f3-4c8b-9fad-fdb3915a12a4",
+          "id": "abe06f62-acc2-41c3-809c-1f150f8841da",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "993ff9cc-3b17-46b6-a40d-f1f97c4db48c",
+      "id": "8cdd6f99-9662-4a58-b0ee-4065486d0ef4",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "8429749f-ee7b-4be7-b953-ce1a28fe724e",
+      "id": "a10f13ff-f8c2-433d-82e5-20397d085c0c",
       "regionName": "footer",
       "type": "region"
     },
@@ -41,12 +41,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "a848b6bf-1473-4426-ad50-f3e85894c8c2",
+          "id": "bdc1ac10-229a-4c7b-97c7-eb30938a33db",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "c3a6a3e2-ce86-4417-ba50-39bb2e8d6939",
+      "id": "d1410883-3540-4f4c-9b28-06294a5a0248",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/reportList.json b/force-app/main/default/experiences/Consumable1/views/reportList.json
index 7b61f1a..6f78fc8 100644
--- a/force-app/main/default/experiences/Consumable1/views/reportList.json
+++ b/force-app/main/default/experiences/Consumable1/views/reportList.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "cbac51d9-cfc4-4fa7-bf92-603361ff1747",
+  "id": "f71c1609-6433-4cf0-8846-695e50897517",
   "label": "Report List",
   "regions": [
     {
-      "id": "21fd7f4b-ed35-4d5e-ba32-40b7cabd6c5a",
+      "id": "dca7f9b0-515d-46aa-8122-e600b7eb2b35",
       "regionName": "header",
       "type": "region"
     },
@@ -15,18 +15,18 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:reportList",
-          "id": "48d0998f-cc83-4f4d-8467-473e2648f1d5",
+          "id": "6687e39c-5cf3-478c-9a1c-214f17e3c358",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "165cdeb7-c542-4a6a-8c42-214baade96e1",
+      "id": "612fbb2a-1b08-4491-aa90-af9c07e3077b",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "1fce8eb4-ac5b-4828-9fea-364d5916925b",
+      "id": "1bb69df7-0e36-45ef-853e-3c9367670818",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/resources.json b/force-app/main/default/experiences/Consumable1/views/resources.json
index e48ff3e..495ee4c 100644
--- a/force-app/main/default/experiences/Consumable1/views/resources.json
+++ b/force-app/main/default/experiences/Consumable1/views/resources.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsTwoCol84Layout",
   "dataProviders": [],
-  "id": "dc215254-3731-423c-ba11-3d87746598e8",
+  "id": "2feda9aa-a785-4e98-9448-352e28d95b34",
   "label": "Resources",
   "regions": [
     {
-      "id": "72cef312-c96f-46e1-859d-1dfc1ac2c05a",
+      "id": "6372864b-d004-480d-a164-80d5c483d6d5",
       "regionName": "header",
       "type": "region"
     },
@@ -18,13 +18,13 @@
             "showWorkspaceImage": true
           },
           "componentName": "forceCommunity:workspacesList",
-          "id": "d02b982c-c404-4ee6-b7eb-81cc247d2e58",
+          "id": "2e0e0428-6e7c-4b95-9e9e-4e82022fa404",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "a5fb005e-9493-44c8-be82-daa9ed4855db",
+      "id": "eb700be4-2afe-4df5-94b6-0f0cc019d588",
       "regionName": "content",
       "type": "region"
     },
@@ -35,18 +35,18 @@
             "title": "Popular Now"
           },
           "componentName": "forceChatter:recommendationsBig",
-          "id": "2a81731a-6fd2-4087-a360-23531384ce7b",
+          "id": "285d61be-06fc-4a6f-aaee-3ecbb483b948",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "5f304697-36f3-4e31-985d-b54afad66c28",
+      "id": "180d635c-3d79-40c1-a9be-466504176d9e",
       "regionName": "sidebar",
       "type": "region"
     },
     {
-      "id": "31ffad04-7009-47aa-b99a-01f08cb17d10",
+      "id": "0d2455d9-0fcf-4a57-b9b9-85ef03129973",
       "regionName": "footer",
       "type": "region"
     },
@@ -59,12 +59,12 @@
             "title": "Resources"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "a49b7653-081c-4721-ab11-85ec5590cf32",
+          "id": "413ba905-225b-4c23-aa6a-e07b7f2d8b28",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "85fe3418-3e87-45e0-ab01-9530875c41c3",
+      "id": "a81d27b2-b367-40c4-a1f2-d24a2bb0f930",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/search.json b/force-app/main/default/experiences/Consumable1/views/search.json
index df70c64..126c0f2 100644
--- a/force-app/main/default/experiences/Consumable1/views/search.json
+++ b/force-app/main/default/experiences/Consumable1/views/search.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "74aeae6d-8d40-433e-8168-45175ee356a6",
+  "id": "99b69c91-c8d8-42fe-91af-6f71e4612910",
   "label": "Search",
   "regions": [
     {
-      "id": "f0168968-61fd-41cb-b7af-1eff3f8b32f3",
+      "id": "d3a00bfd-a6c5-494e-9dd0-9d01699c5557",
       "regionName": "header",
       "type": "region"
     },
@@ -37,18 +37,18 @@
             "showTopResults": true
           },
           "componentName": "forceCommunity:search",
-          "id": "5f9e6d47-2bcc-4097-a92c-1ed613352db1",
+          "id": "300943f3-7e89-43b5-986d-013d1e677bad",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "5724ab02-cf0e-4aa8-b6d9-27c93918f75f",
+      "id": "0cca2c58-a0c4-4cba-857b-7a81fb548c6e",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "de00bfc5-bb66-40f6-8d83-e45d83c02f17",
+      "id": "76ff2160-08e4-42e2-bf3a-85c8cc7f50c1",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/streamDetail.json b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
index 2ec526e..cb1cd2f 100644
--- a/force-app/main/default/experiences/Consumable1/views/streamDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/streamDetail.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "e3ef5ec3-0aba-44b3-b608-6f939cf49c88",
+  "id": "0c2c3b1a-34ee-493b-af35-596aa83568d6",
   "label": "Stream Detail",
   "regions": [
     {
-      "id": "48e57d3b-e3d0-4f72-be2f-a2fae7b65a0a",
+      "id": "f1637238-82ab-4cef-a8b0-1278d67c9d5a",
       "regionName": "header",
       "type": "region"
     },
@@ -17,18 +17,18 @@
             "id": "{!recordId}"
           },
           "componentName": "forceCommunity:streamDetail",
-          "id": "8c078f23-692d-4f99-a755-99025f03a1b5",
+          "id": "60702a91-77e0-4289-a4ca-a5161a96550a",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "cd36c50d-c89e-4a33-a381-6e21077775b9",
+      "id": "825c9a77-bb20-48f2-a7f3-02e2b65a7523",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "a16a1ef4-47ac-4970-9d30-9cc7d15dd873",
+      "id": "fa8bc833-0127-4936-acb3-7ddb285df900",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/streamList.json b/force-app/main/default/experiences/Consumable1/views/streamList.json
index 3e39578..b3182ec 100644
--- a/force-app/main/default/experiences/Consumable1/views/streamList.json
+++ b/force-app/main/default/experiences/Consumable1/views/streamList.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "e1275716-f06a-4a27-a667-19c49eefb083",
+  "id": "6ef6f17a-0dda-4824-8310-e283e961890f",
   "label": "Stream List",
   "regions": [
     {
@@ -10,13 +10,13 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:streamList",
-          "id": "c55e158b-0343-40b2-bca0-888ab4e1ae18",
+          "id": "b37e561b-bcc1-471e-a893-29ce0f7bac79",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e93a4c80-2373-4f62-a413-6b91c74928e1",
+      "id": "f37c8024-a2e2-43ee-bb73-7ce689c4d6d9",
       "regionName": "content",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
index 5253a92..560723e 100644
--- a/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
+++ b/force-app/main/default/experiences/Consumable1/views/topicCatalog.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "3912430c-3c10-4bf3-bf37-5a619a596491",
+  "id": "bc041b32-bf8f-47ac-8c7d-35d8b4167ee7",
   "label": "Topic Catalog",
   "regions": [
     {
@@ -18,13 +18,13 @@
             "uniqueNameOrId": ""
           },
           "componentName": "forceCommunity:headline",
-          "id": "bb3cf42e-7839-4d1b-9397-61f43400e885",
+          "id": "2dea3547-05b7-4553-b77d-4792aac6c392",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e0161633-e87a-4873-a308-f87278393077",
+      "id": "4aa7eaf6-e706-4e57-9ce3-9c8f3cf26246",
       "regionName": "header",
       "type": "region"
     },
@@ -33,18 +33,18 @@
         {
           "componentAttributes": {},
           "componentName": "forceCommunity:topicCatalog",
-          "id": "c4149a20-518c-4518-8f16-363ca10cb9fd",
+          "id": "ca681efe-4067-4a6c-b442-e95f316babae",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "0250f471-2b7a-48e8-894e-775d5d3edb11",
+      "id": "6b2ab383-10e2-4ce7-aed3-1d8ab837fa13",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "36965db0-cc03-4916-b508-0b3747f12f39",
+      "id": "266bf649-4b83-43f8-a08c-d227b505ca84",
       "regionName": "footer",
       "type": "region"
     },
@@ -57,12 +57,12 @@
             "title": "Topic Catalog"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "e81daa52-bbe0-4f2d-bd9e-a43f4156623b",
+          "id": "a8fbeba0-f3a7-46c8-93d9-7aaa0035f1ab",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "44a8bb9f-9013-450a-ab7d-d6da72269e33",
+      "id": "dd88451a-81bf-48c6-bea8-1f411e587fb7",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/topicDetail.json b/force-app/main/default/experiences/Consumable1/views/topicDetail.json
index c4af326..a3504a2 100644
--- a/force-app/main/default/experiences/Consumable1/views/topicDetail.json
+++ b/force-app/main/default/experiences/Consumable1/views/topicDetail.json
@@ -1,8 +1,8 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsTwoCol84Layout",
   "dataProviders": [],
-  "id": "060ff5da-04b3-49de-8fb8-03decd8c188c",
+  "id": "8f8238dc-8f81-4994-9933-b4dcb285776e",
   "label": "Topic Detail",
   "regions": [
     {
@@ -12,13 +12,13 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:recordHeadline",
-          "id": "09e98f13-f206-43ee-bf41-828332156a3f",
+          "id": "13faad2b-64b9-4f9d-8d5a-94eba2bcaa34",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "e0e7dbc4-3b5b-442a-b4ee-700038c2f223",
+      "id": "6e67d805-16ce-4e1c-8b47-21f7add68528",
       "regionName": "header",
       "type": "region"
     },
@@ -36,13 +36,13 @@
             "type": "Topics"
           },
           "componentName": "forceCommunity:forceCommunityFeed",
-          "id": "6016edf0-5479-47bd-83af-b01e58fe5b1c",
+          "id": "a38781d5-55f1-4c8d-9052-33b5b6bb86c4",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "0ed07a83-ddeb-4f62-ae37-d5b0acfc6584",
+      "id": "7060705f-116c-43a2-b035-fc6e4711f9cc",
       "regionName": "content",
       "type": "region"
     },
@@ -53,18 +53,18 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:recordDetail",
-          "id": "33d2426c-2eb9-4abf-8059-25a02fdc20a1",
+          "id": "dd3773a2-2efd-4ba6-9fc7-cf8fa7b7abc1",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "ca54845f-e7c2-4d40-9243-8e253709523b",
+      "id": "450ad7df-3edc-4c67-90e2-ab7edac4a4d2",
       "regionName": "sidebar",
       "type": "region"
     },
     {
-      "id": "f2cc39b9-f4a1-44dd-98eb-928de7f45b4f",
+      "id": "9ed58d0e-69ea-4d40-8ffa-446f944e7137",
       "regionName": "footer",
       "type": "region"
     },
@@ -77,12 +77,12 @@
             "title": "{!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "e3d92037-2073-4756-a86f-90c4c43998ec",
+          "id": "5d9718ca-83b1-45dc-aca9-2e4f947ef338",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "c559cbc3-8107-4482-b65e-0fc253417b1c",
+      "id": "1a11e61a-6963-4a58-8497-681783af4954",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/userProfile.json b/force-app/main/default/experiences/Consumable1/views/userProfile.json
index 2e84cd7..8c4b3b0 100644
--- a/force-app/main/default/experiences/Consumable1/views/userProfile.json
+++ b/force-app/main/default/experiences/Consumable1/views/userProfile.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "b3764d11-d26d-4554-8747-e7f30fb722bd",
+  "id": "2245cd19-8057-487b-8284-d7f20c56e1f7",
   "label": "User Profile",
   "regions": [
     {
-      "id": "089ae725-a61b-476e-aab7-3ea5bf1ef011",
+      "id": "14612469-280a-47d6-a13e-c7c856cebb73",
       "regionName": "header",
       "type": "region"
     },
@@ -19,7 +19,7 @@
             "showReputation": false
           },
           "componentName": "forceCommunity:userProfileHeader",
-          "id": "7ef45f8f-cc14-404a-8867-e6d3557f32d3",
+          "id": "9f2b692c-0288-4aaa-af5d-112c2d8d0165",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -27,11 +27,11 @@
         {
           "componentAttributes": {
             "tabsetConfig": {
-              "UUID": "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
+              "UUID": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
               "activeTab": "tab1",
               "tabs": [
                 {
-                  "UUID": "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
+                  "UUID": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -44,7 +44,7 @@
                   "tabName": "Details"
                 },
                 {
-                  "UUID": "02c71e1a-5c7b-4265-8ff5-486737b59caf",
+                  "UUID": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
                   "allowGuestUser": false,
                   "locked": false,
                   "seedComponents": [
@@ -61,7 +61,7 @@
             }
           },
           "componentName": "forceCommunity:tabset",
-          "id": "b4db8bb9-4fa9-4f41-8919-a300735d0ef6",
+          "id": "3a8d28a4-31ff-4150-a1ad-636515efc06d",
           "regions": [
             {
               "components": [
@@ -70,12 +70,12 @@
                     "id": "{!recordId}"
                   },
                   "componentName": "forceCommunity:userProfileDetail",
-                  "id": "3910b7ed-af10-4a8e-9858-6780fc312390",
+                  "id": "263079c1-25b9-4a89-ad82-ff789f1cec6b",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "ffc31b37-4e88-44ab-a58e-8c8952bddf50",
+              "id": "40b895c3-98e0-43f8-a2d2-a6f0dc9cbe94",
               "regionLabel": "Details",
               "regionName": "tab1",
               "renditionMap": {},
@@ -88,12 +88,12 @@
                     "userId": "{!recordId}"
                   },
                   "componentName": "forceCommunity:userRelatedList",
-                  "id": "ffeb3b47-04b8-455c-be55-69b69096f017",
+                  "id": "f2d05739-3021-4c7b-8a2c-ef986d23c0e7",
                   "renditionMap": {},
                   "type": "component"
                 }
               ],
-              "id": "02c71e1a-5c7b-4265-8ff5-486737b59caf",
+              "id": "17b13b59-193d-4b7a-8ab4-e435ba96b750",
               "regionLabel": "Related",
               "regionName": "tab2",
               "renditionMap": {},
@@ -105,12 +105,12 @@
           "type": "component"
         }
       ],
-      "id": "4ad735e0-ad67-4c2b-9b52-717f1be31466",
+      "id": "4eee041e-a134-466c-ad5a-39b2189c9de6",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "d9fb20dc-9a48-4767-b7ab-fc7c8a5cb56a",
+      "id": "1943f596-5d30-46eb-aec0-c155ebebf201",
       "regionName": "footer",
       "type": "region"
     }
diff --git a/force-app/main/default/experiences/Consumable1/views/userSettings.json b/force-app/main/default/experiences/Consumable1/views/userSettings.json
index c989893..39db8cb 100644
--- a/force-app/main/default/experiences/Consumable1/views/userSettings.json
+++ b/force-app/main/default/experiences/Consumable1/views/userSettings.json
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "8225f2be-2536-4868-afe9-ed11e1c1eb15",
+  "id": "55bd4245-fde3-4919-8a43-b7e2ffc3aed7",
   "label": "User Settings",
   "regions": [
     {
-      "id": "0e29e12f-82e2-4770-9056-00412cb4914b",
+      "id": "661a308a-163f-4685-aec7-5d617a450359",
       "regionName": "header",
       "type": "region"
     },
@@ -38,18 +38,18 @@
             "settingsPageTitle": "My Settings"
           },
           "componentName": "forceCommunity:userSettingsCustomizable",
-          "id": "be9a963a-9ad1-4190-845c-c1f479b4c9f2",
+          "id": "1a67d89b-1f40-4cd5-ac5b-c655aa5043ee",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "7eb02000-7cb9-48f9-8463-eae4dfa60e4c",
+      "id": "c3d59adc-a0ce-40a8-85de-f06d2a758226",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "f99dd3f8-ab5f-49e4-b57e-b51dc2ab9ccd",
+      "id": "455997bb-5cc3-45cf-9da7-0a28c22be1f5",
       "regionName": "footer",
       "type": "region"
     }
diff --git "a/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277RelatedList.json"
new file mode 100644
index 0000000..bfbc6a4
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\344\273\252\350\241\250\346\235\277RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "9c09c70e-209c-4ed4-baa3-8dad00a95381",
+  "label": "浠〃鏉� Related List",
+  "regions": [
+    {
+      "id": "72c45cc3-7d42-489d-bd24-907d85b68797",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "31464dde-0c5a-44b1-b128-ea96c5a23992",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c74d8383-50cc-46ba-966c-af0cb672eed6",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "2460ae3c-8d16-41ae-a300-673f769f91d9",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-01Z"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json" "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
new file mode 100644
index 0000000..bef2e60
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255Detail.json"
@@ -0,0 +1,76 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "d1ab2f20-ffeb-42ab-a74f-01c71e2d5e74",
+  "label": "瀛︿細銉诲煿璁� Detail",
+  "regions": [
+    {
+      "id": "e8ef3ad8-5862-4201-b4b9-477aec3dad1e",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "d0177a8c-13c8-4d4e-9b3e-2d83ac3425de",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "discussionsTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related",
+            "showLegacyActivityComposer": false,
+            "tab1Type": "details",
+            "tab2Type": "related",
+            "tab3Type": "chatter",
+            "tab4Type": "none",
+            "timelineTabLabel": "Activity"
+          },
+          "componentName": "forceCommunity:recordHomeTabs",
+          "id": "5160d097-10a7-4eea-9a6d-14806942e27b",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "8266e171-9be5-4b9d-8867-4c5483414770",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "bee715d1-5c38-49cf-a8a7-e9cf347e39bb",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "bec33f2f-56d7-4178-805b-d5a7270071fe",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a63321aa-8f8b-4730-99e9-368e011aada6",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-701"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json"
new file mode 100644
index 0000000..a061aca
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "0a522fab-0926-4aef-aed4-a88ce0f77c0d",
+  "label": "瀛︿細銉诲煿璁� Related List",
+  "regions": [
+    {
+      "id": "85f65e2c-e7b1-4b06-b490-6390b5e64c9b",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "0f2cfe81-edd3-4e41-943d-625be1485248",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "59d30058-1c1b-431b-b3fb-23e8243f0011",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "21336e2b-817d-417b-99fa-15ff86c87af7",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-701"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204RelatedList.json"
new file mode 100644
index 0000000..ebf7bf2
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\260\217\347\273\204RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "95256c4b-4f81-4779-9782-9c1f067a3c0e",
+  "label": "灏忕粍 Related List",
+  "regions": [
+    {
+      "id": "0e7b0d9f-76f3-4fcc-82dc-c4a0a8b9ff00",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "75fb6a2a-7bfa-4e93-ad09-4a45f9ddeb46",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "26794ab2-dc3a-4fba-878d-81fe5efc5297",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "5bf0540b-4361-4c60-adc2-6f6f5a1dcf53",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-0F9"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230.json" "b/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230.json"
new file mode 100644
index 0000000..2b0acfc
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230.json"
@@ -0,0 +1,81 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:dynamicLayout",
+  "dataProviders": [],
+  "id": "a6d83607-a4bc-4c64-872a-a4d28a96575d",
+  "label": "搴撳瓨",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "background": "background: rgba(0,0,0,0)",
+            "backgroundOverlay": "rgba(0,0,0,0.5)",
+            "contentAreaWidth": 100,
+            "sectionConfig": {
+              "UUID": "70e90603-679b-4e10-9cb4-c92970eb0b6c",
+              "columns": [
+                {
+                  "UUID": "f82e2bbc-5736-4b3f-9b4a-1e22981f6668",
+                  "columnKey": "1",
+                  "columnName": "Column 1",
+                  "columnWidth": "12",
+                  "seedComponents": []
+                }
+              ]
+            },
+            "sectionHeight": 300
+          },
+          "componentName": "forceCommunity:section",
+          "id": "70e90603-679b-4e10-9cb4-c92970eb0b6c",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {},
+                  "componentName": "c:lexinventoryViewLWC",
+                  "id": "9dc8bca9-ca76-4758-b2f3-2d6970644d43",
+                  "renderPriority": "NEUTRAL",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "f82e2bbc-5736-4b3f-9b4a-1e22981f6668",
+              "regionLabel": "Column 1",
+              "regionName": "1",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "6f226eed-af1a-477c-9888-20c0b37db4b0",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "搴撳瓨绠$悊~娑堣�楀搧绠$悊绯荤粺"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "a484eac3-6170-4866-b74f-62e83c39d59e",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a17996d7-1152-4609-8064-b05d5211ee93",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "custom-inventory-view"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json" "b/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json"
new file mode 100644
index 0000000..63da229
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\345\272\223\345\255\230\344\270\212\344\270\213\351\231\220\347\274\226\350\276\221.json"
@@ -0,0 +1,81 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:dynamicLayout",
+  "dataProviders": [],
+  "id": "36bed1a3-91cc-436d-b1f6-398b8082f724",
+  "label": "搴撳瓨涓婁笅闄愮紪杈�",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "background": "background: rgba(0,0,0,0)",
+            "backgroundOverlay": "rgba(0,0,0,0.5)",
+            "contentAreaWidth": 100,
+            "sectionConfig": {
+              "UUID": "c01fae88-8b08-40dd-a166-d4015a1ef6ef",
+              "columns": [
+                {
+                  "UUID": "ce235a8d-f8d3-40fb-be4f-8cd1623b15a8",
+                  "columnKey": "1",
+                  "columnName": "Column 1",
+                  "columnWidth": "12",
+                  "seedComponents": []
+                }
+              ]
+            },
+            "sectionHeight": 300
+          },
+          "componentName": "forceCommunity:section",
+          "id": "c01fae88-8b08-40dd-a166-d4015a1ef6ef",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {},
+                  "componentName": "c:lexProductLimitEdit",
+                  "id": "fabcdda4-3b28-468b-a184-903a7e2173b8",
+                  "renderPriority": "NEUTRAL",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "ce235a8d-f8d3-40fb-be4f-8cd1623b15a8",
+              "regionLabel": "Column 1",
+              "regionName": "1",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "23074b8e-a4a3-491e-a1bc-344dcf42c76b",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "娑堣�楀搧绠$悊绯荤粺"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "4447a437-0906-4337-a289-ba3a707b867b",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "4d226ea4-6f55-4200-bf80-f4708bd4ed73",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "custom-lex-product-limit-edit"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250RelatedList.json"
new file mode 100644
index 0000000..93c6179
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\212\245\350\241\250RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "aa256afb-6656-4526-834f-3706e4a15bca",
+  "label": "鎶ヨ〃 Related List",
+  "regions": [
+    {
+      "id": "4af26569-7a4d-4cbc-baae-3170b22d62e7",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "63b90747-41ce-4d7d-b234-147c1d016018",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "8b705b5b-ecae-45fd-99d0-1abb08214ce0",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "dd232688-98a8-49c5-9304-c3b087346c29",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-00O"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266RelatedList.json"
new file mode 100644
index 0000000..134879b
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\226\207\344\273\266RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "74713a2e-dcbc-464b-a87a-d1231dc118a2",
+  "label": "鏂囦欢 Related List",
+  "regions": [
+    {
+      "id": "cc1adb44-f946-462b-b222-1331cad51921",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "2dca1386-0d3e-471e-b422-cf1b862c1421",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "384d173b-899e-47f8-9828-f4133c314c3e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "3a3a7843-7123-4eb3-89e9-982f4a73fc88",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-069"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\265\201RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\346\265\201RelatedList.json"
new file mode 100644
index 0000000..5a5f512
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\265\201RelatedList.json"
@@ -0,0 +1,27 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "e37f28a6-0d81-44ac-ab4d-5afbb6f43b64",
+  "label": "娴� Related List",
+  "regions": [
+    {
+      "id": "8f851348-e301-458f-8dc1-97317f787fb5",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "d246db26-8cec-4c3c-bebc-4f6cf1559a9e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b3573847-3f67-4e31-a54f-e39688460f38",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-0Fq"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
index d8f5d24..0774402 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\345\210\227\350\241\250.json"
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "293921b6-1a37-49a3-a225-be2f3471a41c",
+  "id": "c331401c-5c71-4d88-9350-c5e8a79202c5",
   "label": "娑堣�楀搧璁㈠崟 鍒楄〃",
   "regions": [
     {
-      "id": "c1c91ef1-d313-4e66-b600-3b5ece7f6488",
+      "id": "9c56ed8b-747d-4b08-8651-5fc2f53ea168",
       "regionName": "header",
       "type": "region"
     },
@@ -14,11 +14,11 @@
       "components": [
         {
           "componentAttributes": {
-            "enableInlineEdit": true,
-            "filterName": "{!filterId}",
+            "enableInlineEdit": false,
+            "filterName": "Overdue",
             "layout": "FULL",
             "pageSize": 25,
-            "scope": "{!objectName}",
+            "scope": "Consumable_order__c",
             "showActionBar": true,
             "showChartsPanel": true,
             "showDisplay": "showall",
@@ -30,18 +30,18 @@
             "showSearchBar": true
           },
           "componentName": "forceCommunity:objectHome",
-          "id": "5a679d55-a414-4a30-9e45-410f58926560",
+          "id": "e91f7d10-dc6c-4a2e-af8c-706f73f7a8cc",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "5b054b02-44fa-4d1a-a233-bc406c227ab1",
+      "id": "f603c8cc-3519-4e8c-a262-eef3a9fe442a",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "93caa3c5-152b-4c37-a27c-6711bafd7493",
+      "id": "4efaa155-2075-4409-82e7-71e9abc62284",
       "regionName": "footer",
       "type": "region"
     }
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
index 651790f..d556f9c 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\347\233\270\345\205\263\345\210\227\350\241\250.json"
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "54811d17-d3d4-47f5-b3a5-a9efd7a62afa",
+  "id": "3dd9b830-a644-429b-8b1c-e2770454179a",
   "label": "娑堣�楀搧璁㈠崟 鐩稿叧鍒楄〃",
   "regions": [
     {
-      "id": "19e75fde-55d3-4d05-ad35-859e9253f3e3",
+      "id": "55e18a02-9472-4658-914e-755e9a83c302",
       "regionName": "header",
       "type": "region"
     },
@@ -23,18 +23,18 @@
             "showRowNumbers": true
           },
           "componentName": "forceCommunity:relatedList",
-          "id": "a56b04ba-b611-4311-b693-60df1d15bc41",
+          "id": "a4e0f988-e956-4c9d-b02c-83866661cf0e",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "b73a78fe-8a2a-495c-a415-0e6b1f3d5bba",
+      "id": "d576983a-e7b9-4910-bf69-4ad5909303da",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "508cdb2d-9f19-489c-88ea-d56da66f3360",
+      "id": "430d0911-909b-499d-9e55-ef40f5e938d0",
       "regionName": "footer",
       "type": "region"
     }
diff --git "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json" "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
index 6e2a0f5..cf01ca2 100644
--- "a/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
+++ "b/force-app/main/default/experiences/Consumable1/views/\346\266\210\350\200\227\345\223\201\350\256\242\345\215\225\350\257\246\347\273\206\344\277\241\346\201\257.json"
@@ -1,12 +1,12 @@
 {
-  "appPageId": "27f1ea49-dcbd-4afc-b1b9-faf0852c745e",
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
   "componentName": "siteforce:sldsOneColLayout",
   "dataProviders": [],
-  "id": "2757e7e7-c2ba-4c5b-9480-4877420e6c40",
+  "id": "bea87922-55fe-41d0-9a2f-6647aa020e56",
   "label": "娑堣�楀搧璁㈠崟 璇︾粏淇℃伅",
   "regions": [
     {
-      "id": "002e3e28-a40b-4f71-924f-b04dbb3aad57",
+      "id": "f3e32491-d89a-467a-97cb-099c98bc5ba1",
       "regionName": "header",
       "type": "region"
     },
@@ -17,7 +17,7 @@
             "recordId": "{!recordId}"
           },
           "componentName": "forceCommunity:recordHeadline",
-          "id": "e347f5d6-b40e-48b3-ad46-ed15d001bfc2",
+          "id": "c7db25b2-0eb2-4e2e-b369-9af45d0c76e0",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
@@ -31,23 +31,23 @@
             "showLegacyActivityComposer": false,
             "tab1Type": "details",
             "tab2Type": "related",
-            "tab3Type": "chatter",
+            "tab3Type": "none",
             "tab4Type": "none",
             "timelineTabLabel": "Activity"
           },
           "componentName": "forceCommunity:recordHomeTabs",
-          "id": "777d94b0-f4e1-4de6-93ff-6b5126fc0ba4",
+          "id": "44e2d9e9-5aa0-437e-b32b-4eea960c1ac9",
           "renderPriority": "NEUTRAL",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "4e4ee28e-35eb-4682-95d4-3279649fa4fe",
+      "id": "d0496ef7-ef71-40b4-8673-c38781880436",
       "regionName": "content",
       "type": "region"
     },
     {
-      "id": "19a87d46-ec32-40b1-b8b5-c4fd0a79b588",
+      "id": "09482c1a-f6b6-422f-9433-6a2fcfd13ddf",
       "regionName": "footer",
       "type": "region"
     },
@@ -60,12 +60,12 @@
             "title": "{!Record._Object}: {!Record._Title}"
           },
           "componentName": "forceCommunity:seoAssistant",
-          "id": "7cf01a81-80f5-40bf-a99a-131727098aea",
+          "id": "fbb0fc4c-2c29-4451-a499-0ac072e7e7e6",
           "renditionMap": {},
           "type": "component"
         }
       ],
-      "id": "5ce72d1c-5178-4e9a-8405-5fb99e32ed6b",
+      "id": "fbe33d47-5a71-489d-8a79-5d95f1a00c3d",
       "regionName": "sfdcHiddenRegion",
       "type": "region"
     }
diff --git "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267List.json" "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267List.json"
new file mode 100644
index 0000000..6c301ff
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267List.json"
@@ -0,0 +1,27 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "ef48fff2-c579-4f2a-971d-251b61fd786e",
+  "label": "鐢ㄦ埛 List",
+  "regions": [
+    {
+      "id": "5cc16b6b-e70e-40bf-aec8-08356b6a7600",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "2c04ab42-66a0-46d7-bbca-286c8fb8f897",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "a93dd703-2f6d-4dac-aba8-70f129d88312",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-005"
+}
diff --git "a/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267RelatedList.json" "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267RelatedList.json"
new file mode 100644
index 0000000..2ea2772
--- /dev/null
+++ "b/force-app/main/default/experiences/Consumable1/views/\347\224\250\346\210\267RelatedList.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "fb9cc21a-bfdf-4b55-b21d-d99514ec9374",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "75664e4d-fe1a-4473-ade4-9dca081ecd40",
+  "label": "鐢ㄦ埛 Related List",
+  "regions": [
+    {
+      "id": "659dcb46-6f82-4ba7-aa1d-5bffa2be7207",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "ba2d5a9d-c5f5-4acc-9112-32bc3c09545c",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "bd425283-dfc5-4681-a46f-121ec05b09a6",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "9b940744-2029-43d1-a108-955231d85e57",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-005"
+}
diff --git a/force-app/main/default/experiences/Partner21.site-meta.xml b/force-app/main/default/experiences/Partner21.site-meta.xml
new file mode 100644
index 0000000..ee33882
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21.site-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ExperienceBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label>Partner2</label>
+    <type>ChatterNetworkPicasso</type>
+</ExperienceBundle>
diff --git a/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json b/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json
new file mode 100644
index 0000000..69318b0
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/brandingSets/partnerCentral.json
@@ -0,0 +1,56 @@
+{
+  "definitionName": "prm:branding-prm-merged",
+  "id": "2bafe70c-3369-45be-8bc4-ae2816db3a7c",
+  "label": "Partner Central",
+  "type": "brandingSet",
+  "values": {
+    "ActionColor": "#0E63AC",
+    "BorderColor": "#D4D4D4",
+    "CardBackgroundColor": "rgba(255, 255, 255, 0)",
+    "CompanyLogo": "",
+    "DetailTextColor": "#5A5A5A",
+    "ErrorFontColor": "#ff9e9e",
+    "HeaderBackgroundColor": "#FFFFFF",
+    "HeaderFonts": "Open Sans",
+    "LinkColor": "#3558D6",
+    "LoginBackgroundColor": "#F4F4F4",
+    "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
+    "NavigationMenuColor": "#1E2443",
+    "NavigationMenuTextColor": "#FFFFFF",
+    "OverlayTextColor": "#FFFFFF",
+    "PageBackgroundColor": "#FFFFFF",
+    "PrimaryFont": "Work Sans",
+    "TextColor": "#222222",
+    "TextTransformStyle": "none",
+    "_ActionColorDarker": "#135F90",
+    "_ActionColorTrans": "rgba(25, 124, 190, 0.9)",
+    "_BackgroundColor1": "rgb(235, 235, 235)",
+    "_BackgroundColor2": "rgb(194, 194, 194)",
+    "_BackgroundColor3": "rgb(133, 133, 133)",
+    "_DxpPageBackgroundColor": "#FFFFFF",
+    "_HeaderInputBackgroundColor": "rgba(255,255,255,.4)",
+    "_HeaderPlaceholderTextColor": "rgba(85,85,85,.8)",
+    "_HeaderTextColor": "rgba(34,34,34,.8)",
+    "_HoverColor": "rgba(25, 124, 190, 0.05)",
+    "_LinkColorDarker": "#135F90",
+    "_NavigationMenuHoverColor": "rgba(255,255,255,.2)",
+    "_NeutralColor": "#ecebea",
+    "_NeutralColor1": "rgb(217, 215, 213)",
+    "_NeutralColor2": "rgb(178, 174, 170)",
+    "_NeutralColor3": "rgb(118, 113, 107)",
+    "_NeutralForegroundColor": "#000",
+    "_NeutralForegroundColor1": "#000",
+    "_NeutralForegroundColor2": "#000",
+    "_NeutralForegroundColor3": "#fff",
+    "_OverlayTextColorShadow": "#000000",
+    "_PrimaryAccentColor1": "rgb(11, 77, 134)",
+    "_PrimaryAccentColor2": "rgb(5, 34, 59)",
+    "_PrimaryAccentColor3": "rgb(0, 0, 0)",
+    "_PrimaryAccentForegroundColor1": "rgb(255, 255, 255)",
+    "_PrimaryAccentForegroundColor2": "rgb(255, 255, 255)",
+    "_PrimaryAccentForegroundColor3": "rgb(255, 255, 255)",
+    "_TextColor1": "rgb(14, 14, 14)",
+    "_TextColor2": "rgb(0, 0, 0)",
+    "_TextColor3": "rgb(0, 0, 0)"
+  }
+}
diff --git a/force-app/main/default/experiences/Partner21/config/languages.json b/force-app/main/default/experiences/Partner21/config/languages.json
new file mode 100644
index 0000000..3a93412
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/config/languages.json
@@ -0,0 +1,6 @@
+{
+  "defaultCode": "en_US",
+  "defaultLabel": "English (US)",
+  "id": "819c8e80-6cf0-49e9-a1d6-345ae45d7a90",
+  "type": "languageContainer"
+}
diff --git a/force-app/main/default/experiences/Partner21/config/loginAppPage.json b/force-app/main/default/experiences/Partner21/config/loginAppPage.json
new file mode 100644
index 0000000..6696d2b
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/config/loginAppPage.json
@@ -0,0 +1,7 @@
+{
+  "cmsSettings": {},
+  "id": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "label": "login",
+  "templateName": "Login Template",
+  "type": "appPage"
+}
diff --git a/force-app/main/default/experiences/Partner21/config/mainAppPage.json b/force-app/main/default/experiences/Partner21/config/mainAppPage.json
new file mode 100644
index 0000000..9de815e
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/config/mainAppPage.json
@@ -0,0 +1,10 @@
+{
+  "cmsSettings": {},
+  "currentThemeId": "18ac5de3-f2b2-40fd-9a94-810f6223e1a1",
+  "headMarkup": null,
+  "id": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "isRelaxedCSPLevel": false,
+  "label": "main",
+  "templateName": "PRM Community Template",
+  "type": "appPage"
+}
diff --git a/force-app/main/default/experiences/Partner21/config/partner2.json b/force-app/main/default/experiences/Partner21/config/partner2.json
new file mode 100644
index 0000000..b9da473
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/config/partner2.json
@@ -0,0 +1,11 @@
+{
+  "forgotPasswordRouteId": "a32b55eb-72d8-4660-8a65-ec40e5dc3abd",
+  "isAvailableToGuests": false,
+  "isFilteredComponentsView": false,
+  "isProgressiveRenderingEnabled": false,
+  "loginAppPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "mainAppPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "preferredDomain": "none",
+  "selfRegistrationRouteId": "580cfa3b-bb16-4945-8e74-7c2dda9cba0c",
+  "type": "site"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/accountManagement.json b/force-app/main/default/experiences/Partner21/routes/accountManagement.json
new file mode 100644
index 0000000..153b6ba
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/accountManagement.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "73ead53d-982c-4218-84a8-b8cbe2b05939",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "51f30ea6-78e9-4149-b251-f8125360315a",
+  "label": "Account Management",
+  "routeType": "account-management",
+  "type": "route",
+  "urlPrefix": "account-management"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/cIC\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/cIC\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..14ddb68
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/cIC\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "d3445d25-786e-4fb4-8d9a-9dd4fdcb902f",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "335429f2-951c-4d1e-bb5e-6a2eaa42be65",
+  "label": "CIC 銉偣銉�",
+  "routeType": "list-500",
+  "type": "route",
+  "urlPrefix": "case"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..8475dd1
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "bef54924-1293-4a23-a8c1-c97ddc81b694",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "0dd0e835-aa8b-4309-a1ca-bc05e658877a",
+  "label": "CIC 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-500",
+  "type": "route",
+  "urlPrefix": "case"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/campaignList.json b/force-app/main/default/experiences/Partner21/routes/campaignList.json
new file mode 100644
index 0000000..93d3a5c
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/campaignList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "a8f90e92-695a-4455-9d74-59268e559b6f",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "3e1ec945-7b12-41d6-891a-3b92c996fbd2",
+  "label": "Campaign List",
+  "routeType": "list-701",
+  "type": "route",
+  "urlPrefix": "campaign"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/caseDetail.json b/force-app/main/default/experiences/Partner21/routes/caseDetail.json
new file mode 100644
index 0000000..be6a05b
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/caseDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "31166d77-4e5c-4bb8-9256-d2ab6ac88944",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "9f298cb4-b31d-43e1-870d-328644dac746",
+  "label": "Case Detail",
+  "routeType": "detail-500",
+  "type": "route",
+  "urlPrefix": "case"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/checkPassword.json b/force-app/main/default/experiences/Partner21/routes/checkPassword.json
new file mode 100644
index 0000000..52b8a3d
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/checkPassword.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "93eba445-abcb-402d-807a-17793aede814",
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "id": "8682c9b4-ec5d-4d2b-a60d-0a241eeb66b8",
+  "label": "Check Password",
+  "routeType": "check-password",
+  "type": "route",
+  "urlPrefix": "CheckPasswordResetEmail"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/contactSupport.json b/force-app/main/default/experiences/Partner21/routes/contactSupport.json
new file mode 100644
index 0000000..78fd809
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/contactSupport.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "5960b934-e0b0-4c75-a297-71843d6b25d1",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "93c4747d-62d3-4166-a9b4-115b6640ac76",
+  "label": "Contact Support",
+  "pageAccess": "UseParent",
+  "routeType": "contactsupport",
+  "type": "route",
+  "urlPrefix": "contactsupport"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/createRecord.json b/force-app/main/default/experiences/Partner21/routes/createRecord.json
new file mode 100644
index 0000000..223578c
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/createRecord.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "a7dcd30a-fcf7-436e-9319-602f77df9596",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "f8c4cb05-f669-485b-8a5f-5bebe9249cd0",
+  "label": "Create Record",
+  "routeType": "createrecord",
+  "type": "route",
+  "urlPrefix": "createrecord"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/dashboardDetail.json b/force-app/main/default/experiences/Partner21/routes/dashboardDetail.json
new file mode 100644
index 0000000..79cb26d
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/dashboardDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "b3170d2d-dc66-4e6d-a921-7278926fbf83",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "3504379f-73f4-4df7-97b0-f76e423ed581",
+  "label": "Dashboard Detail",
+  "routeType": "detail-01Z",
+  "type": "route",
+  "urlPrefix": "dashboard"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/dashboardList.json b/force-app/main/default/experiences/Partner21/routes/dashboardList.json
new file mode 100644
index 0000000..a4a6290
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/dashboardList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "ce1cde06-6dcb-4da1-a5c9-7b2b099ddebb",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "76b4a2a7-fb5d-48b5-b4f8-87959b076fe4",
+  "label": "Dashboard List",
+  "routeType": "list-01Z",
+  "type": "route",
+  "urlPrefix": "dashboard"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/error.json b/force-app/main/default/experiences/Partner21/routes/error.json
new file mode 100644
index 0000000..d84a02a
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/error.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "a4b25394-ceb2-44ff-b562-067f8854d1c1",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "00fbcecf-a9bf-48af-9fb8-b9c481adf31f",
+  "label": "Error",
+  "pageAccess": "UseParent",
+  "routeType": "error",
+  "type": "route",
+  "urlPrefix": "error"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/feedDetail.json b/force-app/main/default/experiences/Partner21/routes/feedDetail.json
new file mode 100644
index 0000000..0f84119
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/feedDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "983bfa20-13c3-42fb-a95e-1db14fb5340d",
+  "label": "Feed Detail",
+  "routeType": "feeditem-generic",
+  "type": "route",
+  "urlPrefix": "feed"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/fileDetail.json b/force-app/main/default/experiences/Partner21/routes/fileDetail.json
new file mode 100644
index 0000000..44d3632
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/fileDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "5a4b2af7-b7b8-45c6-abc7-bf66bb847a7d",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "2a4fbb36-a668-4782-9a2b-a6aa402e8ec9",
+  "label": "File Detail",
+  "routeType": "detail-069",
+  "type": "route",
+  "urlPrefix": "contentdocument"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/fileList.json b/force-app/main/default/experiences/Partner21/routes/fileList.json
new file mode 100644
index 0000000..be855b3
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/fileList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "2df51d40-f4c7-4917-b90b-e435c1d6a14e",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "e0659f99-76b5-4fce-a436-4037e570bc8a",
+  "label": "File List",
+  "routeType": "list-069",
+  "type": "route",
+  "urlPrefix": "contentdocument"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/flow.json b/force-app/main/default/experiences/Partner21/routes/flow.json
new file mode 100644
index 0000000..d1dff73
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/flow.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "87c1c576-6744-474b-9e97-f16fc38fe2bb",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "b45aa6b5-4c24-4c68-acf5-d6b60dbf6972",
+  "label": "Flow",
+  "pageAccess": "UseParent",
+  "routeType": "flow",
+  "type": "route",
+  "urlPrefix": "flow"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/forgotPassword.json b/force-app/main/default/experiences/Partner21/routes/forgotPassword.json
new file mode 100644
index 0000000..a3ffd87
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/forgotPassword.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "c97e5e6e-dc54-450d-9151-4a62fb2e007c",
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "id": "a32b55eb-72d8-4660-8a65-ec40e5dc3abd",
+  "label": "Forgot Password",
+  "routeType": "forgot-password",
+  "type": "route",
+  "urlPrefix": "ForgotPassword"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/groupDetail.json b/force-app/main/default/experiences/Partner21/routes/groupDetail.json
new file mode 100644
index 0000000..56457fd
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/groupDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "1e79f9ca-bc4c-4e37-b6b7-6abfebba388a",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "478b821a-de35-441e-b6a8-eb97f8e82381",
+  "label": "Group Detail",
+  "routeType": "detail-0F9",
+  "type": "route",
+  "urlPrefix": "group"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/groupList.json b/force-app/main/default/experiences/Partner21/routes/groupList.json
new file mode 100644
index 0000000..401eac5
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/groupList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "11907c7a-7b32-438d-94d9-27f526ea69a6",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "158ea18b-cdf0-465a-9ca9-35a7028b9dab",
+  "label": "Group List",
+  "routeType": "list-0F9",
+  "type": "route",
+  "urlPrefix": "group"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/home.json b/force-app/main/default/experiences/Partner21/routes/home.json
new file mode 100644
index 0000000..170e283
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/home.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "4fa3fa38-4d0f-4247-9f1d-cccfa436763a",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "d637320e-1e70-48e6-8e98-0fda4b808781",
+  "label": "Home",
+  "pageAccess": "UseParent",
+  "routeType": "home",
+  "type": "route",
+  "urlPrefix": ""
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/login.json b/force-app/main/default/experiences/Partner21/routes/login.json
new file mode 100644
index 0000000..e030a0d
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/login.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "6a024f98-3cde-4f9a-8648-4fd1e841d503",
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "id": "537d03d3-4bd8-4207-bf3f-0309e45225e5",
+  "label": "Login",
+  "routeType": "login-home",
+  "type": "route",
+  "urlPrefix": ""
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/loginError.json b/force-app/main/default/experiences/Partner21/routes/loginError.json
new file mode 100644
index 0000000..6e17a67
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/loginError.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "8da2d7f7-7500-4481-bad7-50d7a131e76e",
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "id": "3d15f08c-42ed-4275-9d4e-f280c7a65755",
+  "label": "Login Error",
+  "routeType": "login-error",
+  "type": "route",
+  "urlPrefix": "error"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/mDFAndCoop.json b/force-app/main/default/experiences/Partner21/routes/mDFAndCoop.json
new file mode 100644
index 0000000..ea904be
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/mDFAndCoop.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "9c5c1b27-82e3-433b-b987-a98a033bc129",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "3263e290-ebd2-42ee-80be-6295d0d63d57",
+  "label": "MDF and Coop",
+  "routeType": "mdf",
+  "type": "route",
+  "urlPrefix": "mdf"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/messages.json b/force-app/main/default/experiences/Partner21/routes/messages.json
new file mode 100644
index 0000000..f8458cf
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/messages.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "295d4564-bf29-48ed-b213-e39c211fcca0",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "82ae3bda-5f70-4539-ad6f-eb0cde64cf5a",
+  "label": "Messages",
+  "routeType": "messages",
+  "type": "route",
+  "urlPrefix": "messages"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/myAccount.json b/force-app/main/default/experiences/Partner21/routes/myAccount.json
new file mode 100644
index 0000000..0d1ec36
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/myAccount.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "4f2502be-3471-4328-98e2-65da8b475fba",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "5c4c7d56-84cd-449f-b860-2ae61fc89b74",
+  "label": "My Account",
+  "routeType": "my-account",
+  "type": "route",
+  "urlPrefix": "comm-my-account"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/questionDetail.json b/force-app/main/default/experiences/Partner21/routes/questionDetail.json
new file mode 100644
index 0000000..54646b2
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/questionDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "bf327277-7072-4df9-90f8-29eb8b39b81d",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "0b618e15-dbc6-410f-8510-af7b6a02aa5b",
+  "label": "Question Detail",
+  "routeType": "feeditem",
+  "type": "route",
+  "urlPrefix": "question"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/quipDocsRelatedList.json b/force-app/main/default/experiences/Partner21/routes/quipDocsRelatedList.json
new file mode 100644
index 0000000..8c23673
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/quipDocsRelatedList.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "7bb87352-7c83-46dd-ad49-c8f579c0b0fc",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "229ba801-02bf-47dd-83ab-2f7fec1676d1",
+  "label": "Quip Docs Related List",
+  "pageAccess": "UseParent",
+  "routeType": "extrelated-quip",
+  "type": "route",
+  "urlPrefix": "quip"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/recordDetail.json b/force-app/main/default/experiences/Partner21/routes/recordDetail.json
new file mode 100644
index 0000000..02a5544
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/recordDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "07b95556-b1a0-4d51-9ad9-912c6af1d763",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "e792d445-e6fb-4c3a-8d31-8d9053e06715",
+  "label": "Record Detail",
+  "routeType": "detail",
+  "type": "route",
+  "urlPrefix": "detail"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/recordList.json b/force-app/main/default/experiences/Partner21/routes/recordList.json
new file mode 100644
index 0000000..5eaf04b
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/recordList.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "c0dfcf8e-1f28-474c-ba52-6824250808ec",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "09d17516-4c41-480c-86da-3862cacd8641",
+  "label": "Record List",
+  "pageAccess": "UseParent",
+  "routeType": "list",
+  "type": "route",
+  "urlPrefix": "recordlist"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/register.json b/force-app/main/default/experiences/Partner21/routes/register.json
new file mode 100644
index 0000000..6cd5d31
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/register.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "43c8d59e-3839-4334-aedf-f3d9c6af1843",
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "id": "580cfa3b-bb16-4945-8e74-7c2dda9cba0c",
+  "label": "Register",
+  "routeType": "self-register",
+  "type": "route",
+  "urlPrefix": "SelfRegister"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/relatedRecordList.json b/force-app/main/default/experiences/Partner21/routes/relatedRecordList.json
new file mode 100644
index 0000000..0c95d61
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/relatedRecordList.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "525210ce-dc91-4637-8aad-dcc79ef5149c",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "d0db632e-1566-4cf0-9705-97344981881a",
+  "label": "Related Record List",
+  "pageAccess": "UseParent",
+  "routeType": "relatedlist",
+  "type": "route",
+  "urlPrefix": "relatedlist"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/reportBuilder.json b/force-app/main/default/experiences/Partner21/routes/reportBuilder.json
new file mode 100644
index 0000000..088877b
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/reportBuilder.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "24910809-77c3-4ea5-80c3-ea0db9afb5de",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "11651c0d-08d4-4516-b3aa-2e0aa2bf2ce4",
+  "label": "Report Builder",
+  "routeType": "createreport",
+  "type": "route",
+  "urlPrefix": "createreport"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/reportDetail.json b/force-app/main/default/experiences/Partner21/routes/reportDetail.json
new file mode 100644
index 0000000..caa31f7
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/reportDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "621a5818-46f1-42c5-9717-fc999ba75df9",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "62c0d91e-c673-4640-9e5b-0f86093b731a",
+  "label": "Report Detail",
+  "routeType": "detail-00O",
+  "type": "route",
+  "urlPrefix": "report"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/reportList.json b/force-app/main/default/experiences/Partner21/routes/reportList.json
new file mode 100644
index 0000000..bd97df3
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/reportList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "94db8a50-134d-4517-bddc-eb54dc151c59",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "a6c91f42-2b88-4b55-801a-62126c85bc28",
+  "label": "Report List",
+  "routeType": "list-00O",
+  "type": "route",
+  "urlPrefix": "report"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/resources.json b/force-app/main/default/experiences/Partner21/routes/resources.json
new file mode 100644
index 0000000..26e55dd
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/resources.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "fe6b6a28-688d-44ad-921f-8ad8124e9a5d",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "5a522dfa-a384-4731-b742-7bdb27788f7c",
+  "label": "Resources",
+  "pageAccess": "UseParent",
+  "routeType": "files",
+  "type": "route",
+  "urlPrefix": "files"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/search.json b/force-app/main/default/experiences/Partner21/routes/search.json
new file mode 100644
index 0000000..5ef27cf
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/search.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "858b90d6-5f26-4a9a-9080-746e17a9f4b5",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "1b06bb4e-f96b-4a4b-a632-1c2f87338fcc",
+  "label": "Search",
+  "pageAccess": "UseParent",
+  "routeType": "global-search",
+  "type": "route",
+  "urlPrefix": "global-search"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/streamDetail.json b/force-app/main/default/experiences/Partner21/routes/streamDetail.json
new file mode 100644
index 0000000..5f855f7
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/streamDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "ef1f7586-66a3-4110-80c5-073271e404e6",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "10ad641a-4dac-4a97-907b-9829dbb0f4fa",
+  "label": "Stream Detail",
+  "routeType": "detail-0Fq",
+  "type": "route",
+  "urlPrefix": "streams"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/streamList.json b/force-app/main/default/experiences/Partner21/routes/streamList.json
new file mode 100644
index 0000000..3a61db6
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/streamList.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "ee631fe0-502b-4dfe-ac53-311079fadd89",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "af6eccfe-1bc5-469a-b6ad-ab3e909c8d67",
+  "label": "Stream List",
+  "routeType": "list-0Fq",
+  "type": "route",
+  "urlPrefix": "streams"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/topicCatalog.json b/force-app/main/default/experiences/Partner21/routes/topicCatalog.json
new file mode 100644
index 0000000..b3f720c
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/topicCatalog.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "d006b952-023c-4964-88f1-151e2b013a67",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "d5e7e488-a9f0-478d-a0ec-521beb1fae74",
+  "label": "Topic Catalog",
+  "pageAccess": "UseParent",
+  "routeType": "topic-catalog",
+  "type": "route",
+  "urlPrefix": "topiccatalog"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/topicDetail.json b/force-app/main/default/experiences/Partner21/routes/topicDetail.json
new file mode 100644
index 0000000..20b6955
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/topicDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "38e59688-3353-4124-b571-862a162dff11",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "c6ad2c0d-3c7d-4e9e-b4c7-dae3cba30ced",
+  "label": "Topic Detail",
+  "routeType": "topic",
+  "type": "route",
+  "urlPrefix": "topic"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/userProfile.json b/force-app/main/default/experiences/Partner21/routes/userProfile.json
new file mode 100644
index 0000000..1fcc151
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/userProfile.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "4053070a-c5f6-483a-b96a-0ac64d32bfc6",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "9f4260e2-fbc6-42b4-bebe-8886bcd55e66",
+  "label": "User Profile",
+  "routeType": "detail-005",
+  "type": "route",
+  "urlPrefix": "profile"
+}
diff --git a/force-app/main/default/experiences/Partner21/routes/userSettings.json b/force-app/main/default/experiences/Partner21/routes/userSettings.json
new file mode 100644
index 0000000..51f6b5e
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/routes/userSettings.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "3d201ab3-fa88-4304-85c5-c338df54401e",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "9d004b4f-2a89-4e4a-980c-f62b28536266",
+  "label": "User Settings",
+  "routeType": "usersettings",
+  "type": "route",
+  "urlPrefix": "settings"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..70b1754
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "b8dd7d14-b832-40b7-9081-a684d75e13c4",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "6e023302-b965-457c-b4c9-8a4b5dca7bb0",
+  "label": "浠〃鏉� 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-01Z",
+  "type": "route",
+  "urlPrefix": "dashboard"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
new file mode 100644
index 0000000..eb93e20
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "85625454-b547-4267-8193-1220b85224c0",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "abcbe601-f39b-4f61-8a9b-297688232ea7",
+  "label": "瀛︿細銉诲煿璁� 瑭崇窗",
+  "routeType": "detail-701",
+  "type": "route",
+  "urlPrefix": "campaign"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..4c030ed
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "c151821c-4405-4da0-b2dd-279fbb65bd86",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "2e701358-38dd-4068-b3ab-8d91cac9d359",
+  "label": "瀛︿細銉诲煿璁� 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-701",
+  "type": "route",
+  "urlPrefix": "campaign"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..2f5645a
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "5ca84e92-f681-451a-a465-c9ad81c9e4f4",
+  "label": "灏忕粍 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-0F9",
+  "type": "route",
+  "urlPrefix": "group"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..bb6005c
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "217b4959-2595-4925-825f-0e46a2edf850",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "77fd078e-cd8f-476e-8bd7-556f21ad97d7",
+  "label": "鎶ヨ〃 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-00O",
+  "type": "route",
+  "urlPrefix": "report"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..1a9aa79
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "972321da-7487-4d80-afa0-7731e16694d9",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "9592b508-4ea1-44a3-90fd-83881462ac86",
+  "label": "鏂囦欢 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-069",
+  "type": "route",
+  "urlPrefix": "contentdocument"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..45fc2cc
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "cc7589b2-7f8c-4682-9007-5aa6a8b4c110",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "905b3765-bfbf-4204-9356-e13233d56dd7",
+  "label": "娴� 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-0Fq",
+  "type": "route",
+  "urlPrefix": "streams"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..dd07f31
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "33b1c4cb-6778-4461-9977-a79f65eb2665",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "bc57eb02-e26e-4855-86b9-bd3369fddb36",
+  "label": "鐢ㄦ埛 銉偣銉�",
+  "routeType": "list-005",
+  "type": "route",
+  "urlPrefix": "profile"
+}
diff --git "a/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..2e37b67
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/routes/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "e627e296-efd0-45d5-87ed-ea680a2015b0",
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "id": "1729dcc7-2e1c-4232-8df1-1aaf533f87b6",
+  "label": "鐢ㄦ埛 闁㈤�c儶銈广儓",
+  "routeType": "relatedlist-005",
+  "type": "route",
+  "urlPrefix": "profile"
+}
diff --git a/force-app/main/default/experiences/Partner21/themes/partnerCentral.json b/force-app/main/default/experiences/Partner21/themes/partnerCentral.json
new file mode 100644
index 0000000..227072a
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/themes/partnerCentral.json
@@ -0,0 +1,180 @@
+{
+  "activeBrandingSetId": "2bafe70c-3369-45be-8bc4-ae2816db3a7c",
+  "customCSS": "",
+  "developerName": "prm",
+  "id": "18ac5de3-f2b2-40fd-9a94-810f6223e1a1",
+  "label": "Partner Central",
+  "layouts": {
+    "Inner": "711e306b-2592-417d-831a-472636179fe5",
+    "Login": "b81dea57-c4df-4a1f-9c8a-bf2b8e8e6c93",
+    "ServiceNotAvailable": "964c1332-6afa-42a3-954d-244ecef6afb6"
+  },
+  "type": "theme",
+  "views": [
+    {
+      "componentAttributes": {},
+      "componentName": "salesforceIdentity:loginBody2",
+      "id": "b81dea57-c4df-4a1f-9c8a-bf2b8e8e6c93",
+      "label": "Login",
+      "regions": [
+        {
+          "id": "1c505db0-1022-4a27-8ae1-2d2b6b993a46",
+          "regionName": "header",
+          "type": "region"
+        },
+        {
+          "id": "f8e77897-363b-4d07-bfd6-4c249730578d",
+          "regionName": "content",
+          "type": "region"
+        },
+        {
+          "id": "cade8788-fc75-4f2b-87c6-2e2bef131b51",
+          "regionName": "footer",
+          "type": "region"
+        }
+      ],
+      "type": "view"
+    },
+    {
+      "componentAttributes": {
+        "IsDefaultHeaderHidden": false,
+        "IsDefaultHeaderPositionFixed": true,
+        "IsDefaultNotificationsHidden": false,
+        "IsSearchBarHidden": false,
+        "fixedPageWidth": 1440,
+        "isPageWidthFixed": true
+      },
+      "componentName": "siteforce:prmBody",
+      "id": "711e306b-2592-417d-831a-472636179fe5",
+      "label": "Default",
+      "regions": [
+        {
+          "id": "cd2ea61d-578b-4275-ac18-3eb3bcd7133d",
+          "regionName": "customHeader",
+          "type": "region"
+        },
+        {
+          "components": [
+            {
+              "componentAttributes": {
+                "maxAutoCompleteResults": 5,
+                "searchLabel": "Search...",
+                "searchObjects": [
+                  {
+                    "isPublic": false,
+                    "name": "Lead"
+                  },
+                  {
+                    "isPublic": false,
+                    "name": "Opportunity"
+                  },
+                  {
+                    "isPublic": false,
+                    "name": "Campaign"
+                  },
+                  {
+                    "isPublic": false,
+                    "name": "ContentDocument"
+                  }
+                ]
+              },
+              "componentName": "forceCommunity:globalSearchInput",
+              "id": "8aa62845-0beb-4f33-83b8-42dbef6cd97e",
+              "renditionMap": {},
+              "type": "component"
+            }
+          ],
+          "id": "0b7f9984-948c-438f-a720-16b84d3fa138",
+          "regionName": "search",
+          "type": "region"
+        },
+        {
+          "components": [
+            {
+              "componentAttributes": {
+                "accountManagementLabel": "Account Management",
+                "communityBuilderLabel": "Experience Builder",
+                "communitySetupLabel": "Salesforce Setup",
+                "contactSupportLabel": "Contact Support",
+                "filterName": "MyCases",
+                "homeLabel": "Home",
+                "includeContactSupport": false,
+                "includeMessages": false,
+                "loginLabel": "Login",
+                "logoutLabel": "Logout",
+                "myAccountLabel": "My Account",
+                "showAccountManagement": true,
+                "showUserSettings": false,
+                "userSettingsLabel": "My Settings",
+                "viewProfileLabel": "My Profile"
+              },
+              "componentName": "selfService:userProfileMenu",
+              "id": "467d5832-3fbf-4f0c-9ef8-7938bc92eb8f",
+              "renditionMap": {},
+              "type": "component"
+            }
+          ],
+          "id": "aa801fc2-3559-4e32-8e13-61c430053451",
+          "regionName": "profileMenu",
+          "type": "region"
+        },
+        {
+          "components": [
+            {
+              "componentAttributes": {
+                "NavigationMenuEditorRefresh": "Default_Navigation4",
+                "hideAppLauncher": true,
+                "hideHomeText": true
+              },
+              "componentName": "forceCommunity:globalNavigation",
+              "id": "cf7112d5-3ad4-4276-9647-7e6d7cba8037",
+              "renditionMap": {},
+              "type": "component"
+            }
+          ],
+          "id": "bdcf6726-5007-42ab-8e9d-3ce8d751e309",
+          "regionName": "navBar",
+          "type": "region"
+        },
+        {
+          "id": "1f9efb2d-a25d-47a7-9529-68f578b350d1",
+          "regionName": "customRegion",
+          "type": "region"
+        },
+        {
+          "id": "d2899bfc-caae-4999-8ac3-43dadd330ca3",
+          "regionName": "footer",
+          "type": "region"
+        }
+      ],
+      "type": "view"
+    },
+    {
+      "componentAttributes": {
+        "fixedPageWidth": 1170,
+        "headerBgColor": "rgba(0, 0, 0, 0)",
+        "isHeaderPinned": false,
+        "isHeroUnderHeader": false,
+        "isPageWidthFixed": true,
+        "showHeader": true,
+        "showHero": true
+      },
+      "componentName": "siteforce:themeLayoutStarter",
+      "id": "964c1332-6afa-42a3-954d-244ecef6afb6",
+      "label": "ServiceNotAvailable",
+      "regions": [
+        {
+          "id": "1e628a8b-dbce-4b06-9819-9f5d55ebf4d7",
+          "regionName": "themeHeader",
+          "type": "region"
+        },
+        {
+          "id": "ddd8e1cd-a5c8-45ae-adf4-9dce674b2eb8",
+          "regionName": "themeFooter",
+          "type": "region"
+        }
+      ],
+      "type": "view"
+    }
+  ]
+}
diff --git a/force-app/main/default/experiences/Partner21/views/accountManagement.json b/force-app/main/default/experiences/Partner21/views/accountManagement.json
new file mode 100644
index 0000000..a762fef
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/accountManagement.json
@@ -0,0 +1,153 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "73ead53d-982c-4218-84a8-b8cbe2b05939",
+  "label": "Account Management",
+  "regions": [
+    {
+      "id": "75ac8442-9b04-4609-a05e-8042dd4c3c8c",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Account Management</b>             </h1>             "
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "e9e11296-fe3c-4a5f-8479-ce8bf05d84f4",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "tabsetConfig": {
+              "UUID": "3dee618e-f330-4db7-b062-566ceab31c3d",
+              "activeTab": "tab1",
+              "tabs": [
+                {
+                  "UUID": "8febda41-31c1-4c7f-a232-d72af9d9d82b",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "customTitle": "Members",
+                        "parentRecordId": "{!CurrentUser.accountId}",
+                        "relatedListName": "Users",
+                        "showBreadCrumbs": "false",
+                        "showCustomTitle": "true",
+                        "showManualRefreshButton": "false",
+                        "showRowNumbers": "false"
+                      },
+                      "fqn": "forceCommunity:relatedList"
+                    }
+                  ],
+                  "tabKey": "tab1",
+                  "tabName": "Members"
+                },
+                {
+                  "UUID": "340431ae-d9ab-43e9-a819-4e88af0dd59b",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "recordId": "{!CurrentUser.accountId}"
+                      },
+                      "fqn": "forceCommunity:accountBrandRecord"
+                    }
+                  ],
+                  "tabKey": "tab2",
+                  "tabName": "Branding"
+                }
+              ],
+              "useOverflowMenu": false
+            }
+          },
+          "componentName": "forceCommunity:tabset",
+          "id": "3dee618e-f330-4db7-b062-566ceab31c3d",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "customTitle": "Members",
+                    "parentRecordId": "{!CurrentUser.accountId}",
+                    "relatedListName": "Users",
+                    "showBreadCrumbs": false,
+                    "showCustomTitle": true,
+                    "showManualRefreshButton": false,
+                    "showRowNumbers": false
+                  },
+                  "componentName": "forceCommunity:relatedList",
+                  "id": "8e782b1a-94c9-474e-9f8c-d5eed815de8b",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "8febda41-31c1-4c7f-a232-d72af9d9d82b",
+              "regionLabel": "Members",
+              "regionName": "tab1",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "recordId": "{!CurrentUser.accountId}"
+                  },
+                  "componentName": "forceCommunity:accountBrandRecord",
+                  "id": "b70b8cab-ba82-44f6-8a0b-3c2357e0a4a0",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "340431ae-d9ab-43e9-a819-4e88af0dd59b",
+              "regionLabel": "Branding",
+              "regionName": "tab2",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "58411304-a141-4fff-8466-d12b6d97fe55",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "94dc5f2a-03f3-41af-b034-6e7dbd42a631",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Account Management"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "4e836585-1ed3-4251-8956-86786bb266c8",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "249afd16-fd9e-491a-9a22-7973fecb8a36",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "account-management"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/cIC\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/cIC\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..3b8330c
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/cIC\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,52 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "d3445d25-786e-4fb4-8d9a-9dd4fdcb902f",
+  "label": "CIC 銉偣銉�",
+  "regions": [
+    {
+      "id": "ee519ce3-035e-431b-b852-753a14d979b1",
+      "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
+          },
+          "componentName": "forceCommunity:objectHome",
+          "id": "f8a925b7-5b82-48da-a031-b8028153450f",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ffdd7020-bd29-4500-a19d-26b1ab110a8e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "6a08e347-3c78-4891-b591-035928adcbc3",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-500"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..e9f0cc5
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/cIC\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "bef54924-1293-4a23-a8c1-c97ddc81b694",
+  "label": "CIC 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "69e890aa-f351-4bc0-890c-47f11a325dfe",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "2c201e26-885d-41fa-980b-c3c3257b1190",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "22569f37-1aec-4b2a-b6db-2fd9e81de53e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b7b67c9f-f344-410e-a68f-fb7568922a02",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-500"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/campaignList.json b/force-app/main/default/experiences/Partner21/views/campaignList.json
new file mode 100644
index 0000000..5a489c3
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/campaignList.json
@@ -0,0 +1,150 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "a8f90e92-695a-4455-9d74-59268e559b6f",
+  "label": "Campaign List",
+  "regions": [
+    {
+      "id": "ce731825-682f-460a-adcf-d63dd3e9d804",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "tabsetConfig": {
+              "UUID": "9cb80b7f-c41e-4ada-b99c-5daa8767bc67",
+              "activeTab": "tab1",
+              "tabs": [
+                {
+                  "UUID": "e76921bf-811e-4705-9780-cbdeb84f7fd6",
+                  "allowGuestUser": true,
+                  "locked": false,
+                  "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": "6fb107ce-204f-4a5b-aa66-1e54823626e0",
+                  "allowGuestUser": true,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "filterName": "Recent",
+                        "scope": "Campaign"
+                      },
+                      "fqn": "forceCommunity:objectHome"
+                    }
+                  ],
+                  "tabKey": "tab2",
+                  "tabName": "All Campaigns"
+                }
+              ],
+              "useOverflowMenu": false
+            }
+          },
+          "componentName": "forceCommunity:tabset",
+          "id": "9cb80b7f-c41e-4ada-b99c-5daa8767bc67",
+          "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": "37d2fc89-1b66-4ddc-b639-1f378680fda1",
+                  "renditionMap": {},
+                  "type": "component"
+                },
+                {
+                  "componentAttributes": {
+                    "bodyField": "Description",
+                    "categoryField": "__",
+                    "dataFieldsConfig": "",
+                    "highlight": "__",
+                    "highlightColor": "#007DB8",
+                    "listLabel": "",
+                    "listViewName": "GIRctiveCampaignsR",
+                    "showImage": true,
+                    "sortBy": "Num__c",
+                    "sortOrder": "Ascending",
+                    "titleField": "Name"
+                  },
+                  "componentName": "forceCommunity:campaignTileList",
+                  "id": "0fc28447-8e4a-4497-a6f9-8a675c02fa1b",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "e76921bf-811e-4705-9780-cbdeb84f7fd6",
+              "regionLabel": "Campaign Marketplace",
+              "regionName": "tab1",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "enableInlineEdit": true,
+                    "filterName": "Recent",
+                    "layout": "FULL",
+                    "pageSize": 25,
+                    "scope": "Campaign",
+                    "showActionBar": true,
+                    "showChartsPanel": true,
+                    "showDisplay": "showall",
+                    "showFilterPanel": true,
+                    "showImageIcon": true,
+                    "showManualRefreshButton": true,
+                    "showObjectName": true,
+                    "showPinnedList": true,
+                    "showSearchBar": true
+                  },
+                  "componentName": "forceCommunity:objectHome",
+                  "id": "35151a2f-b5cb-4df5-a822-f57b70823ab3",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "6fb107ce-204f-4a5b-aa66-1e54823626e0",
+              "regionLabel": "All Campaigns",
+              "regionName": "tab2",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "1496147b-f700-4aac-8d23-2b5753367987",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1f8988cb-ce2b-4042-b3c9-23bb8cca7de8",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-701"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/caseDetail.json b/force-app/main/default/experiences/Partner21/views/caseDetail.json
new file mode 100644
index 0000000..b2cc1b9
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/caseDetail.json
@@ -0,0 +1,76 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "31166d77-4e5c-4bb8-9256-d2ab6ac88944",
+  "label": "Case Detail",
+  "regions": [
+    {
+      "id": "f4ea7f26-8780-4827-81e0-276ab1bf71ae",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "6e9dd3cc-f9ef-4bf6-9558-a48e1251b915",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "discussionsTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related",
+            "showLegacyActivityComposer": false,
+            "tab1Type": "details",
+            "tab2Type": "related",
+            "tab3Type": "chatter",
+            "tab4Type": "none",
+            "timelineTabLabel": "Activity"
+          },
+          "componentName": "forceCommunity:recordHomeTabs",
+          "id": "f28ca3a2-1a35-4fd5-9f39-a573ebb0bc22",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c0943f43-9565-410e-a804-ae56600c4715",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "083009eb-5078-400f-8e91-47eec449125f",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "62d4e06a-96b5-4fd3-bb06-06d430b102fb",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a3e0bc10-2e00-4d45-bdc4-f28669bc4874",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-500"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/checkPassword.json b/force-app/main/default/experiences/Partner21/views/checkPassword.json
new file mode 100644
index 0000000..d93b8cc
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/checkPassword.json
@@ -0,0 +1,67 @@
+{
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "93eba445-abcb-402d-807a-17793aede814",
+  "label": "Check Password",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "35058217-b6a5-4217-8a59-2c11a2925c76",
+          "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>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "04b07c60-f55b-4727-a4f0-39b0d497425b",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><a class=\"inverseTextColor\" href=\"./\">Back to login</a></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "30f22127-2521-4799-a201-e59573456a4f",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "454da39d-f19a-4f9f-ba16-db2e6804e95e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Check Password"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "3ecbc87a-69b0-4542-9710-72336d4e71ff",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "56694f02-935a-4f10-bcc8-b0878436d140",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Login",
+  "type": "view",
+  "viewType": "check-password"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/contactSupport.json b/force-app/main/default/experiences/Partner21/views/contactSupport.json
new file mode 100644
index 0000000..331768b
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/contactSupport.json
@@ -0,0 +1,106 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsTwoCol66Layout",
+  "dataProviders": [],
+  "id": "5960b934-e0b0-4c75-a297-71843d6b25d1",
+  "label": "Contact Support",
+  "regions": [
+    {
+      "id": "b8447668-18e2-4318-8ea4-53c960c1555c",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "allowAttachments": true,
+            "attachmentLabel": "Upload File",
+            "buttonAlignment": "center",
+            "buttonBgColor": "",
+            "buttonBgHoverColor": "",
+            "buttonBorderColor": "",
+            "buttonMaxWidth": "",
+            "buttonRadius": 0,
+            "buttonTextColor": "",
+            "buttonTextHoverColor": "",
+            "callToAction": false,
+            "callToActionButtonText": "",
+            "callToActionText": "",
+            "callToActionUrl": "",
+            "confirmationSubtext": "We鈥檒l get back to you soon.",
+            "confirmationText": "Your case was created.",
+            "guestQuickActionName": "閫夋嫨鎴栭厤缃叏灞�鎿嶄綔",
+            "headerSubtitle": "Tell us how we can help.",
+            "headerTitle": "Contact Customer Support",
+            "isMicrobatch": false,
+            "quickActionName": "",
+            "requestSummaryText": "Case summary"
+          },
+          "componentName": "forceCommunity:contactSupportForm",
+          "id": "07161c69-c942-4786-8014-4f067a980af0",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "e638cb6e-2768-44b5-9aeb-0c33bf5cccf7",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "askConfirmationQuestion": true,
+            "confirmationMessageLabel": "Got it!",
+            "deflectionSubtitle": "Find what you need here.",
+            "deflectionTitle": "Need Answers Fast?",
+            "firstQuestion": "Did this content solve your issue?",
+            "maxResults": 6,
+            "measureDeflection": true,
+            "redirectUrl": "",
+            "secondQuestion": "Stop creating your case?",
+            "showArticles": true,
+            "showDiscussions": false,
+            "topicId": ""
+          },
+          "componentName": "forceCommunity:caseDeflection",
+          "id": "7cb514f6-3bbb-45a0-bbc2-b5831a132eea",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "59e82318-c671-4884-9afd-1c0b8ea99917",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "44dd6477-9295-4ca9-ae6c-0a19f6f0a350",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Contact Support"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "34d4ebf8-e237-4d15-a47f-d98f29ce14be",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "51b5abdd-0959-4bfa-9720-66cc9f5eec38",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "contactsupport"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/createRecord.json b/force-app/main/default/experiences/Partner21/views/createRecord.json
new file mode 100644
index 0000000..b445690
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/createRecord.json
@@ -0,0 +1,40 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "a7dcd30a-fcf7-436e-9319-602f77df9596",
+  "label": "Create Record",
+  "regions": [
+    {
+      "id": "d202a124-8b33-4d13-ad05-fd133edbed9a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "actionApiName": "{!actionApiName}",
+            "isMicrobatch": false
+          },
+          "componentName": "forceCommunity:createRecordForm",
+          "id": "4fb084b2-392a-4bfe-98bd-9e5b8f83f407",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a210a8ec-0bd9-48e4-90b1-395f0d962bed",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1971ca17-d6d0-4152-a036-4ed33412c132",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "createrecord"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/dashboardDetail.json b/force-app/main/default/experiences/Partner21/views/dashboardDetail.json
new file mode 100644
index 0000000..0290844
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/dashboardDetail.json
@@ -0,0 +1,58 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "b3170d2d-dc66-4e6d-a921-7278926fbf83",
+  "label": "Dashboard Detail",
+  "regions": [
+    {
+      "id": "c02a9a61-e5d2-4e9b-a37e-36ce93392187",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "height": "1065",
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:dashboard",
+          "id": "370e8627-0dfd-499b-9f72-f2d59132e028",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "9eba1fe5-b997-4ed0-8f03-323318093860",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "5e60c2d4-1848-4006-b1e3-d93c35864c4c",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "66344302-5db9-4851-8252-cb85076a22c4",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a9511d76-385c-4065-938c-eb74f56334c6",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-01Z"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/dashboardList.json b/force-app/main/default/experiences/Partner21/views/dashboardList.json
new file mode 100644
index 0000000..e3ca7a2
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/dashboardList.json
@@ -0,0 +1,37 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "ce1cde06-6dcb-4da1-a5c9-7b2b099ddebb",
+  "label": "Dashboard List",
+  "regions": [
+    {
+      "id": "5283c75e-fb23-48aa-8a8e-3f52597821b3",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:dashboardList",
+          "id": "8e2ffa33-9821-4cf4-a83f-9fb10cdb4c38",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "641a8fff-3d0f-41f6-853b-a4b3c3c945b5",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1e88f5b9-c7a6-44b1-a7e0-f6acd2dd30d0",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-01Z"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/error.json b/force-app/main/default/experiences/Partner21/views/error.json
new file mode 100644
index 0000000..4ceb52d
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/error.json
@@ -0,0 +1,57 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "a4b25394-ceb2-44ff-b562-067f8854d1c1",
+  "label": "Error",
+  "regions": [
+    {
+      "id": "3cbd1395-a841-42ab-adfa-eadb431e48d5",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "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鈥檛 get to it, please ask the community administrator for help.</p>  </div>"
+          },
+          "componentName": "forceCommunity:htmlBlock",
+          "id": "f05a8ea1-d0db-4a33-8a23-caa6b1f2883f",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "db25733f-c49d-46fa-a8a8-23cf269c71a4",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "deff90c2-9ddc-4806-a9e6-c71da2bdd37e",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Error"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "65756ca3-26b8-41ba-84cf-24a2f7d0a6d5",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ffb391ca-2e13-4380-8be9-58de94ae5cfe",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "error"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/feedDetail.json b/force-app/main/default/experiences/Partner21/views/feedDetail.json
new file mode 100644
index 0000000..4b2182d
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/feedDetail.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "c7ee8d3e-fb1b-4f58-8292-3ad0cc4824f9",
+  "label": "Feed Detail",
+  "regions": [
+    {
+      "id": "74c42e50-e42f-4346-9860-b8af7c69da3c",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "id": "{!recordId}"
+          },
+          "componentName": "forceCommunity:feedItemDetail",
+          "id": "7227390c-acad-4d43-b9a3-ffa23063c2d5",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "87eb773e-465a-48c1-9414-21797f36e225",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "6b730d6e-03c4-4e6b-ad47-627110fa35a9",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "feeditem-generic"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/fileDetail.json b/force-app/main/default/experiences/Partner21/views/fileDetail.json
new file mode 100644
index 0000000..a76bbea
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/fileDetail.json
@@ -0,0 +1,37 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "5a4b2af7-b7b8-45c6-abc7-bf66bb847a7d",
+  "label": "File Detail",
+  "regions": [
+    {
+      "id": "9a0638a5-4e97-4c4a-9d92-bd2604d736e4",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:fileDetailPage",
+          "id": "7878932a-d262-47b9-b7fc-a49328cd4782",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "18539e1b-1a94-4a4c-80d1-7b99f87b04a9",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "9c377a34-ec71-4128-801d-ec5038ddd330",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-069"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/fileList.json b/force-app/main/default/experiences/Partner21/views/fileList.json
new file mode 100644
index 0000000..8a82f3f
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/fileList.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "2df51d40-f4c7-4917-b90b-e435c1d6a14e",
+  "label": "File List",
+  "regions": [
+    {
+      "id": "9a7ed8e0-c201-4b86-b139-c238d2a4cc75",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "pageSize": 25
+          },
+          "componentName": "forceCommunity:filesList",
+          "id": "70949d4f-857d-45fc-acf2-8d7786af98f0",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "d332e2f8-2b07-4dac-b6e5-38d0882b44a2",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "234e65c9-b500-461e-aa23-c1997d7b318d",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-069"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/flow.json b/force-app/main/default/experiences/Partner21/views/flow.json
new file mode 100644
index 0000000..59538c4
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/flow.json
@@ -0,0 +1,40 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "87c1c576-6744-474b-9e97-f16fc38fe2bb",
+  "label": "Flow",
+  "regions": [
+    {
+      "id": "1f2335d9-cba5-45fd-b3e8-9a8187399562",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "flowArguments": "",
+            "flowName": "{!flowName}"
+          },
+          "componentName": "forceCommunity:flowCommunity",
+          "id": "a216c407-67a7-4b5a-9937-ac1721b1f20c",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "8acdc309-e025-4b75-8d16-5ca5f325c999",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "f65c79b7-acf1-4079-ab20-34a867030d1d",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "flow"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/forgotPassword.json b/force-app/main/default/experiences/Partner21/views/forgotPassword.json
new file mode 100644
index 0000000..092bf5a
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/forgotPassword.json
@@ -0,0 +1,79 @@
+{
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "c97e5e6e-dc54-450d-9151-4a62fb2e007c",
+  "label": "Forgot Password",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "c7e9f665-2bc7-4885-9e57-ee41297aaa08",
+          "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>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "740594ef-8f7d-4526-889b-95c5eae3878f",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "checkEmailUrl": "./CheckPasswordResetEmail",
+            "submitButtonLabel": "Reset Password",
+            "usernameLabel": "Username"
+          },
+          "componentName": "salesforceIdentity:forgotPassword2",
+          "id": "660945ed-e9e9-4837-a7c5-b0eb43cce015",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "0da32bb8-8779-47df-8a31-073e72e4d2c2",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "64149aeb-d880-4aee-9d7c-60fe9bf31da7",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Forgot Password"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "2218d58a-55f3-442f-a853-d3ce487d6778",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a70b8473-0be4-491a-9641-682f8385b06d",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Login",
+  "type": "view",
+  "viewType": "forgot-password"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/groupDetail.json b/force-app/main/default/experiences/Partner21/views/groupDetail.json
new file mode 100644
index 0000000..f0178c8
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/groupDetail.json
@@ -0,0 +1,62 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "1e79f9ca-bc4c-4e37-b6b7-6abfebba388a",
+  "label": "Group Detail",
+  "regions": [
+    {
+      "id": "2fe19c1a-2175-4b0b-8c88-c468e2be441a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "engagementManagersOnly": false,
+            "engagementTabLabel": "Engagement",
+            "feedTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related"
+          },
+          "componentName": "forceCommunity:groupRecordHomeTabs",
+          "id": "3b3ec743-0058-4bb9-a3cf-29ebd0e7c5af",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "1291e169-c14a-4e48-85d8-d9f82171678a",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1246c9d4-1754-4da8-9875-43e97b8c6685",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "f375aef4-adf5-4911-b401-899e30f537b9",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "88e04853-22cd-4f58-b569-afb6cae8306b",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-0F9"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/groupList.json b/force-app/main/default/experiences/Partner21/views/groupList.json
new file mode 100644
index 0000000..697cafa
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/groupList.json
@@ -0,0 +1,47 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "11907c7a-7b32-438d-94d9-27f526ea69a6",
+  "label": "Group List",
+  "regions": [
+    {
+      "id": "d774836f-f3d8-4f08-999a-87b023da8d27",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "             <h1 style=\"text-align: center;\">                 <b style=\"font-size: 20px; color: #1e2443;\">Group List</b>             </h1>             "
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "ba81def9-06cc-401b-803f-e37ee08843b8",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:groupObjectHome",
+          "id": "4063017f-3d86-4aa5-b10e-810e80a1bce0",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "18da3d47-b5e4-4aac-a7c9-4e2f5bd4a9bf",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "40f307e7-117a-445d-95b8-620204961526",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-0F9"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/home.json b/force-app/main/default/experiences/Partner21/views/home.json
new file mode 100644
index 0000000..67ab4b8
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/home.json
@@ -0,0 +1,154 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsTwoCol84Layout",
+  "dataProviders": [],
+  "id": "4fa3fa38-4d0f-4247-9f1d-cccfa436763a",
+  "label": "Home",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<h1 style=\"text-align: center;\"><strong style=\"font-size: 28px; color: rgb(30, 36, 67);\"> </strong><strong style=\"font-size: 28px;\">娆㈣繋浣跨敤缁忛攢鍟嗘椿鍔ㄧ鐞嗙郴缁�!</strong></h1>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "288056b9-19a8-4fb0-bb2d-e9df4a1e8323",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c4aa6478-aeb4-401e-9856-a7c5ad49939a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "tabsetConfig": {
+              "UUID": "a34ef4d7-956e-4ff6-b57f-449ab0c365bd",
+              "activeTab": "tab1",
+              "tabs": [
+                {
+                  "UUID": "e9161519-4cfb-450d-8b6c-6fb901731928",
+                  "allowGuestUser": true,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {},
+                      "fqn": "forceCommunity:dashboard"
+                    }
+                  ],
+                  "tabKey": "tab1",
+                  "tabName": "Business Summary"
+                },
+                {
+                  "UUID": "035ed89e-2b2c-4e99-8b59-aa494eb293b2",
+                  "allowGuestUser": true,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "type": "Home"
+                      },
+                      "fqn": "forceCommunity:forceCommunityFeed"
+                    }
+                  ],
+                  "tabKey": "tab2",
+                  "tabName": "News & Updates"
+                }
+              ],
+              "useOverflowMenu": false
+            }
+          },
+          "componentName": "forceCommunity:tabset",
+          "id": "a34ef4d7-956e-4ff6-b57f-449ab0c365bd",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "height": "485",
+                    "recordId": "01Z0l000000cnvqEAA"
+                  },
+                  "componentName": "forceCommunity:dashboard",
+                  "id": "98e3f33b-6cf4-4f81-8b68-c22aeb01eebe",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "e9161519-4cfb-450d-8b6c-6fb901731928",
+              "regionLabel": "Business Summary",
+              "regionName": "tab1",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "canChangeSorting": true,
+                    "defaultFilter": "",
+                    "defaultSortOrderHomeFeed": "Relevance",
+                    "defaultSortOrderTopicsFeed": "Relevance",
+                    "feedDesign": "DEFAULT",
+                    "hasFeedSearch": true,
+                    "subjectId": "{!recordId}",
+                    "type": "Home"
+                  },
+                  "componentName": "forceCommunity:forceCommunityFeed",
+                  "id": "1e21094c-03b0-4931-a80b-7c51a83f38e6",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "035ed89e-2b2c-4e99-8b59-aa494eb293b2",
+              "regionLabel": "News & Updates",
+              "regionName": "tab2",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "0cb3aa2c-48ff-4713-adcd-dad0bd193235",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b0ba4f16-e9b8-4f48-a2f5-b3d8d8c13b6c",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "560deca7-2f6e-47c8-986f-24a589bf37b7",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Home"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "cf12da6d-789e-4cbc-b87c-f9ae4a989108",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "dbdbdf01-b5fa-4f34-8a22-8afddbf3259e",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "home"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/login.json b/force-app/main/default/experiences/Partner21/views/login.json
new file mode 100644
index 0000000..5f736c0
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/login.json
@@ -0,0 +1,84 @@
+{
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "6a024f98-3cde-4f9a-8648-4fd1e841d503",
+  "label": "Login",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "salesforceIdentity:communityLogo2",
+          "id": "ce8477f0-e84e-4eb9-8b02-8ed6d0709a34",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "forgotPasswordLabel": "Forgot your password?",
+            "forgotPasswordUrl": "/ForgotPassword",
+            "loginButtonLabel": "Log in",
+            "passwordLabel": "Password",
+            "selfRegisterLabel": "Not a member?",
+            "selfRegisterUrl": "/SelfRegister",
+            "startUrl": "",
+            "usernameLabel": "Username"
+          },
+          "componentName": "salesforceIdentity:loginForm2",
+          "id": "d269f601-257c-4b88-8d58-256a92812a38",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "headerText": "",
+            "showHeader": false,
+            "useCommunityDomainSso": true
+          },
+          "componentName": "salesforceIdentity:socialLogin2",
+          "id": "cf4b2470-b283-4b7c-b875-2e70f19ce5ca",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "employeeLoginLinkLabel": "Are you an employee? Login here"
+          },
+          "componentName": "salesforceIdentity:employeeLoginLink2",
+          "id": "b9c2749e-a28a-491a-be9a-df56094300ac",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "054db53d-e77e-4e69-aee6-66bdde6ec710",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Login"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "da3bc35f-f5d2-4e0a-bcf0-a3f4be052490",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "55f912a8-0264-489a-bd74-539ef9871ee5",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Login",
+  "type": "view",
+  "viewType": "login-home"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/loginError.json b/force-app/main/default/experiences/Partner21/views/loginError.json
new file mode 100644
index 0000000..ac16e7c
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/loginError.json
@@ -0,0 +1,57 @@
+{
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "8da2d7f7-7500-4481-bad7-50d7a131e76e",
+  "label": "Login Error",
+  "regions": [
+    {
+      "id": "29d8bf7c-d422-4253-93dd-16ac79546c13",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "450c9df4-e9f4-48f7-a385-ac894a17f894",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a7281af4-4c09-48f9-b328-9533ce31b4cd",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "a56edf13-cfa2-48f5-99c0-521dd988f725",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Login Error"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "7ad0d3ca-be5c-4673-b43e-11f0fc64262c",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "4ae424a0-6f66-42f3-a4f8-9cff47aaea03",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Login",
+  "type": "view",
+  "viewType": "login-error"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/mDFAndCoop.json b/force-app/main/default/experiences/Partner21/views/mDFAndCoop.json
new file mode 100644
index 0000000..c93d364
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/mDFAndCoop.json
@@ -0,0 +1,198 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "9c5c1b27-82e3-433b-b987-a98a033bc129",
+  "label": "MDF and Coop",
+  "regions": [
+    {
+      "id": "22eab438-7ab1-4299-ac6c-fee72ede8c1c",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "             <p>                 <span style=\"font-size: 20px;\">Request and Manage your Market Developments Funds.</span>             </p>        "
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "9493ebd0-ea77-42b6-8f24-da125b9eef12",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "tabsetConfig": {
+              "UUID": "a9ddb8db-0684-4f81-ad1a-6662a32fa82d",
+              "activeTab": "tab1",
+              "tabs": [
+                {
+                  "UUID": "e2e89f1f-8abe-4a31-8384-90e2a1705565",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "filterName": "Recent",
+                        "scope": "PartnerFundAllocation"
+                      },
+                      "fqn": "forceCommunity:objectHome"
+                    }
+                  ],
+                  "tabKey": "tab1",
+                  "tabName": "Fund Allocations"
+                },
+                {
+                  "UUID": "0f085c4f-0556-4f6a-8981-3217c3482d3e",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "filterName": "Recent",
+                        "scope": "PartnerFundRequest"
+                      },
+                      "fqn": "forceCommunity:objectHome"
+                    }
+                  ],
+                  "tabKey": "tab2",
+                  "tabName": "Fund Requests"
+                },
+                {
+                  "UUID": "0a39422c-e5a2-45bb-8196-928371de4201",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {
+                        "filterName": "Recent",
+                        "scope": "PartnerFundClaim"
+                      },
+                      "fqn": "forceCommunity:objectHome"
+                    }
+                  ],
+                  "tabKey": "tab3",
+                  "tabName": "Fund Claims"
+                }
+              ],
+              "useOverflowMenu": false
+            }
+          },
+          "componentName": "forceCommunity:tabset",
+          "id": "a9ddb8db-0684-4f81-ad1a-6662a32fa82d",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "enableInlineEdit": true,
+                    "filterName": "Recent",
+                    "layout": "FULL",
+                    "pageSize": 25,
+                    "scope": "PartnerFundAllocation",
+                    "showActionBar": true,
+                    "showChartsPanel": true,
+                    "showDisplay": "showall",
+                    "showFilterPanel": true,
+                    "showImageIcon": true,
+                    "showManualRefreshButton": true,
+                    "showObjectName": true,
+                    "showPinnedList": true,
+                    "showSearchBar": true
+                  },
+                  "componentName": "forceCommunity:objectHome",
+                  "id": "21fd9df3-bf9a-49e7-87e1-98101d6ca8d9",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "e2e89f1f-8abe-4a31-8384-90e2a1705565",
+              "regionLabel": "Fund Allocations",
+              "regionName": "tab1",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "enableInlineEdit": true,
+                    "filterName": "Recent",
+                    "layout": "FULL",
+                    "pageSize": 25,
+                    "scope": "PartnerFundRequest",
+                    "showActionBar": true,
+                    "showChartsPanel": true,
+                    "showDisplay": "showall",
+                    "showFilterPanel": true,
+                    "showImageIcon": true,
+                    "showManualRefreshButton": true,
+                    "showObjectName": true,
+                    "showPinnedList": true,
+                    "showSearchBar": true
+                  },
+                  "componentName": "forceCommunity:objectHome",
+                  "id": "5f04b67e-f8de-4245-8e48-a047c0a8dec4",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "0f085c4f-0556-4f6a-8981-3217c3482d3e",
+              "regionLabel": "Fund Requests",
+              "regionName": "tab2",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "enableInlineEdit": true,
+                    "filterName": "Recent",
+                    "layout": "FULL",
+                    "pageSize": 25,
+                    "scope": "PartnerFundClaim",
+                    "showActionBar": true,
+                    "showChartsPanel": true,
+                    "showDisplay": "showall",
+                    "showFilterPanel": true,
+                    "showImageIcon": true,
+                    "showManualRefreshButton": true,
+                    "showObjectName": true,
+                    "showPinnedList": true,
+                    "showSearchBar": true
+                  },
+                  "componentName": "forceCommunity:objectHome",
+                  "id": "17db70a4-f069-4c5c-b08f-d67682a5b0f0",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "0a39422c-e5a2-45bb-8196-928371de4201",
+              "regionLabel": "Fund Claims",
+              "regionName": "tab3",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a6998ef8-c9a9-4b1a-ae37-9ed3f36c020b",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "54f5aad8-1ca3-4c7b-9356-fdad28728846",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "mdf"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/messages.json b/force-app/main/default/experiences/Partner21/views/messages.json
new file mode 100644
index 0000000..675c178
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/messages.json
@@ -0,0 +1,27 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "295d4564-bf29-48ed-b213-e39c211fcca0",
+  "label": "Messages",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceChatter:messages",
+          "id": "a9f9bdee-a7a4-43f6-8bf2-da860b5480ce",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "55d4a79e-8c2a-4733-91f2-23fdf1c26d5a",
+      "regionName": "content",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "messages"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/myAccount.json b/force-app/main/default/experiences/Partner21/views/myAccount.json
new file mode 100644
index 0000000..2392034
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/myAccount.json
@@ -0,0 +1,109 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:dynamicLayout",
+  "dataProviders": [],
+  "id": "4f2502be-3471-4328-98e2-65da8b475fba",
+  "label": "My Account",
+  "regions": [
+    {
+      "id": "0fe567d7-b175-4553-afce-2d94a89ec8f4",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "background": "background: rgba(0,0,0,0)",
+            "backgroundOverlay": "rgba(0,0,0,0.5)",
+            "contentAreaWidth": 100,
+            "sectionConfig": {
+              "UUID": "cd2c0881-a4ee-4c92-9f52-0b8a22f662be",
+              "columns": [
+                {
+                  "UUID": "2e7c4da1-56f3-4cc6-9c2e-f7240b790aba",
+                  "columnKey": "col1",
+                  "columnName": "column 1",
+                  "columnWidth": "12",
+                  "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": "cd2c0881-a4ee-4c92-9f52-0b8a22f662be",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "recordId": "{!CurrentUser.accountId}"
+                  },
+                  "componentName": "forceCommunity:recordHeadline",
+                  "id": "a910e746-8430-45b7-931b-2c4556ba0db6",
+                  "renderPriority": "NEUTRAL",
+                  "renditionMap": {},
+                  "type": "component"
+                },
+                {
+                  "componentAttributes": {
+                    "detailsTabLabel": "Details",
+                    "discussionsTabLabel": "Feed",
+                    "recordId": "{!CurrentUser.accountId}",
+                    "relatedTabLabel": "Related",
+                    "showLegacyActivityComposer": false,
+                    "tab1Type": "details",
+                    "tab2Type": "related",
+                    "tab3Type": "chatter",
+                    "tab4Type": "none",
+                    "timelineTabLabel": "Activity"
+                  },
+                  "componentName": "forceCommunity:recordHomeTabs",
+                  "id": "d85c38c5-4616-4da6-add9-8a4132ac5487",
+                  "renderPriority": "NEUTRAL",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "2e7c4da1-56f3-4cc6-9c2e-f7240b790aba",
+              "regionLabel": "column 1",
+              "regionName": "col1",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a73bd5f9-9299-4e4b-baa2-91a26491da54",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b6019a7e-b6e8-4f11-a85c-d4750475412a",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "my-account"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/questionDetail.json b/force-app/main/default/experiences/Partner21/views/questionDetail.json
new file mode 100644
index 0000000..869df95
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/questionDetail.json
@@ -0,0 +1,105 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsTwoCol84Layout",
+  "dataProviders": [],
+  "id": "bf327277-7072-4df9-90f8-29eb8b39b81d",
+  "label": "Question Detail",
+  "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.",
+            "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+            "pageType": "discussion",
+            "showSubTopics": true,
+            "title": "Welcome!",
+            "uniqueNameOrId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:headline",
+          "id": "c8d9e6e5-a051-4f50-94c1-98333a43a31f",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c46c7932-f4de-4c91-b58b-0d438dba639a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "id": "{!feedItemId}"
+          },
+          "componentName": "forceCommunity:feedItemDetail",
+          "id": "4aac820e-b53d-400b-8a7b-8b5a1e37041b",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "f473131c-c009-462d-a060-6fa815149ba4",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "numberOfItems": 5,
+            "showViewCounts": true,
+            "title": "Related Questions"
+          },
+          "componentName": "selfService:similarQuestions",
+          "id": "a31402bb-54bf-4a3b-83f3-23d8308fd42d",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "channel": "DefaultChannel",
+            "title": ""
+          },
+          "componentName": "forceCommunity:recommendations",
+          "id": "8df82e16-36ef-470d-ab80-73ab659b7c73",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ad034153-7b0c-43e0-8090-fff41d40ef45",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "6f1fd1de-3690-4bb6-a2b7-6a76383fd50d",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record.Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "2a9d983a-61ca-475c-ab47-749bf7748ed3",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "5cbd3199-4447-44d3-879d-f1fac50f2061",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "feeditem"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/quipDocsRelatedList.json b/force-app/main/default/experiences/Partner21/views/quipDocsRelatedList.json
new file mode 100644
index 0000000..d2aa1d8
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/quipDocsRelatedList.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "7bb87352-7c83-46dd-ad49-c8f579c0b0fc",
+  "label": "Quip Docs Related List",
+  "regions": [
+    {
+      "id": "55793fa4-7b5e-4eaa-a2ce-c428ef597558",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "parentRecordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:relatedQuipItemsView",
+          "id": "90a9799d-3277-41f1-9bc5-b7389629c819",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "4a5e58cc-e61e-4cd2-92f8-66c460dc2f48",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "3f6284b0-a596-4a22-8885-e333c796f8af",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "extrelated-quip"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/recordDetail.json b/force-app/main/default/experiences/Partner21/views/recordDetail.json
new file mode 100644
index 0000000..debb978
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/recordDetail.json
@@ -0,0 +1,76 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "07b95556-b1a0-4d51-9ad9-912c6af1d763",
+  "label": "Record Detail",
+  "regions": [
+    {
+      "id": "72339ad9-dfee-49fe-b534-519b18c7310d",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "2e77392d-9422-4485-9d55-ea22481d78a5",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "discussionsTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related",
+            "showLegacyActivityComposer": false,
+            "tab1Type": "details",
+            "tab2Type": "related",
+            "tab3Type": "chatter",
+            "tab4Type": "none",
+            "timelineTabLabel": "Activity"
+          },
+          "componentName": "forceCommunity:recordHomeTabs",
+          "id": "8bad7644-5723-4956-8cbe-8bd495a2ef45",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "8f6e6e19-e3b0-46e4-b23b-372b0adeec99",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "5db2ad5a-27b4-41ef-ae44-aa582593ca10",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "f569e083-cf8e-44d6-b047-b790d05c6145",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "8806f9a9-2338-4950-8de9-d786d2e22964",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/recordList.json b/force-app/main/default/experiences/Partner21/views/recordList.json
new file mode 100644
index 0000000..7108062
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/recordList.json
@@ -0,0 +1,52 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "c0dfcf8e-1f28-474c-ba52-6824250808ec",
+  "label": "Record List",
+  "regions": [
+    {
+      "id": "2bcbaeca-5c24-4210-8443-88287387e5be",
+      "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
+          },
+          "componentName": "forceCommunity:objectHome",
+          "id": "6a070319-37ad-44aa-808f-872c9d7cc87e",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "e1b2d184-2ddf-4ff8-8faa-2b54770bbb6a",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "8a05bc0a-f2c6-486c-90d2-9d08f1156c3c",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/register.json b/force-app/main/default/experiences/Partner21/views/register.json
new file mode 100644
index 0000000..fe46215
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/register.json
@@ -0,0 +1,96 @@
+{
+  "appPageId": "09f21e7f-6d13-45df-8d2b-8ce500666282",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "43c8d59e-3839-4334-aedf-f3d9c6af1843",
+  "label": "Register",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "salesforceIdentity:communityLogo2",
+          "id": "5840f93b-f456-4f9a-a418-5328d5922414",
+          "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": "4c34c064-7887-40fc-8a19-ec923ac6fd11",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "confirmPasswordLabel": "Confirm Password",
+            "emailLabel": "Email",
+            "extraFieldsFieldSet": "",
+            "firstnameLabel": "First Name",
+            "includePasswordField": false,
+            "lastnameLabel": "Last Name",
+            "passwordLabel": "Create Password",
+            "regConfirmUrl": "./CheckPasswordResetEmail",
+            "startUrl": "",
+            "submitButtonLabel": "Sign Up"
+          },
+          "componentName": "salesforceIdentity:selfRegister2",
+          "id": "5bf68b22-7355-4473-b13b-9f5b7f94a2f2",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "headerText": "",
+            "showHeader": false,
+            "useCommunityDomainSso": true
+          },
+          "componentName": "salesforceIdentity:socialLogin2",
+          "id": "a19a57ce-fb79-4eb0-bf1e-cd86aa621868",
+          "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": "bb085018-4cde-4194-8e9d-d2c068caadb0",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "b4515202-c99f-4306-8032-858053a2d6a9",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Register"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "6e3d7e82-b19d-46c5-8fca-15520def526a",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "63252ef9-373a-4f5c-a88e-c6bc6fd6ec54",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Login",
+  "type": "view",
+  "viewType": "self-register"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/relatedRecordList.json b/force-app/main/default/experiences/Partner21/views/relatedRecordList.json
new file mode 100644
index 0000000..3fedcd9
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/relatedRecordList.json
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "525210ce-dc91-4637-8aad-dcc79ef5149c",
+  "label": "Related Record List",
+  "regions": [
+    {
+      "id": "5a53a775-b74c-4e17-bca1-b061b60e308b",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "9ad1b96d-f251-4106-8ceb-f1b9b9cb0dd7",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ef9a601d-1369-4e0c-a009-cfb6e154f9e8",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "7e4c936c-7f00-43bd-8322-1ad8d9be67d8",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/reportBuilder.json b/force-app/main/default/experiences/Partner21/views/reportBuilder.json
new file mode 100644
index 0000000..1f13d16
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/reportBuilder.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "24910809-77c3-4ea5-80c3-ea0db9afb5de",
+  "label": "Report Builder",
+  "regions": [
+    {
+      "id": "67b18538-f6bd-4e84-b005-708c3991ecd9",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:reportBuilder",
+          "id": "5a95a1f6-75fd-4a04-bae7-4c1019d493d3",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "5a6f8fb5-51a6-480b-9b51-4dc4f646a411",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "57f4b3bd-db01-49f3-a62b-123d79d3584b",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "createreport"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/reportDetail.json b/force-app/main/default/experiences/Partner21/views/reportDetail.json
new file mode 100644
index 0000000..4908997
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/reportDetail.json
@@ -0,0 +1,57 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "621a5818-46f1-42c5-9717-fc999ba75df9",
+  "label": "Report Detail",
+  "regions": [
+    {
+      "id": "4048f525-5fc3-4dd9-a234-3853fe169b0c",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:reportPage",
+          "id": "67dbea3c-73b0-4382-943b-08248f6d0127",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "99090621-29d5-4fc2-afe6-57de0bb39023",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "9bd724e2-186d-4d7c-b9c8-e78c6fd7e452",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "04b2d6c8-0085-4a12-909a-ff3398dc58f1",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "44bd4200-450a-429e-b8d3-437a05904edd",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-00O"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/reportList.json b/force-app/main/default/experiences/Partner21/views/reportList.json
new file mode 100644
index 0000000..9d9b8c7
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/reportList.json
@@ -0,0 +1,37 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "94db8a50-134d-4517-bddc-eb54dc151c59",
+  "label": "Report List",
+  "regions": [
+    {
+      "id": "c406784e-b601-4d8e-9fae-4fe0ac9e04d6",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:reportList",
+          "id": "4c16ed1f-3c77-4bcf-a219-c6a95becc119",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "d8ef9cf3-9ba4-4a89-8b6b-b2b53986d859",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "26e60002-bbc5-4040-add7-189dd1bdf534",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-00O"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/resources.json b/force-app/main/default/experiences/Partner21/views/resources.json
new file mode 100644
index 0000000..3a37fa0
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/resources.json
@@ -0,0 +1,75 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsTwoCol84Layout",
+  "dataProviders": [],
+  "id": "fe6b6a28-688d-44ad-921f-8ad8124e9a5d",
+  "label": "Resources",
+  "regions": [
+    {
+      "id": "bf1b04ec-3a24-4aaa-ad19-9dd086392fd5",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "librariesHeaderLabel": "Libraries",
+            "showWorkspaceImage": true
+          },
+          "componentName": "forceCommunity:workspacesList",
+          "id": "4be79487-0c69-4824-8d63-f209b4836e56",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "7f053486-a341-4c1b-b235-305ed271d840",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "title": "Popular Now"
+          },
+          "componentName": "forceChatter:recommendationsBig",
+          "id": "7347ee86-1a7c-46d9-8b28-6ff45898a22e",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "efea1d40-d248-4efc-8179-203496bc3d69",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "159d628c-4403-410f-9cdc-6508d3e2c6d5",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Resources"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "35d3f15e-df06-4cbb-bf3c-7fb747fe299e",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "78bb1d06-c3ad-4f3f-ba7e-2e2c4966bf8d",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "files"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/search.json b/force-app/main/default/experiences/Partner21/views/search.json
new file mode 100644
index 0000000..be46589
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/search.json
@@ -0,0 +1,59 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "858b90d6-5f26-4a9a-9080-746e17a9f4b5",
+  "label": "Search",
+  "regions": [
+    {
+      "id": "cc3fe408-8424-4fe4-b5ce-b62de9e02304",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "scopes": [
+              {
+                "isPublic": false,
+                "name": "Lead"
+              },
+              {
+                "isPublic": false,
+                "name": "Opportunity"
+              },
+              {
+                "isPublic": false,
+                "name": "Campaign"
+              },
+              {
+                "isPublic": false,
+                "name": "ContentDocument"
+              }
+            ],
+            "searchResultFiltering": true,
+            "searchTerm": "{!term}",
+            "showTopResults": true
+          },
+          "componentName": "forceCommunity:search",
+          "id": "1d5f2162-3e97-4eba-b903-48faf3a018a4",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "e4a5dd5f-cc4b-43ed-899a-6eb3047bad5b",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b8b7709d-2499-423f-8e63-bd9fb751eb9c",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "global-search"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/streamDetail.json b/force-app/main/default/experiences/Partner21/views/streamDetail.json
new file mode 100644
index 0000000..cf7a744
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/streamDetail.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "ef1f7586-66a3-4110-80c5-073271e404e6",
+  "label": "Stream Detail",
+  "regions": [
+    {
+      "id": "f353ef03-36eb-46ec-8196-b129dddbb831",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "id": "{!recordId}"
+          },
+          "componentName": "forceCommunity:streamDetail",
+          "id": "8ec65dea-cd4b-43b5-a8e6-c84413f63f90",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "14979ca8-0d1c-4131-895f-29e70212f0cd",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1c29f9a5-9660-4fe9-9c8c-6e022d997da5",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-0Fq"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/streamList.json b/force-app/main/default/experiences/Partner21/views/streamList.json
new file mode 100644
index 0000000..cb0e948
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/streamList.json
@@ -0,0 +1,27 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "ee631fe0-502b-4dfe-ac53-311079fadd89",
+  "label": "Stream List",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:streamList",
+          "id": "e21ff5bc-f92a-41c9-8bd9-aa545a23cfba",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "a70d6be4-9460-4e60-888f-2c51815b9757",
+      "regionName": "content",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-0Fq"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/topicCatalog.json b/force-app/main/default/experiences/Partner21/views/topicCatalog.json
new file mode 100644
index 0000000..8339e21
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/topicCatalog.json
@@ -0,0 +1,73 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "d006b952-023c-4964-88f1-151e2b013a67",
+  "label": "Topic Catalog",
+  "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.",
+            "bannerTextWithoutKnowledge": "Explore other <a href=\"javascript:void(0)\" class=\"headlineDiscussions\">discussions</a> on this topic.",
+            "pageType": "",
+            "showSubTopics": true,
+            "title": "Topics",
+            "uniqueNameOrId": ""
+          },
+          "componentName": "forceCommunity:headline",
+          "id": "694c1f11-7883-4699-94b0-17aae867fa13",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "05a42db9-02d2-43a4-80b8-45823466685e",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "forceCommunity:topicCatalog",
+          "id": "3a9ffb91-cabf-45ae-9e71-7cf76584fff9",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "5fe00fbc-2281-469e-8c6e-2dd8468a1819",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "623b964f-9cd6-4513-982e-f6f196b3db38",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Topic Catalog"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "04697b2f-0118-4bcd-9940-9fd1bad9ef33",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "9e7ee946-0fc4-4c52-9fbd-0a9d04271b65",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "topic-catalog"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/topicDetail.json b/force-app/main/default/experiences/Partner21/views/topicDetail.json
new file mode 100644
index 0000000..e80eea9
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/topicDetail.json
@@ -0,0 +1,93 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsTwoCol84Layout",
+  "dataProviders": [],
+  "id": "38e59688-3353-4124-b571-862a162dff11",
+  "label": "Topic Detail",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "d6b687e5-f1a9-46f2-9bc3-78b95e261dfe",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c9480151-e5e7-4ded-a13c-f7c0204338ba",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "canChangeSorting": false,
+            "defaultFilter": "",
+            "defaultSortOrderHomeFeed": "Relevance",
+            "defaultSortOrderTopicsFeed": "Relevance",
+            "feedDesign": "DEFAULT",
+            "hasFeedSearch": false,
+            "subjectId": "{!recordId}",
+            "type": "Topics"
+          },
+          "componentName": "forceCommunity:forceCommunityFeed",
+          "id": "5dd762d8-9d22-40de-b4bb-191391220741",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "90ff1fce-9ccb-41ad-8757-1470c2db974f",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordDetail",
+          "id": "b8b25258-493c-458b-8e9c-bee0c905fde2",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "782dcfa9-0d4f-47d9-8e37-789bd58f1f0a",
+      "regionName": "sidebar",
+      "type": "region"
+    },
+    {
+      "id": "74af9e79-3377-4866-8c0a-9d7e6fe3ef45",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "{!Record.Description}",
+            "title": "{!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "3486895a-d73b-4102-93a7-6d207fd0a00e",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "f26b2333-7b1a-48e6-a1a3-f3e34426f512",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "topic"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/userProfile.json b/force-app/main/default/experiences/Partner21/views/userProfile.json
new file mode 100644
index 0000000..f79e0a3
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/userProfile.json
@@ -0,0 +1,121 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "4053070a-c5f6-483a-b96a-0ac64d32bfc6",
+  "label": "User Profile",
+  "regions": [
+    {
+      "id": "89b66032-d883-446c-8947-68f83bc9f296",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "id": "{!recordId}",
+            "showFullPhotoAsCircle": true,
+            "showReputation": false
+          },
+          "componentName": "forceCommunity:userProfileHeader",
+          "id": "e2f52e36-f053-47bd-856f-54556073cb68",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "tabsetConfig": {
+              "UUID": "ed0c6390-a8bc-4ffc-84fd-aee41981c732",
+              "activeTab": "tab1",
+              "tabs": [
+                {
+                  "UUID": "5bc0df6c-a312-4abc-b5b4-f2084b4acc27",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {},
+                      "fqn": "forceCommunity:userProfileDetail"
+                    }
+                  ],
+                  "tabKey": "tab1",
+                  "tabName": "Details"
+                },
+                {
+                  "UUID": "196c0de0-152e-4c01-99cd-efb4e6ed0749",
+                  "allowGuestUser": false,
+                  "locked": false,
+                  "seedComponents": [
+                    {
+                      "attributes": {},
+                      "fqn": "forceCommunity:userRelatedList"
+                    }
+                  ],
+                  "tabKey": "tab2",
+                  "tabName": "Related"
+                }
+              ],
+              "useOverflowMenu": false
+            }
+          },
+          "componentName": "forceCommunity:tabset",
+          "id": "ed0c6390-a8bc-4ffc-84fd-aee41981c732",
+          "regions": [
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "id": "{!recordId}"
+                  },
+                  "componentName": "forceCommunity:userProfileDetail",
+                  "id": "87c193d2-2c1c-41f2-89fd-f2eb35986231",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "5bc0df6c-a312-4abc-b5b4-f2084b4acc27",
+              "regionLabel": "Details",
+              "regionName": "tab1",
+              "renditionMap": {},
+              "type": "region"
+            },
+            {
+              "components": [
+                {
+                  "componentAttributes": {
+                    "userId": "{!recordId}"
+                  },
+                  "componentName": "forceCommunity:userRelatedList",
+                  "id": "1532d085-5322-4ccd-854f-8580589070cc",
+                  "renditionMap": {},
+                  "type": "component"
+                }
+              ],
+              "id": "196c0de0-152e-4c01-99cd-efb4e6ed0749",
+              "regionLabel": "Related",
+              "regionName": "tab2",
+              "renditionMap": {},
+              "type": "region"
+            }
+          ],
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "3dad4cf6-7966-4fb0-acb5-7185d8b94a4a",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "2c73ee2e-68df-473f-8174-e88c35f810a2",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-005"
+}
diff --git a/force-app/main/default/experiences/Partner21/views/userSettings.json b/force-app/main/default/experiences/Partner21/views/userSettings.json
new file mode 100644
index 0000000..3e0bbdc
--- /dev/null
+++ b/force-app/main/default/experiences/Partner21/views/userSettings.json
@@ -0,0 +1,60 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "3d201ab3-fa88-4304-85c5-c338df54401e",
+  "label": "User Settings",
+  "regions": [
+    {
+      "id": "474c881f-fede-4c99-b61e-1a5ba315b47b",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "accountSectionTitle": "Account",
+            "accountTabName": "Account Management",
+            "connectedSourcesTabName": "Connected Sources",
+            "deleteAccountButtonTitle": "Deactivate My Account",
+            "deleteAccountConfirmationPopupBody": "After you deactivate your account, you'll lose access to this site.",
+            "deleteAccountConfirmationPopupButtonTitle": "Got It",
+            "deleteAccountConfirmationPopupTitle": "Deactivate your account?",
+            "deleteAccountErrorMessage": "Something went wrong. Contact your site administrator.",
+            "deleteAccountSectionTitle": "Deactivate Account",
+            "emailNotificationsTitle": "Email Notifications",
+            "emailSectionDescText": "When email notifications are enabled, email me when someone:",
+            "hideAccountDeleteSection": true,
+            "hideChatterNotificationSettings": false,
+            "hideConnectedSources": false,
+            "hideEmailNotificationSettings": false,
+            "hideProfileVisibilitySettings": false,
+            "id": "{!recordId}",
+            "locationTitle": "Location",
+            "profileSectionDescText": "Customize who is able to see what on your profile page",
+            "profileSectionToolTipText": "Restricted: Visible to the employees of the company that created the site. Members: Visible to logged-in members. Public: Visible to anyone viewing pages that don't require login.",
+            "profileVisibilityTitle": "Profile Visibility",
+            "settingsPageTitle": "My Settings"
+          },
+          "componentName": "forceCommunity:userSettingsCustomizable",
+          "id": "ec99dcb0-b8de-4c45-afba-d9a5983c4eb7",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "0f316a31-89b3-402f-b12f-1ea820e0bd5e",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "1e578b7a-0907-44c9-987e-bb20b1cfe639",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "usersettings"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..6ed7738
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\344\273\252\350\241\250\346\235\277\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "b8dd7d14-b832-40b7-9081-a684d75e13c4",
+  "label": "浠〃鏉� 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "22c7d43f-130c-433a-b1a9-b0cfbd096aeb",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "235e0622-ec88-4486-b3af-753e42a0cd62",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "6d67b486-8ef3-4f6c-8cb1-76d3d4193565",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "d8aa8f16-a812-4654-b561-de444b2ac2ef",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-01Z"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json" "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
new file mode 100644
index 0000000..3e98d0f
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\350\251\263\347\264\260.json"
@@ -0,0 +1,76 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "85625454-b547-4267-8193-1220b85224c0",
+  "label": "瀛︿細銉诲煿璁� 瑭崇窗",
+  "regions": [
+    {
+      "id": "32f48fc5-7ab3-4ce7-8f65-b72ebb4c1833",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "5981859e-261c-4517-b8f2-80fe1c284f8e",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "discussionsTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related",
+            "showLegacyActivityComposer": false,
+            "tab1Type": "details",
+            "tab2Type": "related",
+            "tab3Type": "chatter",
+            "tab4Type": "none",
+            "timelineTabLabel": "Activity"
+          },
+          "componentName": "forceCommunity:recordHomeTabs",
+          "id": "1891936b-7484-488e-ae36-13746546ba83",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "66bc16a8-e319-4633-98fd-2d46385cda9f",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "5d86bb65-a182-4969-bc62-d42893f17dd9",
+      "regionName": "footer",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "id": "441ecc2a-3a80-49cb-aade-b682e1c63a30",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "0ae2ec43-789f-4a44-a7d6-55e0feaaa240",
+      "regionName": "sfdcHiddenRegion",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "detail-701"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..26bc5f4
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\345\255\246\344\274\232\343\203\273\345\237\271\350\256\255\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "c151821c-4405-4da0-b2dd-279fbb65bd86",
+  "label": "瀛︿細銉诲煿璁� 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "50f2cdab-0eb2-468a-a755-20268bb8cbc0",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "64d8a457-2904-4580-b7bc-b1965f5e57f8",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "5c76bcb6-6a4d-4eee-ba42-7a319c08cb58",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "9c4694bb-e92b-4170-b696-795e98e30342",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-701"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..9d8c773
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\345\260\217\347\273\204\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "2bfba25e-daf0-49ff-924f-f69f9d9fb327",
+  "label": "灏忕粍 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "663b38e0-6257-4c51-81c5-ea60cbcb6b31",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "407fbce1-4ac5-45c4-9fa3-24bd9017c409",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "35e19b13-28c4-4e12-8d53-ef16eef240ce",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "a607e833-1ba0-4d54-8a36-b513616ec2ee",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-0F9"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..5fcfd30
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\346\212\245\350\241\250\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "217b4959-2595-4925-825f-0e46a2edf850",
+  "label": "鎶ヨ〃 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "c39e0e53-c06e-4994-9957-8bd379958a19",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "c9d5ac4a-881a-4920-a857-82d8cad2b6ef",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "191a3f15-c073-4840-a880-ddf6ca1ed393",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "0143c5c7-a46f-4c14-b22b-6af47a71337b",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-00O"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..cd2d6f3
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\346\226\207\344\273\266\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "972321da-7487-4d80-afa0-7731e16694d9",
+  "label": "鏂囦欢 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "6d04762b-180f-43a0-a0e5-b5c604c9b12a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "4bb4ca74-2db8-484b-b130-90a03bb932c0",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "c83a0888-a274-49bd-a9ac-bb07ed81efa1",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "2fce666b-9706-4729-92d6-e26bd1996ff3",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-069"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..7048b32
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\346\265\201\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,27 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "cc7589b2-7f8c-4682-9007-5aa6a8b4c110",
+  "label": "娴� 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "43bd7732-d8eb-4910-af27-0c0af447ba43",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "1c3ec764-ade8-4667-8b8c-c31f11ba38a9",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "ef6f6ccd-47c7-4928-8fae-555da29a8a58",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-0Fq"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..77dfdce
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,27 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "33b1c4cb-6778-4461-9977-a79f65eb2665",
+  "label": "鐢ㄦ埛 銉偣銉�",
+  "regions": [
+    {
+      "id": "a32b648e-21b7-40e6-a4d0-aa08b457edfe",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "id": "e91778d9-2f16-4fea-a2f7-4209768f614a",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "b74fafd1-f46b-457a-b321-451ba3898ef9",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "list-005"
+}
diff --git "a/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json" "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
new file mode 100644
index 0000000..e3bcb74
--- /dev/null
+++ "b/force-app/main/default/experiences/Partner21/views/\347\224\250\346\210\267\351\226\242\351\200\243\343\203\252\343\202\271\343\203\210.json"
@@ -0,0 +1,45 @@
+{
+  "appPageId": "95226447-4e8f-45b9-aac1-576d87068d01",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "e627e296-efd0-45d5-87ed-ea680a2015b0",
+  "label": "鐢ㄦ埛 闁㈤�c儶銈广儓",
+  "regions": [
+    {
+      "id": "fa996da6-5a88-40d6-8076-a000dd9fc6b2",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "c2975d5b-8e86-4cda-9e6a-69f34f37af9e",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "ea54ff4a-6956-46f8-8557-c168da453e35",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "id": "8857ad6c-8b66-49ef-a449-14ef01882582",
+      "regionName": "footer",
+      "type": "region"
+    }
+  ],
+  "themeLayoutType": "Inner",
+  "type": "view",
+  "viewType": "relatedlist-005"
+}
diff --git a/force-app/main/default/experiences/Site3.site-meta.xml b/force-app/main/default/experiences/Site3.site-meta.xml
new file mode 100644
index 0000000..2984504
--- /dev/null
+++ b/force-app/main/default/experiences/Site3.site-meta.xml
@@ -0,0 +1,5 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<ExperienceBundle xmlns="http://soap.sforce.com/2006/04/metadata">
+    <label>鐢靛瓙绛炬敹绯荤粺</label>
+    <type>ChatterNetworkPicasso</type>
+</ExperienceBundle>
diff --git a/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json b/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json
new file mode 100644
index 0000000..bfc3f2a
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/brandingSets/buildYourOwn.json
@@ -0,0 +1,54 @@
+{
+  "definitionName": "starter:branding-starter",
+  "id": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
+  "label": "Build Your Own",
+  "type": "brandingSet",
+  "values": {
+    "ActionColor": "#2574A9",
+    "BorderColor": "#D4D4D4",
+    "CardBackgroundColor": "rgba(255, 255, 255, 0)",
+    "CompanyLogo": "",
+    "DetailTextColor": "#696969",
+    "ErrorFontColor": "#ff9e9e",
+    "HeaderFonts": "Montserrat",
+    "LinkColor": "#2574A9",
+    "LoginBackgroundColor": "#F4F4F4",
+    "LoginBackgroundImage": "../../../../sfsites/picasso/core/external/salesforceIdentity/images/background.jpg?v=1",
+    "OverlayTextColor": "#FFFFFF",
+    "PrimaryFont": "Lato",
+    "TextColor": "#333",
+    "TextTransformStyle": "uppercase",
+    "_ActionColorDarker": "#1c577f",
+    "_ActionColorTrans": "rgba(37, 116, 169, 0.9)",
+    "_BackgroundColor1": "rgb(235, 235, 235)",
+    "_BackgroundColor2": "rgb(194, 194, 194)",
+    "_BackgroundColor3": "rgb(133, 133, 133)",
+    "_DxpPageBackgroundColor": "#FFFFFF",
+    "_HoverColor": "rgba(37, 116, 169, 0.05)",
+    "_LinkColorDarker": "#135F90",
+    "_NeutralColor": "#ecebea",
+    "_NeutralColor1": "rgb(217, 215, 213)",
+    "_NeutralColor2": "rgb(178, 174, 170)",
+    "_NeutralColor3": "rgb(118, 113, 107)",
+    "_NeutralForegroundColor": "#000",
+    "_NeutralForegroundColor1": "#000",
+    "_NeutralForegroundColor2": "#000",
+    "_NeutralForegroundColor3": "#fff",
+    "_OverlayTextColorShadow": "#000",
+    "_PrimaryAccentColor1": "rgb(30, 93, 136)",
+    "_PrimaryAccentColor2": "rgb(15, 47, 69)",
+    "_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)",
+    "_TextColor2": "rgb(0, 0, 0)",
+    "_TextColor3": "rgb(0, 0, 0)",
+    "_brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
+    "_brandNavigationItemBackgroundColorHover": "rgba(0,0,0,.2)",
+    "_brandNavigationItemDividerColor": "rgba(255, 255, 255, 0.2)",
+    "brandNavigationBackgroundColor": "rgb(128,128,128)",
+    "brandNavigationBarBackgroundColor": "rgba(128,128,128,.75)",
+    "brandNavigationColorText": "#FFFFFF"
+  }
+}
diff --git a/force-app/main/default/experiences/Site3/config/languages.json b/force-app/main/default/experiences/Site3/config/languages.json
new file mode 100644
index 0000000..c2f83eb
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/config/languages.json
@@ -0,0 +1,6 @@
+{
+  "defaultCode": "en_US",
+  "defaultLabel": "English (US)",
+  "id": "5d0232d2-9794-4c56-9bf0-642e72abe504",
+  "type": "languageContainer"
+}
diff --git a/force-app/main/default/experiences/Site3/config/loginAppPage.json b/force-app/main/default/experiences/Site3/config/loginAppPage.json
new file mode 100644
index 0000000..5fd11c3
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/config/loginAppPage.json
@@ -0,0 +1,7 @@
+{
+  "cmsSettings": {},
+  "id": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "label": "login",
+  "templateName": "Login Template",
+  "type": "appPage"
+}
diff --git a/force-app/main/default/experiences/Site3/config/mainAppPage.json b/force-app/main/default/experiences/Site3/config/mainAppPage.json
new file mode 100644
index 0000000..0349243
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/config/mainAppPage.json
@@ -0,0 +1,10 @@
+{
+  "cmsSettings": {},
+  "currentThemeId": "64870c02-e4cf-4464-8930-7aed413f325b",
+  "headMarkup": null,
+  "id": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "isRelaxedCSPLevel": false,
+  "label": "main",
+  "templateName": "Starter Template",
+  "type": "appPage"
+}
diff --git "a/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
new file mode 100644
index 0000000..a413c7a
--- /dev/null
+++ "b/force-app/main/default/experiences/Site3/config/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -0,0 +1,11 @@
+{
+  "forgotPasswordRouteId": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+  "isAvailableToGuests": true,
+  "isFilteredComponentsView": false,
+  "isProgressiveRenderingEnabled": false,
+  "loginAppPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "mainAppPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "preferredDomain": "none",
+  "selfRegistrationRouteId": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
+  "type": "site"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/checkPassword.json b/force-app/main/default/experiences/Site3/routes/checkPassword.json
new file mode 100644
index 0000000..2ac915f
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/checkPassword.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "id": "babb4f4f-dc0c-4409-9525-eaded47bc05a",
+  "label": "Check Password",
+  "routeType": "check-password",
+  "type": "route",
+  "urlPrefix": "CheckPasswordResetEmail"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/createRecord.json b/force-app/main/default/experiences/Site3/routes/createRecord.json
new file mode 100644
index 0000000..667f93d
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/createRecord.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "9cb0795b-6c6d-4948-9dcd-68a568028499",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "478d6a03-0784-4adc-ace3-eb9cd6b2915e",
+  "label": "Create Record",
+  "routeType": "createrecord",
+  "type": "route",
+  "urlPrefix": "createrecord"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/error.json b/force-app/main/default/experiences/Site3/routes/error.json
new file mode 100644
index 0000000..ea9cbeb
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/error.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "c792b011-93b7-4274-aa53-359303ca2567",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "c684094f-3175-42c3-9fab-eb858aa3e806",
+  "label": "Error",
+  "pageAccess": "UseParent",
+  "routeType": "error",
+  "type": "route",
+  "urlPrefix": "error"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/forgotPassword.json b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
new file mode 100644
index 0000000..62f3dd7
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/forgotPassword.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "id": "3ca12776-63d6-4edc-bc9a-dc6b0640e27a",
+  "label": "Forgot Password",
+  "routeType": "forgot-password",
+  "type": "route",
+  "urlPrefix": "ForgotPassword"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/home.json b/force-app/main/default/experiences/Site3/routes/home.json
new file mode 100644
index 0000000..4d78d72
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/home.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "b57a9b81-a622-4699-9467-83854f1b4d90",
+  "label": "Home",
+  "pageAccess": "Public",
+  "routeType": "home",
+  "type": "route",
+  "urlPrefix": ""
+}
diff --git a/force-app/main/default/experiences/Site3/routes/login.json b/force-app/main/default/experiences/Site3/routes/login.json
new file mode 100644
index 0000000..5b9ae5f
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/login.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "id": "c2fc667a-c580-447e-bd1e-717b8fe1a209",
+  "label": "Login",
+  "routeType": "login-home",
+  "type": "route",
+  "urlPrefix": ""
+}
diff --git a/force-app/main/default/experiences/Site3/routes/loginError.json b/force-app/main/default/experiences/Site3/routes/loginError.json
new file mode 100644
index 0000000..ff782e2
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/loginError.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "acfc3c4f-6e34-4219-a88a-39af60aece24",
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "id": "c727420f-bf9b-4029-b55f-92bdb38610b5",
+  "label": "Login Error",
+  "routeType": "login-error",
+  "type": "route",
+  "urlPrefix": "error"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/recordDetail.json b/force-app/main/default/experiences/Site3/routes/recordDetail.json
new file mode 100644
index 0000000..a01186c
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/recordDetail.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "30ad0f59-ccc2-4e2a-94af-c6895d29948d",
+  "label": "Record Detail",
+  "routeType": "detail",
+  "type": "route",
+  "urlPrefix": "detail"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/recordList.json b/force-app/main/default/experiences/Site3/routes/recordList.json
new file mode 100644
index 0000000..d89ab24
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/recordList.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "6af539ff-d338-4c8b-9712-cbf354a750df",
+  "label": "Record List",
+  "pageAccess": "UseParent",
+  "routeType": "list",
+  "type": "route",
+  "urlPrefix": "recordlist"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/register.json b/force-app/main/default/experiences/Site3/routes/register.json
new file mode 100644
index 0000000..21864e4
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/register.json
@@ -0,0 +1,9 @@
+{
+  "activeViewId": "f7082e1e-e1e4-4b79-a271-59037e25c845",
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "id": "57c8022e-eb0c-43b6-97dc-a37a1d91b2ca",
+  "label": "Register",
+  "routeType": "self-register",
+  "type": "route",
+  "urlPrefix": "SelfRegister"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/relatedRecordList.json b/force-app/main/default/experiences/Site3/routes/relatedRecordList.json
new file mode 100644
index 0000000..e871efd
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/relatedRecordList.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "df2fbc80-2a44-4533-b646-40276661a5cf",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "b568f84d-743c-40dc-a171-62223c7c0acc",
+  "label": "Related Record List",
+  "pageAccess": "UseParent",
+  "routeType": "relatedlist",
+  "type": "route",
+  "urlPrefix": "relatedlist"
+}
diff --git a/force-app/main/default/experiences/Site3/routes/search.json b/force-app/main/default/experiences/Site3/routes/search.json
new file mode 100644
index 0000000..c1fce47
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/routes/search.json
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "1b73e50d-9811-4744-8c07-ffc097aa102a",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "05a1e535-f562-40c8-b5e5-e892d06167a8",
+  "label": "Search",
+  "pageAccess": "UseParent",
+  "routeType": "global-search",
+  "type": "route",
+  "urlPrefix": "global-search"
+}
diff --git "a/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
new file mode 100644
index 0000000..f4fa600
--- /dev/null
+++ "b/force-app/main/default/experiences/Site3/routes/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -0,0 +1,10 @@
+{
+  "activeViewId": "224c5f58-859e-49e8-9564-18d11e2ddf47",
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "id": "819d167a-e9e0-46e2-be56-8e5e20dc4a0e",
+  "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+  "pageAccess": "Public",
+  "routeType": "custom-esign-data-entry",
+  "type": "route",
+  "urlPrefix": "EsignDataEntry"
+}
diff --git a/force-app/main/default/experiences/Site3/themes/buildYourOwn.json b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
new file mode 100644
index 0000000..bf8a3f0
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/themes/buildYourOwn.json
@@ -0,0 +1,149 @@
+{
+  "activeBrandingSetId": "9ba9ab62-f2a8-47e3-8267-adedbceaab7f",
+  "customCSS": "",
+  "developerName": "starter",
+  "id": "64870c02-e4cf-4464-8930-7aed413f325b",
+  "label": "Build Your Own",
+  "layouts": {
+    "Inner": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+    "Login": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+    "ServiceNotAvailable": "1664c7f7-6090-4a0d-bfc2-3191064ecd96"
+  },
+  "type": "theme",
+  "views": [
+    {
+      "componentAttributes": {},
+      "componentName": "salesforceIdentity:loginBody2",
+      "id": "a33c4bb6-054d-4319-a5bb-f27d28d0db18",
+      "label": "Login",
+      "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
+      },
+      "componentName": "siteforce:starterBody",
+      "id": "bf29ed2d-40ed-45cd-b4d1-c6ff6e1b20c6",
+      "label": "Default",
+      "regions": [
+        {
+          "components": [
+            {
+              "componentAttributes": {
+                "maxAutoCompleteResults": 5,
+                "searchLabel": "Search...",
+                "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": [
+            {
+              "componentAttributes": {
+                "accountManagementLabel": "Account Management",
+                "communityBuilderLabel": "Experience Builder",
+                "communitySetupLabel": "Salesforce Setup",
+                "contactSupportLabel": "Contact Support",
+                "filterName": "MyCases",
+                "homeLabel": "Home",
+                "includeContactSupport": true,
+                "includeMessages": false,
+                "loginLabel": "Login",
+                "logoutLabel": "Logout",
+                "myAccountLabel": "My Account",
+                "showAccountManagement": true,
+                "showUserSettings": true,
+                "userSettingsLabel": "My Settings",
+                "viewProfileLabel": "My Profile"
+              },
+              "componentName": "selfService:userProfileMenu",
+              "id": "886ade64-9894-4fb5-9f0a-91f718f37a7c",
+              "renditionMap": {},
+              "type": "component"
+            }
+          ],
+          "id": "b93ff3ad-6fb8-46b2-90fd-d85ca8c9b475",
+          "regionName": "profileMenu",
+          "type": "region"
+        },
+        {
+          "components": [
+            {
+              "componentAttributes": {
+                "NavigationMenuEditorRefresh": "",
+                "hideAppLauncher": true,
+                "hideHomeText": true
+              },
+              "componentName": "forceCommunity:globalNavigation",
+              "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)",
+        "isHeaderPinned": false,
+        "isHeroUnderHeader": false,
+        "isPageWidthFixed": true,
+        "showHeader": true,
+        "showHero": true
+      },
+      "componentName": "siteforce:themeLayoutStarter",
+      "id": "1664c7f7-6090-4a0d-bfc2-3191064ecd96",
+      "label": "ServiceNotAvailable",
+      "regions": [
+        {
+          "id": "2bf842b8-e94c-4694-bf82-3f82bfb626fc",
+          "regionName": "themeHeader",
+          "type": "region"
+        },
+        {
+          "id": "e598c1cc-513c-4cff-9029-ace967593639",
+          "regionName": "themeFooter",
+          "type": "region"
+        }
+      ],
+      "type": "view"
+    }
+  ]
+}
diff --git a/force-app/main/default/experiences/Site3/views/checkPassword.json b/force-app/main/default/experiences/Site3/views/checkPassword.json
new file mode 100644
index 0000000..6754b89
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/checkPassword.json
@@ -0,0 +1,67 @@
+{
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "a0810e9f-b4d6-4a64-80aa-02d99f2c8234",
+  "label": "Check Password",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">NOW, CHECK YOUR EMAIL</span></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "79101fac-0f27-4968-b69b-af30771dcccf",
+          "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>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "c19aadfa-f932-405c-9d25-5d6f43361035",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Back to login</a></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "2a4826d1-54c0-4e91-8d77-23c4152e281d",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "aff6a477-e89c-4adf-865f-a6ed3bf3b795",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Check Password"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/createRecord.json b/force-app/main/default/experiences/Site3/views/createRecord.json
new file mode 100644
index 0000000..b69c06a
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/createRecord.json
@@ -0,0 +1,39 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "9cb0795b-6c6d-4948-9dcd-68a568028499",
+  "label": "Create Record",
+  "regions": [
+    {
+      "id": "d451ff76-e162-4234-bfff-bc56db891edd",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "actionApiName": "{!actionApiName}"
+          },
+          "componentName": "forceCommunity:createRecordForm",
+          "id": "b561a15a-51cf-485f-b7f6-3218203e6325",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/error.json b/force-app/main/default/experiences/Site3/views/error.json
new file mode 100644
index 0000000..25673b8
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/error.json
@@ -0,0 +1,57 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "c792b011-93b7-4274-aa53-359303ca2567",
+  "label": "Error",
+  "regions": [
+    {
+      "id": "1789e5dc-0771-4bbe-bacd-189f7ff243ab",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style='text-align: center;'>Invalid Page</div>"
+          },
+          "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": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Error"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/forgotPassword.json b/force-app/main/default/experiences/Site3/views/forgotPassword.json
new file mode 100644
index 0000000..fd261d2
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/forgotPassword.json
@@ -0,0 +1,79 @@
+{
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "cb26bb2a-86d2-4d95-813b-a1b4e00337e5",
+  "label": "Forgot Password",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><span style=\"font-size:22px\">PASSWORD RESET</span></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "25fd1614-b90d-4eb1-964f-67dea4fb6cea",
+          "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>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "eec833d5-5d1f-4b8b-8c7e-3adf0247e716",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "checkEmailUrl": "./CheckPasswordResetEmail",
+            "submitButtonLabel": "Reset Password",
+            "usernameLabel": "Username"
+          },
+          "componentName": "salesforceIdentity:forgotPassword2",
+          "id": "4d5a81cc-11bf-44f7-84a1-193068441987",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\"><a href=\"./\">Cancel</a></div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "9ca7bc62-3ac5-4dc6-a6bc-52501b674509",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "231c935f-3d29-4c7c-8e69-5cb4c7c2ba99",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Forgot Password"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/home.json b/force-app/main/default/experiences/Site3/views/home.json
new file mode 100644
index 0000000..f8ba033
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/home.json
@@ -0,0 +1,45 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "e2e60370-e191-4f54-8b77-7da2fdc0c01f",
+  "label": "Home",
+  "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": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Home"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/login.json b/force-app/main/default/experiences/Site3/views/login.json
new file mode 100644
index 0000000..4ca7bb1
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/login.json
@@ -0,0 +1,84 @@
+{
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "6d2b638e-a48b-49d3-a675-e36e30791e1c",
+  "label": "Login",
+  "regions": [
+    {
+      "components": [
+        {
+          "componentAttributes": {},
+          "componentName": "salesforceIdentity:communityLogo2",
+          "id": "6ee68cfc-86b4-4a2b-b8d3-0eae20c8c71e",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "forgotPasswordLabel": "Forgot your password?",
+            "forgotPasswordUrl": "/ForgotPassword",
+            "loginButtonLabel": "Log in",
+            "passwordLabel": "Password",
+            "selfRegisterLabel": "Not a member?",
+            "selfRegisterUrl": "/SelfRegister",
+            "startUrl": "",
+            "usernameLabel": "Username"
+          },
+          "componentName": "salesforceIdentity:loginForm2",
+          "id": "e3131b45-1a93-41a0-9226-8042b9c3fda2",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "headerText": "",
+            "showHeader": false,
+            "useCommunityDomainSso": false
+          },
+          "componentName": "salesforceIdentity:socialLogin2",
+          "id": "11821772-7bd0-4462-871a-2f1d3643c6fe",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "employeeLoginLinkLabel": "Are you an employee? Login here"
+          },
+          "componentName": "salesforceIdentity:employeeLoginLink2",
+          "id": "04362051-cb7e-4dc6-8a26-bec13247eb84",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "e58b0f5b-923e-4126-aa5c-610c548487ce",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Login"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/loginError.json b/force-app/main/default/experiences/Site3/views/loginError.json
new file mode 100644
index 0000000..0391d79
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/loginError.json
@@ -0,0 +1,57 @@
+{
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "acfc3c4f-6e34-4219-a88a-39af60aece24",
+  "label": "Login Error",
+  "regions": [
+    {
+      "id": "f0dbcd6d-92d7-48ee-bdfe-878dee8e9a77",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "richTextValue": "<div style=\"text-align: center;\">Invalid Page</div>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "178cb7f3-fed5-4bcb-8b17-8d42d49f03d9",
+          "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": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Login Error"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/recordDetail.json b/force-app/main/default/experiences/Site3/views/recordDetail.json
new file mode 100644
index 0000000..61c55e4
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/recordDetail.json
@@ -0,0 +1,75 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "bb2f4e25-0c5a-46a4-adb6-431ecad42732",
+  "label": "Record Detail",
+  "regions": [
+    {
+      "id": "d7e0c80b-0785-4368-b355-8df9b74d7585",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "recordId": "{!recordId}"
+          },
+          "componentName": "forceCommunity:recordHeadline",
+          "id": "cc81febf-e90c-4506-a6ae-49118bcc9561",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "detailsTabLabel": "Details",
+            "discussionsTabLabel": "Feed",
+            "recordId": "{!recordId}",
+            "relatedTabLabel": "Related",
+            "tab1Type": "details",
+            "tab2Type": "related",
+            "tab3Type": "chatter",
+            "tab4Type": "none",
+            "timelineTabLabel": "Activity"
+          },
+          "componentName": "forceCommunity:recordHomeTabs",
+          "id": "49358887-7f6c-49d2-b870-bca6628902cc",
+          "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": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "{!Record._Object}: {!Record._Title}"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/recordList.json b/force-app/main/default/experiences/Site3/views/recordList.json
new file mode 100644
index 0000000..41cc9ae
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/recordList.json
@@ -0,0 +1,52 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "45ab1ac9-68f0-43e8-af03-88f2f479f2c3",
+  "label": "Record List",
+  "regions": [
+    {
+      "id": "f55ac5c7-e89e-4a0c-b673-369053d0ccbb",
+      "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
+          },
+          "componentName": "forceCommunity:objectHome",
+          "id": "5b78a56c-dcaf-4366-a3fc-eb5c2f685ebc",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/register.json b/force-app/main/default/experiences/Site3/views/register.json
new file mode 100644
index 0000000..d09e199
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/register.json
@@ -0,0 +1,96 @@
+{
+  "appPageId": "2bcb651a-3bf1-4ba0-bf17-8f52e81c95c6",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "f7082e1e-e1e4-4b79-a271-59037e25c845",
+  "label": "Register",
+  "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>"
+          },
+          "componentName": "forceCommunity:richTextInline",
+          "id": "e111c87b-bc77-4bb5-99e3-93e3cb872acb",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "confirmPasswordLabel": "Confirm Password",
+            "emailLabel": "Email",
+            "extraFieldsFieldSet": "",
+            "firstnameLabel": "First Name",
+            "includePasswordField": false,
+            "lastnameLabel": "Last Name",
+            "passwordLabel": "Create Password",
+            "regConfirmUrl": "./CheckPasswordResetEmail",
+            "startUrl": "",
+            "submitButtonLabel": "Sign Up"
+          },
+          "componentName": "salesforceIdentity:selfRegister2",
+          "id": "1708fe03-f5d1-40aa-8a0a-6eadddb49426",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        },
+        {
+          "componentAttributes": {
+            "headerText": "",
+            "showHeader": false,
+            "useCommunityDomainSso": false
+          },
+          "componentName": "salesforceIdentity:socialLogin2",
+          "id": "6f29eeb7-b358-4b9b-abfd-69c860e4f50e",
+          "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": "bf2597c2-b7f9-4dd9-830f-e350ee96b0d1",
+          "renderPriority": "NEUTRAL",
+          "renditionMap": {},
+          "type": "component"
+        }
+      ],
+      "id": "6b062d85-f6af-410f-bc27-1a1da6da32b8",
+      "regionName": "content",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "Register"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/relatedRecordList.json b/force-app/main/default/experiences/Site3/views/relatedRecordList.json
new file mode 100644
index 0000000..48041e9
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/relatedRecordList.json
@@ -0,0 +1,45 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "df2fbc80-2a44-4533-b646-40276661a5cf",
+  "label": "Related Record List",
+  "regions": [
+    {
+      "id": "176c742a-9692-4939-927d-411b650ed76f",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "customTitle": "",
+            "parentRecordId": "{!recordId}",
+            "relatedListName": "{!relationshipApiName}",
+            "showBreadCrumbs": true,
+            "showCustomTitle": false,
+            "showManualRefreshButton": true,
+            "showRowNumbers": true
+          },
+          "componentName": "forceCommunity:relatedList",
+          "id": "187579cb-db3f-4766-b5fa-33db1ecd8ef9",
+          "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"
+}
diff --git a/force-app/main/default/experiences/Site3/views/search.json b/force-app/main/default/experiences/Site3/views/search.json
new file mode 100644
index 0000000..a943f5a
--- /dev/null
+++ b/force-app/main/default/experiences/Site3/views/search.json
@@ -0,0 +1,59 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "1b73e50d-9811-4744-8c07-ffc097aa102a",
+  "label": "Search",
+  "regions": [
+    {
+      "id": "5a6cc49b-d707-4df0-a634-7c716a793f2a",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "components": [
+        {
+          "componentAttributes": {
+            "scopes": [
+              {
+                "isPublic": true,
+                "name": "FeedPost"
+              },
+              {
+                "isPublic": true,
+                "name": "KnowledgeArticleVersion"
+              },
+              {
+                "isPublic": false,
+                "name": "Case"
+              },
+              {
+                "isPublic": true,
+                "name": "CollaborationGroup"
+              }
+            ],
+            "searchResultFiltering": true,
+            "searchTerm": "{!term}",
+            "showTopResults": true
+          },
+          "componentName": "forceCommunity:search",
+          "id": "822bf1c5-6d8a-493f-aa12-4265f394c257",
+          "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"
+}
diff --git "a/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json" "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
new file mode 100644
index 0000000..c788032
--- /dev/null
+++ "b/force-app/main/default/experiences/Site3/views/\345\245\245\346\236\227\345\267\264\346\226\257\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.json"
@@ -0,0 +1,55 @@
+{
+  "appPageId": "7f290f39-4245-4612-9453-2b0c9f9e3701",
+  "componentName": "siteforce:sldsOneColLayout",
+  "dataProviders": [],
+  "id": "224c5f58-859e-49e8-9564-18d11e2ddf47",
+  "label": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺",
+  "regions": [
+    {
+      "id": "518d33a9-c0b3-4d07-bc99-314ad3b41419",
+      "regionName": "header",
+      "type": "region"
+    },
+    {
+      "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": [
+        {
+          "componentAttributes": {
+            "customHeadTags": "",
+            "description": "",
+            "title": "濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺"
+          },
+          "componentName": "forceCommunity:seoAssistant",
+          "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"
+}
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.js b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
index 1bc8cee..908f97e 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.js
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.js
@@ -1,1388 +1,1690 @@
-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 { 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;
-   @track esetId;
-   @track keyWords;
-   @track coc;
-   @track cocId;
-   @track userWorkLocation;
-   @track accountName;
-   @track accountid;
-   @track specialCampaign = false;
-   @track dealerProductId = [];
-   @track category1;
-   @track category3 = '';
-   @track category4 = '';
-   @track category5 = '';
-   @track category_Goods;
-   @track category3Option = [];
-   @track category4Option = [];
-   @track category5Option = [];
-   @track consumableorderdetailsRecordsview = [];
-   @track currentRecord = [];//鍒嗛〉
-   @track selectRows = [];
-   @track attachmentRecoeds = [];
-   @track contactDealer = [];
-   @track proLimitAndDate = [];
-   @track agencyProType;
-   @track agencyProType1;
-   @track OSHFLG = false;
-   @track bargainPrice;
-   @track showOrderDate = false;
-   @track showAttUploadDate = false;
-   @track edoffersPrice = false;
-   @track editDelCommitBtnDisabled = false;
-   @track showEditBtn = false;
-   @track disabledEditBtn = false;
-   @track showPrintSheetBtn = false;
-   @track showUploadSheetBtn = false;
-   @track disabledUploadSheetBtn = false;
-   @track showSubOrderbtn = false;
-   @track disabledSubOrderbtn = false;
-   @track showSaveOrderbtn1 = false;
-   @track showSaveOrderbtn2 = false;
-   @track showDeleteBtn = false;
-   @track disabledDeleteBtn = false;
-   @track showOfferPriceInputBtn = false;
-   @track disabledOfferPriceInputBtn = false;
-   @track showReapplyBtn = false;
-   @track showHospital = false;
-   @track showPage = false;
-   @track cansee = false;
-   @track showSpinner = true;
-   @track showPopSpinner = false;
-   stylesLoaded = false;
-   //鏄惁涓�鐩存樉绀烘彁绀�
-   @track isNoteStay = true;
-   //鎺掑簭鐩稿叧
-   @track sortDirection = 'asc';
-   @track sortedBy;
-   //鍒嗛〉
-   @track currentPage = 1;
-   @track pageSize = 10;
-   // @track totalPage = 0;
-   @track pageSizeOptions = [10, 25, 50, 100];
-   @track recordStart = 0;
-   @track recordEnd = 0;
-   //鎶ラ敊鎻愰啋
-   // @track hasError = false;
-   @track errorMsgs = [];
-   // @track hasWarning = false;
-   @track warningMsgs = [];
-   //闄勪欢涓婁紶
-   @track showAttPop = false;
-   @track filesUploaded = [];
-   @track fileName;
-   file;
-   fileContents;
-   fileReader;
-   content;
-   //鍖婚櫌鎼滅储
-   @track showAttHosPop = false;
-   @track hospitalList = [];
-   @track searchNameHos;
-   @track chooseHospital;
-   @track chooseHospitalId;
-   @track hospitalId;
-   @track hospitalName;
-   @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}
-   ];
-   //鍚堝悓鎼滅储
-   @track contractLabel;
-   @track showConPop = false;
-   @track contractList = [];
-   @track searchNameCon;
-   @track chooseContract;
-   @track chooseContractId; 
-   @track contractId;
-   @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}
-   ];
+  //椤甸潰鍩虹鏁版嵁
+  @track editAble;
+  @track pageType;
+  @track esetId;
+  @track keyWords;
+  @track coc;
+  @track cocId;
+  @track userWorkLocation;
+  @track accountName;
+  @track accountid;
+  @track specialCampaign = false;
+  @track dealerProductId = [];
+  @track category1;
+  @track category3 = "";
+  @track category4 = "";
+  @track category5 = "";
+  @track category_Goods;
+  @track category3Option = [];
+  @track category4Option = [];
+  @track category5Option = [];
+  @track consumableorderdetailsRecordsview = [];
+  @track currentRecord = []; //鍒嗛〉
+  @track selectRows = [];
+  @track attachmentRecoeds = [];
+  @track contactDealer = [];
+  @track proLimitAndDate = [];
+  @track agencyProType;
+  @track agencyProType1;
+  @track OSHFLG = false;
+  @track bargainPrice;
+  @track showOrderDate = false;
+  @track showAttUploadDate = false;
+  @track edoffersPrice = false;
+  @track editDelCommitBtnDisabled = false;
+  @track showEditBtn = false;
+  @track disabledEditBtn = false;
+  @track showPrintSheetBtn = false;
+  @track showUploadSheetBtn = false;
+  @track disabledUploadSheetBtn = false;
+  @track showSubOrderbtn = false;
+  @track disabledSubOrderbtn = false;
+  @track showSaveOrderbtn1 = false;
+  @track showSaveOrderbtn2 = false;
+  @track showDeleteBtn = false;
+  @track disabledDeleteBtn = false;
+  @track showOfferPriceInputBtn = false;
+  @track disabledOfferPriceInputBtn = false;
+  @track showReapplyBtn = false;
+  @track showHospital = false;
+  @track showPage = false;
+  @track cansee = false;
+  @track showSpinner = true;
+  @track showPopSpinner = false;
+  stylesLoaded = false;
+  //鏄惁涓�鐩存樉绀烘彁绀�
+  @track isNoteStay = true;
+  //鎺掑簭鐩稿叧
+  @track sortDirection = "asc";
+  @track sortedBy;
+  //鍒嗛〉
+  @track currentPage = 1;
+  @track pageSize = 10;
+  // @track totalPage = 0;
+  @track pageSizeOptions = [10, 25, 50, 100];
+  @track recordStart = 0;
+  @track recordEnd = 0;
+  //鎶ラ敊鎻愰啋
+  // @track hasError = false;
+  @track errorMsgs = [];
+  // @track hasWarning = false;
+  @track warningMsgs = [];
+  //闄勪欢涓婁紶
+  @track showAttPop = false;
+  @track filesUploaded = [];
+  @track fileName;
+  file;
+  fileContents;
+  fileReader;
+  content;
+  //鍖婚櫌鎼滅储
+  @track showAttHosPop = false;
+  @track hospitalList = [];
+  @track searchNameHos;
+  @track chooseHospital;
+  @track chooseHospitalId;
+  @track hospitalId;
+  @track hospitalName;
+  @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
+    }
+  ];
+  //鍚堝悓鎼滅储
+  @track contractLabel;
+  @track showConPop = false;
+  @track contractList = [];
+  @track searchNameCon;
+  @track chooseContract;
+  @track chooseContractId;
+  @track contractId;
+  @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
+    }
+  ];
 
-   //娑堣�楀搧鏁版嵁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});
-      if(this.cansee){
-         cols.push({label:'鏍囧噯鍗曚环',type:'number',typeAttributes:{minimumFractionDigits: 2},fieldName:'prodIntraTradeList',hideDefaultActions: true,initialWidth:80});
-      }
-      if(this.editAble){
-         cols.push(
-            {label:'閲囪喘鏁伴噺',
-            type: "customTableInput",typeAttributes: {
-               recordId: { fieldName: "recordId" },
-               inputValue: { fieldName: "consumableCount" },
-               upperLimit: { fieldName: "upperlimit" },
-               lowerLimit: { fieldName: "lowerlimit" },
-               allnumber: { fieldName: "allnumber" },
-               valueType: 'Number'
-            },
-            hideDefaultActions: true,initialWidth:80});
-      }else{
-         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:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
-      cols.push(
-         {label:'鏈夋晥鏈熷簱瀛�(鐩�)',
-         type: "customInventoryColor",
-         typeAttributes: {
-            value: { fieldName: "allnumber" },
-            upperlimit: { fieldName: "upperlimit" },
-            lowerlimit: { fieldName: "lowerlimit" },
-            boxPrice: '鐩�'
-         },
-         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}
-   ];
-
-   //鍙栧緱鎵�鏈夎鍕鹃�夌殑浜у搧id
-   getAllChecked(){
-      this.selectRows = [];
-      for(var i in this.currentRecord){
-         if(this.currentRecord[i].check){
-            this.selectRows.push(this.currentRecord[i].recordId);
-         }
-      }
-   }
-
-   //鍕鹃�夋搷浣�
-   checkRows(event){
-      this.selectRows = [];
-      const selectedRows = event.detail.selectedRows;
-      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(count == 0){
-            this.consumableorderdetailsRecordsview[i].check = false;
-         }else{
-            this.consumableorderdetailsRecordsview[i].check = true;
-            this.selectRows.push(this.consumableorderdetailsRecordsview[i].recordId);
-         }
-      }
-      for(var i in this.selectRows){
-         console.log("checkId1:"+this.selectRows[i]);
-         for(var i in this.currentRecord){
-            if(this.currentRecord[i].recordId == this.selectRows[i]){
-               console.log("currentRecord:"+this.selectRows[i]);
-            }
-         }
-      }
-   }
-
-   //閲囪喘鏁伴噺鑾峰彇
-   conCountChange(event){
-      var recordId = event.detail.data.recordId;
-      var conCount = event.detail.data.value;
-      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].consumableCount = conCount;
-            if(conCount != null && conCount !=0 && conCount!=''){
-               this.consumableorderdetailsRecordsview[i].check = true;
-            }else{
-               this.consumableorderdetailsRecordsview[i].check = false;
-            }
-         }
-      }
-      this.getAllChecked();
-      for(var i in this.currentRecord){
-         if(this.currentRecord[i].recordId == recordId){
-            console.log("currentRecord1:"+this.currentRecord[i].esd.Consumable_count__c);
-         }
-      }
-   }
-
-   //閲囪喘鏁伴噺澶辩劍
-   conCountBlur(event){
-      var conCount = event.detail.data.value;
-      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){
-         if(parseInt(allnumber) + parseInt(conCount) > upperLimit){
-            // window.alert("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒");
-            this.showMyToast('璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒','','error');
-         }
-         if(parseInt(allnumber) + parseInt(conCount) < lowerLimit){
-            // window.alert("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒");
-            this.showMyToast('璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒','','error');
-         }
-      }
-   }
-
-   @wire(CurrentPageReference)
-   getStateParameters(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);
-      }
-   }
-
-   renderedCallback(){ 
-      if (!this.stylesLoaded) {
-          Promise.all([loadStyle(this, WrappedHeaderTable)])
-              .then(() => {
-                  console.log("Custom styles loaded");
-                  this.stylesLoaded = true;
-              })
-              .catch((error) => {
-                  console.error("Error loading custom styles");
-              });
-      }
-   }
-   
-   //椤甸潰鍒濆鍖�
-   connectedCallback(){
-      this.showSpinner = true;
-      initPage({type:this.pageType, esetId:this.esetId, keywordStr:this.keyWords})
-         .then(result=>{
-            this.isNoteStay = result.isNoteStay;
-            if(result.result == 'Success'){
-               this.editAble = result.editAble;
-               this.edoffersPrice = result.edoffersPrice;
-               this.cansee = result.cansee;
-               this.editDelCommitBtnDisabled = result.editDelCommitBtnDisabled;
-               this.category3Option = result.category3Option;
-               this.category4Option = result.category4Option;
-               this.category5Option = result.category5Option;
-               this.agencyProType = result.agencyProType;
-               this.agencyProType1 = result.agencyProType1;
-               this.OSHFLG = result.OSHFLG;
-               this.hospitalName = result.hospitalName;
-               this.contractName = result.contractName;
-               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;
-                  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';
-                  // 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.errorMsgs = result.errorMsgList;
-               this.warningMsgs = result.warningMsgList;
-               this.userWorkLocation = result.userWorkLocation;
-               this.accountName = result.accountName;
-               this.accountid = result.accountid;
-               this.hospitalId = result.hospitalId;
-               this.contractId = result.contractId;
-               this.category_Goods = result.category_Goods;
-               this.specialCampaign = result.specialCampaign;
-               this.dealerProductId = result.dealerProductId;
-               this.contactDealer = result.contactDealer;
-               this.pageType = result.methodType;
-               this.proLimitAndDate = result.proLimitAndDate;
-               console.log("proLimitAndDate:"+JSON.stringify(this.proLimitAndDate));
-               this.coc = result.coc;
-               this.cocId = this.coc.Id;
-               if(this.pageType == 'hospitalorder' && this.agencyProType != 'ET'){
-                  this.showHospital = true;
-               }
-               if(this.coc.Order_status__c == "宸叉彁浜�" || this.coc.Order_status__c == "鎵瑰噯"){
-                  this.showOrderDate = true;
-               }
-               if(this.coc.Consumable_pdf_insert_day__c != null){
-                  this.showAttUploadDate = true;
-               }
-               if(!(this.editAble || this.edoffersPrice)){
-                  this.showEditBtn = true;
-                  this.showOfferPriceInputBtn = true;
-               }
-               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)){
-                  this.showPrintSheetBtn = true;
-                  this.showUploadSheetBtn = true;
-                  this.showSubOrderbtn = true;
-                  this.showDeleteBtn = true;
-               }
-               if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "椹冲洖"){
-                  this.showSaveOrderbtn1 = true;
-               }
-               if(this.coc.Order_status__c == "椹冲洖" && this.editAble){
-                  this.showSaveOrderbtn2 = true;
-               }
-               if(this.coc.Order_status__c == "椹冲洖" && !this.editAble){
-                  this.showReapplyBtn = true;
-               }
-               this.showSpinner = false;
-               this.showPage = true;
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鍒濆鍖栭〉闈㈠け璐�',result.errorMsg,'error');
-            }
-         })
-         .catch(error=>{
-            this.showSpinner = false;
-            console.log("error:"+error);
-            this.showMyToast('鍒濆鍖栭〉闈㈠け璐�',error,'error');
-         })
-   }
-
-   //鎺掑簭
-   onHandleSort(event){
-      //灏嗗凡缁忛�夊ソ浜嗙殑鏀惧埌鍓嶉潰锛屼笉杩涜鎺掑簭
-      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));
-         let index = 0;
-         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));
-         for(var i = 0;i < cloneData.length ; i++){
-            if(selectedRowsIds.indexOf(cloneData[i].recordId) != -1){
-               if(i != 0){
-                  let temp = cloneData[index];
-                  cloneData[index] = cloneData[i];
-                  cloneData[i] = temp;
-               }
-               index++;
-            }
-         }
-         this.currentRecord = cloneData;
-         this.sortDirection = sortDirection;
-         this.sortedBy = sortedBy;
-      }else{
-         const { fieldName: sortedBy, sortDirection } = event.detail;
-         const cloneData = [...this.currentRecord];
-         cloneData.sort(this.sortBy(sortedBy, sortDirection === 'asc' ? 1 : -1));
-         this.currentRecord = cloneData;
-         this.sortDirection = sortDirection;
-         this.sortedBy = sortedBy;
-      }
-   }
-
-   sortBy(field, reverse, primer) {
-      const key = primer
-          ? function (x) {
-                return primer(x[field]);
-            }
-          : function (x) {
-                return x[field];
-            };
-
-      return function (a, b) {
-          a = key(a);
-          b = key(b);
-          return reverse * ((a > b) - (b > a));
-      };
-   }
-   
-   //鏄惁鏈夎鍛�
-   get hasWarning(){
-      if(this.warningMsgs == null || this.warningMsgs.length == 0){
-         return false;
-      }
-      if(this.warningMsgs.length > 0){
-         return true;
-      }
-   }
-
-   //鏄惁鏈夐敊璇�
-   get hasError(){
-      if(this.errorMsgs == null || this.errorMsgs.length == 0){
-         return false;
-      }
-      if(this.errorMsgs.length > 0){
-         return true;
-      }
-   }
-
-   //鐗逛环change浜嬩欢
-   offerPriceChange(event){
-      this.coc.Offers_Price__c = event.detail.value;
-   }
-
-   //娑堣�楀搧鍚嶇Оchange浜嬩欢
-   category1Change(event){
-      this.category1 = event.detail.value;
-   }
-
-   //绗笁鍒嗙被change浜嬩欢
-   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.category4Option = result.category4Option;
-               this.category5Option = result.category5Option;
-               this.showSpinner = false;
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               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.category4Option = result.category4Option;
-               this.category5Option = result.category5Option;
-               this.showSpinner = false;
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鍔犺浇鍒嗙被澶辫触',result.errorMsg,'error');
-            }
-         })
-   }
-
-   //绗簲鍒嗙被change浜嬩欢
-   category5Change(event){
-      this.category5 = event.detail.value;
-   }
-
-   //鎼滅储浜у搧
-   searchProduct(event){
-      this.showSpinner = true;
-      searchConsumableorderdetails({userWorkLocationStr:this.userWorkLocation,
-         agencyProTypeStr:this.agencyProType,
-         accountNameStr:this.accountName,
-         accountIdStr:this.accountid,
-         contractIdStr:this.contractId,
-         hospitalIdStr:this.hospitalId,
-         category1Str:this.category1, 
-         category3Str:this.category3, 
-         category4Str:this.category4, 
-         category5Str:this.category5, 
-         category_GoodStr:this.category_Goods, 
-         specialCampaignStr:this.specialCampaign, 
-         dealerProductIdStr:JSON.stringify(this.dealerProductId), 
-         methodTypeStr:this.pageType,
-         editAbleStr:this.editAble,
-         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
-         proLimitAndDateList : this.proLimitAndDate
-      })
-            .then(result=>{
-               if(result.result == 'Success'){
-                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
-                  this.currentPage = 1;
-                  this.currentRecord = [];
-                  this.showCurrentReocrd();
-                  this.getAllChecked();
-                  this.showSpinner = false;
-                  this.errorMsgs = result.errorMsgList;
-                  this.warningMsgs = result.warningMsgList;
-                  // this.hasError = result.hasError;
-                  // this.hasWarning = result.hasWarning;
-                  this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
-               }else{
-                  this.showSpinner = false;
-                  console.log("Error:"+result.errorMsg);
-                  if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
-                     this.showMyToast(result.errorMsg,'','error');
-                  }else{
-                     this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
-                  }
-               }
-            })
-            .catch(error=>{
-               console.log("Error:"+error);
-            })
-   }
-
-   //娓呴櫎鎼滅储鏍�
-   clear(event){
-      this.category1 = '';
-      this.category3 = '';
-      this.category4 = '';
-      this.category5 = '';
-      this.showSpinner = true;
-      searchConsumableorderdetails({
-         userWorkLocationStr:this.userWorkLocation,
-         agencyProTypeStr:this.agencyProType,
-         accountNameStr:this.accountName,
-         accountIdStr:this.accountid,
-         contractIdStr:this.contractId,
-         hospitalIdStr:this.hospitalId,
-         category1Str:this.category1, 
-         category3Str:this.category3, 
-         category4Str:this.category4, 
-         category5Str:this.category5, 
-         category_GoodStr:this.category_Goods, 
-         specialCampaignStr:this.specialCampaign, 
-         dealerProductIdStr:JSON.stringify(this.dealerProductId), 
-         methodTypeStr:this.pageType,
-         editAbleStr:this.editAble,
-         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
-         proLimitAndDateList : this.proLimitAndDate
-      }).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');
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
-                  this.showMyToast(result.errorMsg,'','error');
-               }else{
-                  this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
-               }
-            }
-         })
-   }
-
-   //閫夋嫨鎵�鏈�
-   checkAll(event){
-      for(let i=0, len=this.consumableorderdetailsRecordsview.length; i < len ;i++){
-         this.consumableorderdetailsRecordsview[i].check = event.target.checked;
-      }
-   }
-
-   //閫夋嫨
-   check(event){
-      let index = event.target.getAttribute("data-index");
-      this.consumableorderdetailsRecordsview[index].check = event.target.checked;
-   }
-
-   //閲囪喘鏁伴噺change浜嬩欢
-   // consumableCountChange(event){
-   //    let index = event.target.getAttribute("data-index");
-   //    var value = event.target.value;
-   //    this.consumableorderdetailsRecordsview[index].esd.Consumable_count__c = value;
-   //    if(isNaN(value)){
-   //       value=0.00;
-   //    }
-   //    if(value != null && value !=0 && value!=''){
-   //       this.consumableorderdetailsRecordsview[index].check = true;
-   //    }else{
-   //       this.consumableorderdetailsRecordsview[index].check = false;
-   //    }
-   // }
-
-   //淇濆瓨璁㈠崟
-   saveOrder(event){
-      this.showSpinner = true;
-      console.log('start save');
-      save({
-         contractNameStr:this.contractName,
-         cocStr:JSON.stringify(this.coc),
-         agencyProTypeStr:this.agencyProType,
-         accountidStr:this.accountid,
-         consumableorderdetailsRecordsviewStr:JSON.stringify(this.consumableorderdetailsRecordsview),
-         contactDealerStr:JSON.stringify(this.contactDealer),
-         methodTypeStr:this.pageType,
-         eSetIdStr:this.esetId,
-         hospitalIdStr : this.hospitalId,
-         contractIdStr : this.contractId,
-         agencyProType1Str : this.agencyProType1,
-         OSHFLGStr : this.OSHFLG
-      }).then(result=>{
-         this.showSpinner = false;
-         if(result.result == 'Success'){
-            this.esetId = result.eSetId;
-            const config = {
-               type: 'standard__webPage',
-               attributes: {
-                  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');
-         }
-      })
-   }
-
-   //淇濆瓨璁㈠崟锛堥┏鍥烇級
-   orderCopy(event){
-      this.showSpinner = true;
-      ordrCopy({
-         contractNameStr:this.contractName,
-         cocStr:JSON.stringify(this.coc),
-         agencyProTypeStr:this.agencyProType,
-         accountidStr:this.accountid,
-         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=>{
-         this.showSpinner = false;
-         if(result.result == 'Success'){
-            this.esetId = result.eSetId;
-            const config = {
-               type: 'standard__webPage',
-               attributes: {
-                   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');
-         }
-      })
-   }
-
-   //缂栬緫
-   editOrder(event){
-      setEditAble({eSetidStr:this.esetId})
-         .then(result=>{
-            if(result.result == 'Success'){
-               const config = {
-                  type: 'standard__webPage',
-                  attributes: {
-                      url: result.url
-                  }
-               };
-              this[NavigationMixin.Navigate](config);
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('缂栬緫澶辫触',result.errorMsg,'error');
-            }
-         })
-   }
-
-   //鎵撳嵃閰嶇疆鍗�
-   printOrder(event){
-      var site = window.location.origin;
-      const config = {
-         type: 'standard__webPage',
-         attributes: {
-            url: site+'/consumable/PrintConsumblePDF?ESetid='+this.esetId
-         }
-      };
-      this[NavigationMixin.Navigate](config);
-   }
-
-   //涓婁紶閰嶇疆鍗�
-   uploadOrder(event){
-      this.showAttPop = true;
-   }
-
-   //鎻愪氦璁㈠崟
-   submitOrder(event){
-      sorder({eSetidStr:this.esetId,accountidStr:this.accountid})
-         .then(result=>{
-            if(result.result == 'Success'){
-               const config = {
-                  type: 'standard__webPage',
-                  attributes: {
-                     url: result.url
-                  }
-               };
-               this[NavigationMixin.Navigate](config);
-            }else{
-               this.showSpinner = false;
-               this.errorMsgs = result.errorMsgList;
-               this.warningMsgs = result.warningMsgList;
-               console.log("Error:"+result.errorMsg);
-               if(result.errorMsg.indexOf("璇蜂笂浼犺璐ч厤缃崟闄勪欢") != -1){
-                  result.errorMsg = '璇蜂笂浼犺璐ч厤缃崟闄勪欢';
-               }
-               this.showMyToast('鎻愪氦澶辫触',result.errorMsg,'error');
-            }
-         })
-         .catch(error=>{
-            console.log("Error:"+error);
-         })
-   }
-
-   //鍒犻櫎璁㈠崟
-   deleteOrder(event){
-      if(!window.confirm('鍒犻櫎鏄笉鍙仮澶嶇殑锛屼綘纭瑕佸垹闄ゅ悧锛�')){
-         return;
-      }
-      delConsumable({eSetidStr:this.esetId})
-         .then(result=>{
-            if(result.result == 'Success'){
-               const config = {
-                  type: 'standard__webPage',
-                  attributes: {
-                     url: result.url
-                  }
-            };
-            this[NavigationMixin.Navigate](config);
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鍒犻櫎澶辫触',result.errorMsg,'error');
-            }
-         })
-   }
-
-   //鐗逛环閲戦褰曞叆
-   inputOfferPrice(event){
-      this.edoffersPrice = true;
-      if(!(this.editAble || this.edoffersPrice)){
-         this.showEditBtn = true;
-         this.showOfferPriceInputBtn = true;
-      }else{
-         this.showEditBtn = false;
-         this.showOfferPriceInputBtn = false;
-      }
-      if(!(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)){
-         this.showPrintSheetBtn = true;
-         this.showUploadSheetBtn = true;
-         this.showSubOrderbtn = true;
-         this.showDeleteBtn = true;
-      }else{
-         this.showPrintSheetBtn = false;
-         this.showUploadSheetBtn = false;
-         this.showSubOrderbtn = false;
-         this.showDeleteBtn = false;
-      }
-      if((this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) && this.coc.Order_status__c != "椹冲洖"){
-         this.showSaveOrderbtn1 = true;
-      }else{
-         this.showSaveOrderbtn1 = false;
-      }
-   }
-
-   //鍐嶇敵璇�
-   reapplyOrder(event){
-      backOrder({eSetidStr:this.esetId})
-         .then(result=>{
-            if(result.result == 'Success'){
-               const config = {
-                  type: 'standard__webPage',
-                  attributes: {
-                     url: result.url
-                  }
-            };
-            this[NavigationMixin.Navigate](config);
-            }else{
-               this.showSpinner = false;
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鍐嶇敵璇峰け璐�',result.errorMsg,'error');
-            }
-         })
-   }
-
-   //闄勪欢change浜嬩欢
-   attChange(event){
-      if(event.target.files.length > 0) {
-         this.filesUploaded = event.target.files;
-         this.fileName = event.target.files[0].name;
-         console.log('this.fileName:'+this.fileName);
-      }
-   }
-
-   //鏄惁鏄剧ず闄勪欢绉婚櫎
-   get attDelBtn(){
-      if(this.fileName != '' && this.fileName != null && this.fileName != '璇烽�夋嫨涓�涓枃浠朵笂浼�'){
-         return true;
-      }else{
-         return false;
-      }
-   }
-
-   //鍏抽棴闄勪欢寮圭獥
-   closePop(){
-      this.showAttPop = false;
-      this.filesUploaded = [];
-      this.fileName = null;
-   }
-
-   //绉婚櫎闄勪欢
-   removeAtt(){
-      this.filesUploaded = [];
-      this.fileName = '';
-   }
-
-   //涓婁紶闄勪欢
-   uploadAtt(event){
-      if(this.filesUploaded.length > 0) {
-         this.file = this.filesUploaded[0];
-         if (this.file.size > this.MAX_FILE_SIZE) {
-            window.console.log('鏂囦欢杩囧ぇ');
-            return ;
-         }
-         this.fileReader= new FileReader();
-
-         this.fileReader.onloadend = (() => {
-            this.fileContents = this.fileReader.result;
-            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 = '璇烽�夋嫨涓�涓枃浠朵笂浼�';
-      }
-   }
-
-   //璋冪敤涓婁紶闄勪欢鍚庡彴鏂规硶
-   saveToFile() {
-      this.showPopSpinner = true;
-      filesUpload({pId:this.esetId, fileName: this.file.name, base64Data: encodeURIComponent(this.fileContents)})
-         .then(result => {
-            this.showPopSpinner = false;
-            if(result.result == 'Success'){
-               this.closePop();
-               window.location.reload();
-            }else{
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('涓婁紶澶辫触',result.errorMsg,'error');
-            }
-         })
-         .catch(error => {
-            this.showPopSpinner = false;
-            this.showMyToast('涓婁紶澶辫触',error,'error');
-         });
-   }
-
-   //鍒犻櫎闄勪欢
-   deleteAtt(event){
-      this.showSpinner = true;
-      var recordId = event.target.getAttribute("data-fileid");
-      console.log('attid:'+recordId);
-      deleteAtt({contentVersionId : recordId})
-      .then(result=>{
-         this.showSpinner = false;
-         if(result.result == 'Success'){
-            window.location.reload();
-         }else{
-            console.log("Error:"+result.errorMsg);
-            this.showMyToast('鍒犻櫎澶辫触',result.errorMsg,'error');
-         }
-      })
-      .catch(error=>{
-         this.showSpinner = false;
-         console.log("Error:"+error);
-         this.showMyToast('鍒犻櫎澶辫触',JSON.stringify(error),'error');
-      })
-   }
-
-   //棰勮闄勪欢
-   previweAtt(event){
-      var recordId = event.target.getAttribute("data-fileid");
-      console.log(recordId);
-      this[NavigationMixin.Navigate]({ 
-         type:'standard__namedPage',
-         attributes:{ 
-            pageName:'filePreview'
-         },
-         state:{ 
-            recordIds: recordId,
-            selectedRecordId: recordId
-         }
+  //娑堣�楀搧鏁版嵁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
+    });
+    if (this.cansee) {
+      cols.push({
+        label: "鏍囧噯鍗曚环",
+        type: "number",
+        typeAttributes: { minimumFractionDigits: 2 },
+        fieldName: "prodIntraTradeList",
+        hideDefaultActions: true,
+        initialWidth: 80
       });
-   }
+    }
+    if (this.editAble) {
+      cols.push({
+        label: "閲囪喘鏁伴噺",
+        type: "customTableInput",
+        typeAttributes: {
+          recordId: { fieldName: "recordId" },
+          inputValue: { fieldName: "consumableCount" },
+          upperLimit: { fieldName: "upperlimit" },
+          lowerLimit: { fieldName: "lowerlimit" },
+          allnumber: { fieldName: "allnumber" },
+          valueType: "Number"
+        },
+        hideDefaultActions: true,
+        initialWidth: 80
+      });
+    } else {
+      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:'allnumber',hideDefaultActions: true,initialWidth:105,sortable: true});
+    cols.push({
+      label: "鏈夋晥鏈熷簱瀛�(鐩�)",
+      type: "customInventoryColor",
+      typeAttributes: {
+        value: { fieldName: "allnumber" },
+        upperlimit: { fieldName: "upperlimit" },
+        lowerlimit: { fieldName: "lowerlimit" },
+        boxPrice: "鐩�"
+      },
+      hideDefaultActions: true,
+      initialWidth: 126
+    });
+    cols.push({
+      label: "鏈夋晥鏈熷簱瀛�(涓�)",
+      fieldName: "allnumber_piece",
+      hideDefaultActions: true,
+      initialWidth: 126,
+      cellAttributes: { alignment: "right" }
+    });
+    return cols;
+  }
 
-   //鎵撳紑鎼滅储寮圭獥锛屽苟鍒濆鍖栧脊绐�
-   showSearchHos(event){
-      initHospital()
-         .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;
-                  }
-               }
-            }else{
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�',result.errorMsg,'error');
-            }
-         })
-         .catch(error=>{
-            console.log("Error:"+error);
-            this.showMyToast('鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�',error,'error');
-         })
-   }
+  //闄勪欢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
+    }
+  ];
 
-   //妫�绱㈠尰闄�
-   searchHos(event){
-      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;
-                  }
-               }
-            }else{
-               console.log("Error:"+result.errorMsg);
-               this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
-            }
-         })
-         .catch(error=>{
-            console.log("Error:"+error);
-            this.showMyToast('鎼滅储澶辫触',error,'error');
-         })
-   }
-
-   //鍖婚櫌鍚嶇Оchange
-   searchNameHosChange(event){
-      this.searchNameHos = event.detail.value;
-   }
-
-   //鍏抽棴寮圭獥
-   closeHospitalPop(){
-      this.showAttHosPop = false;
-      this.chooseHospital = '';
-      this.chooseHospitalId = '';
-   }
-
-   // //閫夋嫨鍖婚櫌
-   // chooseHos(event){
-   //    var hosName = event.target.getAttribute("data-name");
-   //    var hosid = event.target.getAttribute("data-hosid");
-   //    console.log('hos:'+hosName+'---'+hosid);
-   //    this.chooseHospital = hosName;
-   //    this.chooseHospitalId = hosid;
-   // }
-
-   changeHos(event){
-      this.hospitalName = event.detail.value;
-   }
-
-   changeCon(event){
-      this.contractName = event.detail.value;
-   }
-
-   chooseHos(event){
-      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);
-      this.confirmHospital();
-   }
-
-   //纭閫夋嫨鍖婚櫌
-   confirmHospital(){
-      if(this.chooseHospital != '' && this.chooseHospital != null){
-         this.hospitalId = this.chooseHospitalId;
-         this.tempidHp = this.chooseHospitalId;
-         this.hospitalName = this.chooseHospital;
-         this.closeHospitalPop();
-         //娑堥櫎璀﹀憡
-         var arr = [];
-         for(var i in this.warningMsgs){
-            if(this.warningMsgs[i] != '璇烽�夋嫨鍖婚櫌'){
-               arr.push(this.warningMsgs[i]);
-            }
-         }
-         this.warningMsgs = arr;
-         if(this.tempidHp != 'tempId' && this.tempidHp != ''){
-            searchorderdetails({
-               methodTypeStr : this.pageType,
-               accountIdStr : this.accountid,
-               hospitalIdStr : this.hospitalId,
-               contractIdStr : this.contractId,
-               userWorkLocationStr : this.userWorkLocation,
-               accountNameStr : this.accountName,
-               proLimitAndDateList : this.proLimitAndDate,
-               editAbleStr : this.editAble
-            }).then(result=>{
-               if(result.result == 'Success'){
-                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
-                  this.currentPage = 1;
-                  this.currentRecord = [];
-                  this.showCurrentReocrd();
-                  this.getAllChecked();
-                  this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
-               }else{
-                  console.log("Error:"+result.errorMsg);
-                  if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
-                     this.showMyToast(result.errorMsg,'','error');
-                  }else{
-                     this.showMyToast('鎼滅储浜у搧澶辫触',result.errorMsg,'error');
-                  }
-               }
-            })
-            .catch(error=>{
-               console.log("Error:"+error);
-               this.showMyToast('鎼滅储浜у搧澶辫触',error,'error');
-            })
-            this.tempidHp = 'tempId';
-         }
-      }else{
-         this.showMyToast('璇烽�夋嫨鍖婚櫌','','error');
+  //鍙栧緱鎵�鏈夎鍕鹃�夌殑浜у搧id
+  getAllChecked() {
+    this.selectRows = [];
+    for (var i in this.currentRecord) {
+      if (this.currentRecord[i].check) {
+        this.selectRows.push(this.currentRecord[i].recordId);
       }
-   }
+    }
+  }
 
-   //鎵撳紑鍚堝悓妫�绱㈠脊绐楀苟鍒濆鍖�
-   showSearchCon(){
-      initContract({ctype:this.agencyProType1})
-      .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;
-               }
+  //鍕鹃�夋搷浣�
+  checkRows(event) {
+    this.selectRows = [];
+    const selectedRows = event.detail.selectedRows;
+    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 (count == 0) {
+        this.consumableorderdetailsRecordsview[i].check = false;
+      } else {
+        this.consumableorderdetailsRecordsview[i].check = true;
+        this.selectRows.push(
+          this.consumableorderdetailsRecordsview[i].recordId
+        );
+      }
+    }
+    for (var i in this.selectRows) {
+      console.log("checkId1:" + this.selectRows[i]);
+      for (var i in this.currentRecord) {
+        if (this.currentRecord[i].recordId == this.selectRows[i]) {
+          console.log("currentRecord:" + this.selectRows[i]);
+        }
+      }
+    }
+  }
+
+  //閲囪喘鏁伴噺鑾峰彇
+  conCountChange(event) {
+    var recordId = event.detail.data.recordId;
+    var conCount = event.detail.data.value;
+    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].consumableCount = 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].consumableCount = null;
+        }
+      }
+    }
+    this.getAllChecked();
+    for (var i in this.currentRecord) {
+      if (this.currentRecord[i].recordId == recordId) {
+        console.log(
+          "currentRecord1:" + this.currentRecord[i].esd.Consumable_count__c
+        );
+      }
+    }
+  }
+
+  //閲囪喘鏁伴噺澶辩劍
+  conCountBlur(event) {
+    var conCount = event.detail.data.value;
+    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
+    ) {
+      if (parseInt(allnumber) + parseInt(conCount) > upperLimit) {
+        // window.alert("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒");
+        this.showMyToast("璇ヤ骇鍝佽璐暟閲忚秴鍑哄簱瀛樹笂闄愶紒", "", "error");
+      }
+      if (parseInt(allnumber) + parseInt(conCount) < lowerLimit) {
+        // window.alert("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒");
+        this.showMyToast("璇ヤ骇鍝佽璐暟閲忎綆浜庡簱瀛樹笅闄愶紒", "", "error");
+      }
+    }
+  }
+
+  @wire(CurrentPageReference)
+  getStateParameters(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);
+    }
+  }
+
+  renderedCallback() {
+    if (!this.stylesLoaded) {
+      Promise.all([loadStyle(this, WrappedHeaderTable)])
+        .then(() => {
+          console.log("Custom styles loaded");
+          this.stylesLoaded = true;
+        })
+        .catch((error) => {
+          console.error("Error loading custom styles");
+        });
+    }
+  }
+
+  //椤甸潰鍒濆鍖�
+  connectedCallback() {
+    this.showSpinner = true;
+    initPage({
+      type: this.pageType,
+      esetId: this.esetId,
+      keywordStr: this.keyWords
+    })
+      .then((result) => {
+        this.isNoteStay = result.isNoteStay;
+        if (result.result == "Success") {
+          this.editAble = result.editAble;
+          this.edoffersPrice = result.edoffersPrice;
+          this.cansee = result.cansee;
+          this.editDelCommitBtnDisabled = result.editDelCommitBtnDisabled;
+          this.category3Option = result.category3Option;
+          this.category4Option = result.category4Option;
+          this.category5Option = result.category5Option;
+          this.agencyProType = result.agencyProType;
+          this.agencyProType1 = result.agencyProType1;
+          this.OSHFLG = result.OSHFLG;
+          this.hospitalName = result.hospitalName;
+          this.contractName = result.contractName;
+          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;
+            var contractionName = this.attachmentRecoeds[i].Concc.Title;
+            // var contractionName = '闀挎枃浠堕暱鏂囦欢闀挎枃浠堕暱鏂囦欢';
+            if (contractionName.length > 25) {
+              contractionName = contractionName.substr(0, 21) + "...";
             }
-         }else{
-            console.log("Error:"+result.errorMsg);
-            this.showMyToast('鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�',result.errorMsg,'error');
-         }
+            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.errorMsgs = result.errorMsgList;
+          this.warningMsgs = result.warningMsgList;
+          this.userWorkLocation = result.userWorkLocation;
+          this.accountName = result.accountName;
+          this.accountid = result.accountid;
+          this.hospitalId = result.hospitalId;
+          this.contractId = result.contractId;
+          this.category_Goods = result.category_Goods;
+          this.specialCampaign = result.specialCampaign;
+          this.dealerProductId = result.dealerProductId;
+          this.contactDealer = result.contactDealer;
+          this.pageType = result.methodType;
+          this.proLimitAndDate = result.proLimitAndDate;
+          console.log(
+            "proLimitAndDate:" + JSON.stringify(this.proLimitAndDate)
+          );
+          this.coc = result.coc;
+          this.cocId = this.coc.Id;
+          if (this.pageType == "hospitalorder" && this.agencyProType != "ET") {
+            this.showHospital = true;
+          }
+          if (
+            this.coc.Order_status__c == "宸叉彁浜�" ||
+            this.coc.Order_status__c == "鎵瑰噯"
+          ) {
+            this.showOrderDate = true;
+          }
+          if (this.coc.Consumable_pdf_insert_day__c != null) {
+            this.showAttUploadDate = true;
+          }
+          if (!(this.editAble || this.edoffersPrice)) {
+            this.showEditBtn = true;
+            this.showOfferPriceInputBtn = true;
+          }
+          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
+            )
+          ) {
+            this.showPrintSheetBtn = true;
+            this.showUploadSheetBtn = true;
+            this.showSubOrderbtn = true;
+            this.showDeleteBtn = true;
+          }
+          if (
+            (this.editDelCommitBtnDisabled ||
+              this.editAble ||
+              this.edoffersPrice) &&
+            this.coc.Order_status__c != "椹冲洖"
+          ) {
+            this.showSaveOrderbtn1 = true;
+          }
+          if (this.coc.Order_status__c == "椹冲洖" && this.editAble) {
+            this.showSaveOrderbtn2 = true;
+          }
+          if (this.coc.Order_status__c == "椹冲洖" && !this.editAble) {
+            this.showReapplyBtn = true;
+          }
+          this.showSpinner = false;
+          this.showPage = true;
+        } else {
+          this.showSpinner = false;
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鍒濆鍖栭〉闈㈠け璐�", result.errorMsg, "error");
+        }
       })
-      .catch(error=>{
-         console.log("Error:"+error);
-         this.showMyToast('鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�',error,'error');
+      .catch((error) => {
+        this.showSpinner = false;
+        console.log("error:" + error);
+        this.showMyToast("鍒濆鍖栭〉闈㈠け璐�", error, "error");
+      });
+  }
+
+  //鎺掑簭
+  onHandleSort(event) {
+    //灏嗗凡缁忛�夊ソ浜嗙殑鏀惧埌鍓嶉潰锛屼笉杩涜鎺掑簭
+    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));
+      let index = 0;
+      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));
+      for (var i = 0; i < cloneData.length; i++) {
+        if (selectedRowsIds.indexOf(cloneData[i].recordId) != -1) {
+          if (i != 0) {
+            let temp = cloneData[index];
+            cloneData[index] = cloneData[i];
+            cloneData[i] = temp;
+          }
+          index++;
+        }
+      }
+      this.currentRecord = cloneData;
+      this.sortDirection = sortDirection;
+      this.sortedBy = sortedBy;
+    } else {
+      const { fieldName: sortedBy, sortDirection } = event.detail;
+      const cloneData = [...this.currentRecord];
+      cloneData.sort(this.sortBy(sortedBy, sortDirection === "asc" ? 1 : -1));
+      this.currentRecord = cloneData;
+      this.sortDirection = sortDirection;
+      this.sortedBy = sortedBy;
+    }
+  }
+
+  sortBy(field, reverse, primer) {
+    const key = primer
+      ? function (x) {
+          return primer(x[field]);
+        }
+      : function (x) {
+          return x[field];
+        };
+
+    return function (a, b) {
+      a = key(a);
+      b = key(b);
+      return reverse * ((a > b) - (b > a));
+    };
+  }
+
+  //鏄惁鏈夎鍛�
+  get hasWarning() {
+    if (this.warningMsgs == null || this.warningMsgs.length == 0) {
+      return false;
+    }
+    if (this.warningMsgs.length > 0) {
+      return true;
+    }
+  }
+
+  //鏄惁鏈夐敊璇�
+  get hasError() {
+    if (this.errorMsgs == null || this.errorMsgs.length == 0) {
+      return false;
+    }
+    if (this.errorMsgs.length > 0) {
+      return true;
+    }
+  }
+
+  //鐗逛环change浜嬩欢
+  offerPriceChange(event) {
+    this.coc.Offers_Price__c = event.detail.value;
+  }
+
+  //娑堣�楀搧鍚嶇Оchange浜嬩欢
+  category1Change(event) {
+    this.category1 = event.detail.value;
+  }
+
+  //绗笁鍒嗙被change浜嬩欢
+  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.category4Option = result.category4Option;
+        this.category5Option = result.category5Option;
+        this.showSpinner = false;
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        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.category4Option = result.category4Option;
+        this.category5Option = result.category5Option;
+        this.showSpinner = false;
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        this.showMyToast("鍔犺浇鍒嗙被澶辫触", result.errorMsg, "error");
+      }
+    });
+  }
+
+  //绗簲鍒嗙被change浜嬩欢
+  category5Change(event) {
+    this.category5 = event.detail.value;
+  }
+
+  //鎼滅储浜у搧
+  searchProduct(event) {
+    this.showSpinner = true;
+    searchConsumableorderdetails({
+      userWorkLocationStr: this.userWorkLocation,
+      agencyProTypeStr: this.agencyProType,
+      accountNameStr: this.accountName,
+      accountIdStr: this.accountid,
+      contractIdStr: this.contractId,
+      hospitalIdStr: this.hospitalId,
+      category1Str: this.category1,
+      category3Str: this.category3,
+      category4Str: this.category4,
+      category5Str: this.category5,
+      category_GoodStr: this.category_Goods,
+      specialCampaignStr: this.specialCampaign,
+      dealerProductIdStr: JSON.stringify(this.dealerProductId),
+      methodTypeStr: this.pageType,
+      editAbleStr: this.editAble,
+      consumableorderdetailsRecordsviewStr: JSON.stringify(
+        this.consumableorderdetailsRecordsview
+      ),
+      proLimitAndDateList: this.proLimitAndDate
+    })
+      .then((result) => {
+        if (result.result == "Success") {
+          this.consumableorderdetailsRecordsview =
+            result.consumableorderdetailsRecordsview;
+          this.currentPage = 1;
+          this.currentRecord = [];
+          this.showCurrentReocrd();
+          this.getAllChecked();
+          this.showSpinner = false;
+          this.errorMsgs = result.errorMsgList;
+          this.warningMsgs = result.warningMsgList;
+          // this.hasError = result.hasError;
+          // this.hasWarning = result.hasWarning;
+          this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
+        } else {
+          this.showSpinner = false;
+          console.log("Error:" + result.errorMsg);
+          if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
+            this.showMyToast(result.errorMsg, "", "error");
+          } else {
+            this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
+          }
+        }
       })
-   }
+      .catch((error) => {
+        console.log("Error:" + error);
+      });
+  }
 
-   //妫�绱㈠悎鍚�
-   searchCon(){
-      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;
-               }
+  //娓呴櫎鎼滅储鏍�
+  clear(event) {
+    this.category1 = "";
+    this.category3 = "";
+    this.category4 = "";
+    this.category5 = "";
+    this.showSpinner = true;
+    searchConsumableorderdetails({
+      userWorkLocationStr: this.userWorkLocation,
+      agencyProTypeStr: this.agencyProType,
+      accountNameStr: this.accountName,
+      accountIdStr: this.accountid,
+      contractIdStr: this.contractId,
+      hospitalIdStr: this.hospitalId,
+      category1Str: this.category1,
+      category3Str: this.category3,
+      category4Str: this.category4,
+      category5Str: this.category5,
+      category_GoodStr: this.category_Goods,
+      specialCampaignStr: this.specialCampaign,
+      dealerProductIdStr: JSON.stringify(this.dealerProductId),
+      methodTypeStr: this.pageType,
+      editAbleStr: this.editAble,
+      consumableorderdetailsRecordsviewStr: JSON.stringify(
+        this.consumableorderdetailsRecordsview
+      ),
+      proLimitAndDateList: this.proLimitAndDate
+    }).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");
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
+          this.showMyToast(result.errorMsg, "", "error");
+        } else {
+          this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
+        }
+      }
+    });
+  }
+
+  //閫夋嫨鎵�鏈�
+  checkAll(event) {
+    for (
+      let i = 0, len = this.consumableorderdetailsRecordsview.length;
+      i < len;
+      i++
+    ) {
+      this.consumableorderdetailsRecordsview[i].check = event.target.checked;
+    }
+  }
+
+  //閫夋嫨
+  check(event) {
+    let index = event.target.getAttribute("data-index");
+    this.consumableorderdetailsRecordsview[index].check = event.target.checked;
+  }
+
+  //閲囪喘鏁伴噺change浜嬩欢
+  // consumableCountChange(event){
+  //    let index = event.target.getAttribute("data-index");
+  //    var value = event.target.value;
+  //    this.consumableorderdetailsRecordsview[index].esd.Consumable_count__c = value;
+  //    if(isNaN(value)){
+  //       value=0.00;
+  //    }
+  //    if(value != null && value !=0 && value!=''){
+  //       this.consumableorderdetailsRecordsview[index].check = true;
+  //    }else{
+  //       this.consumableorderdetailsRecordsview[index].check = false;
+  //    }
+  // }
+
+  //淇濆瓨璁㈠崟
+  saveOrder(event) {
+    this.showSpinner = true;
+    console.log("start save");
+    save({
+      contractNameStr: this.contractName,
+      cocStr: JSON.stringify(this.coc),
+      agencyProTypeStr: this.agencyProType,
+      accountidStr: this.accountid,
+      consumableorderdetailsRecordsviewStr: JSON.stringify(
+        this.consumableorderdetailsRecordsview
+      ),
+      contactDealerStr: JSON.stringify(this.contactDealer),
+      methodTypeStr: this.pageType,
+      eSetIdStr: this.esetId,
+      hospitalIdStr: this.hospitalId,
+      contractIdStr: this.contractId,
+      agencyProType1Str: this.agencyProType1,
+      OSHFLGStr: this.OSHFLG
+    }).then((result) => {
+      this.showSpinner = false;
+      if (result.result == "Success") {
+        this.esetId = result.eSetId;
+        const config = {
+          type: "standard__webPage",
+          attributes: {
+            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");
+      }
+    });
+  }
+
+  //淇濆瓨璁㈠崟锛堥┏鍥烇級
+  orderCopy(event) {
+    this.showSpinner = true;
+    ordrCopy({
+      contractNameStr: this.contractName,
+      cocStr: JSON.stringify(this.coc),
+      agencyProTypeStr: this.agencyProType,
+      accountidStr: this.accountid,
+      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) => {
+      this.showSpinner = false;
+      if (result.result == "Success") {
+        this.esetId = result.eSetId;
+        const config = {
+          type: "standard__webPage",
+          attributes: {
+            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");
+      }
+    });
+  }
+
+  //缂栬緫
+  editOrder(event) {
+    setEditAble({ eSetidStr: this.esetId }).then((result) => {
+      if (result.result == "Success") {
+        const config = {
+          type: "standard__webPage",
+          attributes: {
+            url: result.url
+          }
+        };
+        this[NavigationMixin.Navigate](config);
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        this.showMyToast("缂栬緫澶辫触", result.errorMsg, "error");
+      }
+    });
+  }
+
+  //鎵撳嵃閰嶇疆鍗�
+  printOrder(event) {
+    var site = window.location.origin;
+    const config = {
+      type: "standard__webPage",
+      attributes: {
+        url: site + "/consumable/PrintConsumblePDF?ESetid=" + this.esetId
+      }
+    };
+    this[NavigationMixin.Navigate](config);
+  }
+
+  //涓婁紶閰嶇疆鍗�
+  uploadOrder(event) {
+    this.showAttPop = true;
+  }
+
+  //鎻愪氦璁㈠崟
+  submitOrder(event) {
+    sorder({ eSetidStr: this.esetId, accountidStr: this.accountid })
+      .then((result) => {
+        if (result.result == "Success") {
+          const config = {
+            type: "standard__webPage",
+            attributes: {
+              url: result.url
             }
-         }else{
-            console.log("Error:"+result.errorMsg);
-            this.showMyToast('鎼滅储澶辫触',result.errorMsg,'error');
-         }
+          };
+          this[NavigationMixin.Navigate](config);
+        } else {
+          this.showSpinner = false;
+          this.errorMsgs = result.errorMsgList;
+          this.warningMsgs = result.warningMsgList;
+          console.log("Error:" + result.errorMsg);
+          if (result.errorMsg.indexOf("璇蜂笂浼犺璐ч厤缃崟闄勪欢") != -1) {
+            result.errorMsg = "璇蜂笂浼犺璐ч厤缃崟闄勪欢";
+          }
+          this.showMyToast("鎻愪氦澶辫触", result.errorMsg, "error");
+        }
       })
-      .catch(error=>{
-         console.log("Error:"+error);
-         this.showMyToast('鎼滅储澶辫触',error,'error');
+      .catch((error) => {
+        console.log("Error:" + error);
+      });
+  }
+
+  //鍒犻櫎璁㈠崟
+  deleteOrder(event) {
+    if (!window.confirm("鍒犻櫎鏄笉鍙仮澶嶇殑锛屼綘纭瑕佸垹闄ゅ悧锛�")) {
+      return;
+    }
+    delConsumable({ eSetidStr: this.esetId }).then((result) => {
+      if (result.result == "Success") {
+        const config = {
+          type: "standard__webPage",
+          attributes: {
+            url: result.url
+          }
+        };
+        this[NavigationMixin.Navigate](config);
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        this.showMyToast("鍒犻櫎澶辫触", result.errorMsg, "error");
+      }
+    });
+  }
+
+  //鐗逛环閲戦褰曞叆
+  inputOfferPrice(event) {
+    this.edoffersPrice = true;
+    if (!(this.editAble || this.edoffersPrice)) {
+      this.showEditBtn = true;
+      this.showOfferPriceInputBtn = true;
+    } else {
+      this.showEditBtn = false;
+      this.showOfferPriceInputBtn = false;
+    }
+    if (
+      !(this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice)
+    ) {
+      this.showPrintSheetBtn = true;
+      this.showUploadSheetBtn = true;
+      this.showSubOrderbtn = true;
+      this.showDeleteBtn = true;
+    } else {
+      this.showPrintSheetBtn = false;
+      this.showUploadSheetBtn = false;
+      this.showSubOrderbtn = false;
+      this.showDeleteBtn = false;
+    }
+    if (
+      (this.editDelCommitBtnDisabled || this.editAble || this.edoffersPrice) &&
+      this.coc.Order_status__c != "椹冲洖"
+    ) {
+      this.showSaveOrderbtn1 = true;
+    } else {
+      this.showSaveOrderbtn1 = false;
+    }
+  }
+
+  //鍐嶇敵璇�
+  reapplyOrder(event) {
+    backOrder({ eSetidStr: this.esetId }).then((result) => {
+      if (result.result == "Success") {
+        const config = {
+          type: "standard__webPage",
+          attributes: {
+            url: result.url
+          }
+        };
+        this[NavigationMixin.Navigate](config);
+      } else {
+        this.showSpinner = false;
+        console.log("Error:" + result.errorMsg);
+        this.showMyToast("鍐嶇敵璇峰け璐�", result.errorMsg, "error");
+      }
+    });
+  }
+
+  //闄勪欢change浜嬩欢
+  attChange(event) {
+    if (event.target.files.length > 0) {
+      this.filesUploaded = event.target.files;
+      this.fileName = event.target.files[0].name;
+      console.log("this.fileName:" + this.fileName);
+    }
+  }
+
+  //鏄惁鏄剧ず闄勪欢绉婚櫎
+  get attDelBtn() {
+    if (
+      this.fileName != "" &&
+      this.fileName != null &&
+      this.fileName != "璇烽�夋嫨涓�涓枃浠朵笂浼�"
+    ) {
+      return true;
+    } else {
+      return false;
+    }
+  }
+
+  //鍏抽棴闄勪欢寮圭獥
+  closePop() {
+    this.showAttPop = false;
+    this.filesUploaded = [];
+    this.fileName = null;
+  }
+
+  //绉婚櫎闄勪欢
+  removeAtt() {
+    this.filesUploaded = [];
+    this.fileName = "";
+  }
+
+  //涓婁紶闄勪欢
+  uploadAtt(event) {
+    if (this.filesUploaded.length > 0) {
+      this.file = this.filesUploaded[0];
+      if (this.file.size > this.MAX_FILE_SIZE) {
+        window.console.log("鏂囦欢杩囧ぇ");
+        return;
+      }
+      this.fileReader = new FileReader();
+
+      this.fileReader.onloadend = () => {
+        this.fileContents = this.fileReader.result;
+        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 = "璇烽�夋嫨涓�涓枃浠朵笂浼�";
+    }
+  }
+
+  //璋冪敤涓婁紶闄勪欢鍚庡彴鏂规硶
+  saveToFile() {
+    this.showPopSpinner = true;
+    filesUpload({
+      pId: this.esetId,
+      fileName: this.file.name,
+      base64Data: encodeURIComponent(this.fileContents)
+    })
+      .then((result) => {
+        this.showPopSpinner = false;
+        if (result.result == "Success") {
+          this.closePop();
+          window.location.reload();
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("涓婁紶澶辫触", result.errorMsg, "error");
+        }
       })
-   }
+      .catch((error) => {
+        this.showPopSpinner = false;
+        this.showMyToast("涓婁紶澶辫触", error, "error");
+      });
+  }
 
-   searchNameConChange(event){
-      this.searchNameCon = event.detail.value;
-   }
+  //鍒犻櫎闄勪欢
+  deleteAtt(event) {
+    this.showSpinner = true;
+    var recordId = event.target.getAttribute("data-fileid");
+    console.log("attid:" + recordId);
+    deleteAtt({ contentVersionId: recordId })
+      .then((result) => {
+        this.showSpinner = false;
+        if (result.result == "Success") {
+          window.location.reload();
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鍒犻櫎澶辫触", result.errorMsg, "error");
+        }
+      })
+      .catch((error) => {
+        this.showSpinner = false;
+        console.log("Error:" + error);
+        this.showMyToast("鍒犻櫎澶辫触", JSON.stringify(error), "error");
+      });
+  }
 
-   //鍏抽棴寮圭獥
-   closeContractPop(){
-      this.showConPop = false;
-      this.chooseContract = '';
-      this.chooseContractId = '';
-   }
-
-   //閫夋嫨鍚堝悓
-   // chooseCon(event){
-   //    var conName = event.target.getAttribute("data-name");
-   //    var conid = event.target.getAttribute("data-hosid");
-   //    console.log('hos:'+conName+'---'+conid);
-   //    this.chooseContract = conName;
-   //    this.chooseContractId = conid;
-   // }
-
-   chooseCon(event){
-      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);
-      this.confirmContract();
-   }
-
-   //纭閫夋嫨鍚堝悓
-   confirmContract(){
-      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'){
-            searchorderdetails({
-               methodTypeStr : this.pageType,
-               accountIdStr : this.accountid,
-               hospitalIdStr : this.hospitalId,
-               contractIdStr : this.contractId,
-               userWorkLocationStr : this.userWorkLocation,
-               accountNameStr : this.accountName,
-               proLimitAndDateList : this.proLimitAndDate,
-               editAbleStr : this.editAble
-            }).then(result=>{
-               if(result.result == 'Success'){
-                  this.consumableorderdetailsRecordsview = result.consumableorderdetailsRecordsview;
-                  this.currentPage = 1;
-                  this.currentRecord = [];
-                  this.showCurrentReocrd();
-                  this.getAllChecked();
-                  this.showMyToast('鎼滅储鎴愬姛',result.errorMsg,'success');
-               }else{
-                  console.log("Error:"+result.errorMsg);
-                  if(result.errorMsg == '娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�'){
-                     this.showMyToast(result.errorMsg,'','error');
-                  }else{
-                     this.showMyToast('鎼滅储浜у搧澶辫触',result.errorMsg,'error');
-                  }
-               }
-            })
-            .catch(error=>{
-               console.log("Error:"+error);
-               this.showMyToast('鎼滅储浜у搧澶辫触',error,'error');
-            })
-            this.tempidPp = 'tempId';
-         }
-      }else{
-         this.showMyToast('璇烽�夋嫨鍚堝悓','','error');
+  //棰勮闄勪欢
+  previweAtt(event) {
+    var recordId = event.target.getAttribute("data-fileid");
+    console.log(recordId);
+    this[NavigationMixin.Navigate]({
+      type: "standard__namedPage",
+      attributes: {
+        pageName: "filePreview"
+      },
+      state: {
+        recordIds: recordId,
+        selectedRecordId: recordId
       }
-   }
+    });
+  }
 
-   showMyToast(title, message, variant) {
-      console.log('show custom message');
-      var iconName = '';
-      var content = '';
-      if(variant == '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);
-      // var mode;
-      // if(this.isNoteStay){
-      //     mode ='sticky';
-      // }else{
-      //     mode = 'dismissable';
-      // }
-      // const evt = new ShowToastEvent({
-      //     title: title,
-      //     message: message,
-      //     variant: variant,
-      //     mode: mode
-      // });
-      // this.dispatchEvent(evt);
-   }
-
-   //鍒嗛〉
-   showCurrentReocrd(){
-      var startIndex = 0;
-      var endIndex = 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;
-         if(this.currentPage == this.totalPage){
-            if(mu != 0){
-               currentCount = mu;
-            }else{
-               currentCount = this.pageSize;
+  //鎵撳紑鎼滅储寮圭獥锛屽苟鍒濆鍖栧脊绐�
+  showSearchHos(event) {
+    initHospital()
+      .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;
             }
-         }else{
-            currentCount = this.pageSize;
-         }
-         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);
-         if(this.editAble){
-            for(var i in this.currentRecord){
-               if(this.currentRecord[i].check){
-                  currentRecord.push(this.currentRecord[i]);
-               }
+          }
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�", result.errorMsg, "error");
+        }
+      })
+      .catch((error) => {
+        console.log("Error:" + error);
+        this.showMyToast("鍒濆鍖栨绱㈠尰闄㈤〉闈㈠け璐�", error, "error");
+      });
+  }
+
+  //妫�绱㈠尰闄�
+  searchHos(event) {
+    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;
             }
-         }
-         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){
-                  count++;
-               }
-            }
-            if(count == 0){
-               currentRecord.push(this.consumableorderdetailsRecordsview[i]);
-            }
-         }
-         this.recordStart = startIndex + 1;
-         this.recordEnd = endIndex + 1;
-         this.currentRecord = currentRecord;
-      }else{
-         this.currentPage = 0;
-         this.currentRecord = [];
+          }
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
+        }
+      })
+      .catch((error) => {
+        console.log("Error:" + error);
+        this.showMyToast("鎼滅储澶辫触", error, "error");
+      });
+  }
+
+  //鍖婚櫌鍚嶇Оchange
+  searchNameHosChange(event) {
+    this.searchNameHos = event.detail.value;
+  }
+
+  //鍏抽棴寮圭獥
+  closeHospitalPop() {
+    this.showAttHosPop = false;
+    this.chooseHospital = "";
+    this.chooseHospitalId = "";
+  }
+
+  // //閫夋嫨鍖婚櫌
+  // chooseHos(event){
+  //    var hosName = event.target.getAttribute("data-name");
+  //    var hosid = event.target.getAttribute("data-hosid");
+  //    console.log('hos:'+hosName+'---'+hosid);
+  //    this.chooseHospital = hosName;
+  //    this.chooseHospitalId = hosid;
+  // }
+
+  changeHos(event) {
+    this.hospitalName = event.detail.value;
+  }
+
+  changeCon(event) {
+    this.contractName = event.detail.value;
+  }
+
+  chooseHos(event) {
+    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);
+    this.confirmHospital();
+  }
+
+  //纭閫夋嫨鍖婚櫌
+  confirmHospital() {
+    if (this.chooseHospital != "" && this.chooseHospital != null) {
+      this.hospitalId = this.chooseHospitalId;
+      this.tempidHp = this.chooseHospitalId;
+      this.hospitalName = this.chooseHospital;
+      this.closeHospitalPop();
+      //娑堥櫎璀﹀憡
+      var arr = [];
+      for (var i in this.warningMsgs) {
+        if (this.warningMsgs[i] != "璇烽�夋嫨鍖婚櫌") {
+          arr.push(this.warningMsgs[i]);
+        }
       }
-   }
-
-   get prePage(){
-      return this.currentPage - 1;
-   }
-
-   get nextPage(){
-      return this.currentPage + 1;
-   }
-
-   get totalPage(){
-      if(this.consumableorderdetailsRecordsview.length % this.pageSize == 0){
-         return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize);
-      }else{
-         return Math.trunc(this.consumableorderdetailsRecordsview.length / this.pageSize) + 1;
+      this.warningMsgs = arr;
+      if (this.tempidHp != "tempId" && this.tempidHp != "") {
+        searchorderdetails({
+          methodTypeStr: this.pageType,
+          accountIdStr: this.accountid,
+          hospitalIdStr: this.hospitalId,
+          contractIdStr: this.contractId,
+          userWorkLocationStr: this.userWorkLocation,
+          accountNameStr: this.accountName,
+          proLimitAndDateList: this.proLimitAndDate,
+          editAbleStr: this.editAble
+        })
+          .then((result) => {
+            if (result.result == "Success") {
+              this.consumableorderdetailsRecordsview =
+                result.consumableorderdetailsRecordsview;
+              this.currentPage = 1;
+              this.currentRecord = [];
+              this.showCurrentReocrd();
+              this.getAllChecked();
+              this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
+            } else {
+              console.log("Error:" + result.errorMsg);
+              if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
+                this.showMyToast(result.errorMsg, "", "error");
+              } else {
+                this.showMyToast("鎼滅储浜у搧澶辫触", result.errorMsg, "error");
+              }
+            }
+          })
+          .catch((error) => {
+            console.log("Error:" + error);
+            this.showMyToast("鎼滅储浜у搧澶辫触", error, "error");
+          });
+        this.tempidHp = "tempId";
       }
-   }
+    } else {
+      this.showMyToast("璇烽�夋嫨鍖婚櫌", "", "error");
+    }
+  }
 
-   get totalRecords(){
-      return this.consumableorderdetailsRecordsview.length;
-   }
+  //鎵撳紑鍚堝悓妫�绱㈠脊绐楀苟鍒濆鍖�
+  showSearchCon() {
+    initContract({ ctype: this.agencyProType1 })
+      .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;
+            }
+          }
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�", result.errorMsg, "error");
+        }
+      })
+      .catch((error) => {
+        console.log("Error:" + error);
+        this.showMyToast("鍒濆鍖栨绱㈠悎鍚岄〉闈㈠け璐�", error, "error");
+      });
+  }
 
-   //绗竴椤�
-   goFirstPage(){
-      this.currentPage = 1;
-      this.showCurrentReocrd();
-   }
+  //妫�绱㈠悎鍚�
+  searchCon() {
+    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;
+            }
+          }
+        } else {
+          console.log("Error:" + result.errorMsg);
+          this.showMyToast("鎼滅储澶辫触", result.errorMsg, "error");
+        }
+      })
+      .catch((error) => {
+        console.log("Error:" + error);
+        this.showMyToast("鎼滅储澶辫触", error, "error");
+      });
+  }
 
-   //鏈�鍚庝竴椤�
-   goLastPage(){
-      this.currentPage = this.totalPage;
-      this.showCurrentReocrd();
-   }
+  searchNameConChange(event) {
+    this.searchNameCon = event.detail.value;
+  }
 
-   //涓婁竴椤�
-   prePageClick(){
-      this.currentPage = this.currentPage - 1;
-      this.showCurrentReocrd();
-   }
+  //鍏抽棴寮圭獥
+  closeContractPop() {
+    this.showConPop = false;
+    this.chooseContract = "";
+    this.chooseContractId = "";
+  }
 
-   //涓嬩竴椤�
-   nextPageClick(){
-      this.currentPage = this.currentPage + 1;
-      this.showCurrentReocrd();
-   }
+  //閫夋嫨鍚堝悓
+  // chooseCon(event){
+  //    var conName = event.target.getAttribute("data-name");
+  //    var conid = event.target.getAttribute("data-hosid");
+  //    console.log('hos:'+conName+'---'+conid);
+  //    this.chooseContract = conName;
+  //    this.chooseContractId = conid;
+  // }
 
-   //page size change
-   pageSizeChange(event){
-      console.log('pagesize:'+event.detail);
-      this.pageSize = event.detail;
-      this.currentPage = 1;
+  chooseCon(event) {
+    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);
+    this.confirmContract();
+  }
+
+  //纭閫夋嫨鍚堝悓
+  confirmContract() {
+    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"
+      ) {
+        searchorderdetails({
+          methodTypeStr: this.pageType,
+          accountIdStr: this.accountid,
+          hospitalIdStr: this.hospitalId,
+          contractIdStr: this.contractId,
+          userWorkLocationStr: this.userWorkLocation,
+          accountNameStr: this.accountName,
+          proLimitAndDateList: this.proLimitAndDate,
+          editAbleStr: this.editAble
+        })
+          .then((result) => {
+            if (result.result == "Success") {
+              this.consumableorderdetailsRecordsview =
+                result.consumableorderdetailsRecordsview;
+              this.currentPage = 1;
+              this.currentRecord = [];
+              this.showCurrentReocrd();
+              this.getAllChecked();
+              this.showMyToast("鎼滅储鎴愬姛", result.errorMsg, "success");
+            } else {
+              console.log("Error:" + result.errorMsg);
+              if (result.errorMsg == "娌℃湁鎼滅储鍒扮浉鍏虫暟鎹�") {
+                this.showMyToast(result.errorMsg, "", "error");
+              } else {
+                this.showMyToast("鎼滅储浜у搧澶辫触", result.errorMsg, "error");
+              }
+            }
+          })
+          .catch((error) => {
+            console.log("Error:" + error);
+            this.showMyToast("鎼滅储浜у搧澶辫触", error, "error");
+          });
+        this.tempidPp = "tempId";
+      }
+    } else {
+      this.showMyToast("璇烽�夋嫨鍚堝悓", "", "error");
+    }
+  }
+
+  showMyToast(title, message, variant) {
+    console.log("show custom message");
+    var iconName = "";
+    var content = "";
+    if (variant == "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);
+    // var mode;
+    // if(this.isNoteStay){
+    //     mode ='sticky';
+    // }else{
+    //     mode = 'dismissable';
+    // }
+    // const evt = new ShowToastEvent({
+    //     title: title,
+    //     message: message,
+    //     variant: variant,
+    //     mode: mode
+    // });
+    // this.dispatchEvent(evt);
+  }
+
+  //鍒嗛〉
+  showCurrentReocrd() {
+    var startIndex = 0;
+    var endIndex = 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;
+      if (this.currentPage == this.totalPage) {
+        if (mu != 0) {
+          currentCount = mu;
+        } else {
+          currentCount = this.pageSize;
+        }
+      } else {
+        currentCount = this.pageSize;
+      }
+      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);
+      if (this.editAble) {
+        for (var i in this.currentRecord) {
+          if (this.currentRecord[i].check) {
+            currentRecord.push(this.currentRecord[i]);
+          }
+        }
+      }
+      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
+          ) {
+            count++;
+          }
+        }
+        if (count == 0) {
+          currentRecord.push(this.consumableorderdetailsRecordsview[i]);
+        }
+      }
+      this.recordStart = startIndex + 1;
+      this.recordEnd = endIndex + 1;
+      this.currentRecord = currentRecord;
+    } else {
+      this.currentPage = 0;
       this.currentRecord = [];
-      this.showCurrentReocrd();
-   }
- 
-   //涓婁竴椤垫寜閽槸鍚isable
-   get previousButtonDisabled() {
-      return this.currentPage == 1 || this.currentPage == 0;
-   }
+    }
+  }
 
-   //涓嬩竴椤垫寜閽槸鍚isable
-   get nextButtonDisabled() {
-      return this.currentPage == this.totalPage;
-   }
-}
\ No newline at end of file
+  get prePage() {
+    return this.currentPage - 1;
+  }
+
+  get nextPage() {
+    return this.currentPage + 1;
+  }
+
+  get totalPage() {
+    if (this.consumableorderdetailsRecordsview.length % this.pageSize == 0) {
+      return Math.trunc(
+        this.consumableorderdetailsRecordsview.length / this.pageSize
+      );
+    } else {
+      return (
+        Math.trunc(
+          this.consumableorderdetailsRecordsview.length / this.pageSize
+        ) + 1
+      );
+    }
+  }
+
+  get totalRecords() {
+    return this.consumableorderdetailsRecordsview.length;
+  }
+
+  //绗竴椤�
+  goFirstPage() {
+    this.currentPage = 1;
+    this.showCurrentReocrd();
+  }
+
+  //鏈�鍚庝竴椤�
+  goLastPage() {
+    this.currentPage = this.totalPage;
+    this.showCurrentReocrd();
+  }
+
+  //涓婁竴椤�
+  prePageClick() {
+    this.currentPage = this.currentPage - 1;
+    this.showCurrentReocrd();
+  }
+
+  //涓嬩竴椤�
+  nextPageClick() {
+    this.currentPage = this.currentPage + 1;
+    this.showCurrentReocrd();
+  }
+
+  //page size change
+  pageSizeChange(event) {
+    console.log("pagesize:" + event.detail);
+    this.pageSize = event.detail;
+    this.currentPage = 1;
+    this.currentRecord = [];
+    this.showCurrentReocrd();
+  }
+
+  //涓婁竴椤垫寜閽槸鍚isable
+  get previousButtonDisabled() {
+    return this.currentPage == 1 || this.currentPage == 0;
+  }
+
+  //涓嬩竴椤垫寜閽槸鍚isable
+  get nextButtonDisabled() {
+    return this.currentPage == this.totalPage;
+  }
+}
diff --git "a/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
index 33fe9fa..0193e26 100644
--- "a/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
+++ "b/force-app/main/default/networks/Consumable\347\263\273\347\273\237.network-meta.xml"
@@ -1,14 +1,14 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Network xmlns="http://soap.sforce.com/2006/04/metadata">
-    <allowInternalUserLogin>false</allowInternalUserLogin>
+    <allowInternalUserLogin>true</allowInternalUserLogin>
     <allowMembersToFlag>false</allowMembersToFlag>
     <changePasswordTemplate
   >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
     <communityRoles />
     <disableReputationRecordConversations
   >false</disableReputationRecordConversations>
-    <emailSenderAddress>buli@deloitte.com.cn</emailSenderAddress>
-    <emailSenderName>Consumable绯荤粺</emailSenderName>
+    <emailSenderAddress>linktan@deloitte.com.cn</emailSenderAddress>
+    <emailSenderName>娑堣�楀搧绠$悊绯荤粺</emailSenderName>
     <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
     <enableDirectMessages>true</enableDirectMessages>
     <enableGuestChatter>false</enableGuestChatter>
@@ -30,8 +30,12 @@
   >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
     <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
     <networkMemberGroups>
-        <permissionSet>Community_LEX_PS</permissionSet>
         <profile>admin</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et email)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺email)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et)</profile>
     </networkMemberGroups>
     <networkPageOverrides>
         <changePasswordPageOverrideSetting
diff --git a/force-app/main/default/networks/Partner Sales.network-meta.xml b/force-app/main/default/networks/Partner Sales.network-meta.xml
new file mode 100644
index 0000000..08d1a2b
--- /dev/null
+++ b/force-app/main/default/networks/Partner Sales.network-meta.xml
@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Network xmlns="http://soap.sforce.com/2006/04/metadata">
+    <allowInternalUserLogin>true</allowInternalUserLogin>
+    <allowMembersToFlag>false</allowMembersToFlag>
+    <changePasswordTemplate
+  >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+    <communityRoles />
+    <disableReputationRecordConversations
+  >false</disableReputationRecordConversations>
+    <emailSenderAddress>olympussupport@sunbridge.com</emailSenderAddress>
+    <emailSenderName>Partner Sales</emailSenderName>
+    <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
+    <enableDirectMessages>false</enableDirectMessages>
+    <enableGuestChatter>false</enableGuestChatter>
+    <enableGuestFileAccess>true</enableGuestFileAccess>
+    <enableGuestMemberVisibility>false</enableGuestMemberVisibility>
+    <enableInvitation>false</enableInvitation>
+    <enableKnowledgeable>false</enableKnowledgeable>
+    <enableMemberVisibility>true</enableMemberVisibility>
+    <enableNicknameDisplay>true</enableNicknameDisplay>
+    <enablePrivateMessages>false</enablePrivateMessages>
+    <enableReputation>false</enableReputation>
+    <enableShowAllNetworkSettings>true</enableShowAllNetworkSettings>
+    <enableSiteAsContainer>true</enableSiteAsContainer>
+    <enableTalkingAboutStats>true</enableTalkingAboutStats>
+    <enableTopicAssignmentRules>false</enableTopicAssignmentRules>
+    <enableTopicSuggestions>true</enableTopicSuggestions>
+    <enableUpDownVote>false</enableUpDownVote>
+    <forgotPasswordTemplate
+  >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+    <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
+    <networkMemberGroups>
+        <permissionSet>P002_Partner</permissionSet>
+        <permissionSet>P002_OCM</permissionSet>
+        <profile>admin</profile>
+        <profile>901_缁忛攢鍟嗘椿鍔ㄧ郴缁�</profile>
+    </networkMemberGroups>
+    <networkPageOverrides>
+        <changePasswordPageOverrideSetting
+    >Standard</changePasswordPageOverrideSetting>
+        <forgotPasswordPageOverrideSetting
+    >Standard</forgotPasswordPageOverrideSetting>
+        <homePageOverrideSetting>Designer</homePageOverrideSetting>
+        <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
+        <selfRegProfilePageOverrideSetting
+    >Designer</selfRegProfilePageOverrideSetting>
+    </networkPageOverrides>
+    <picassoSite>Partner_Sales1</picassoSite>
+    <selfRegistration>false</selfRegistration>
+    <sendWelcomeEmail>true</sendWelcomeEmail>
+    <site>Partner_Sales</site>
+    <status>Live</status>
+    <tabs>
+        <defaultTab>home</defaultTab>
+        <standardTab>Chatter</standardTab>
+    </tabs>
+    <urlPathPrefix>partner</urlPathPrefix>
+    <welcomeTemplate
+  >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+</Network>
diff --git a/force-app/main/default/networks/Partner2.network-meta.xml b/force-app/main/default/networks/Partner2.network-meta.xml
new file mode 100644
index 0000000..3597e0c
--- /dev/null
+++ b/force-app/main/default/networks/Partner2.network-meta.xml
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Network xmlns="http://soap.sforce.com/2006/04/metadata">
+    <allowInternalUserLogin>false</allowInternalUserLogin>
+    <allowMembersToFlag>false</allowMembersToFlag>
+    <changePasswordTemplate
+  >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+    <communityRoles />
+    <disableReputationRecordConversations
+  >true</disableReputationRecordConversations>
+    <emailSenderAddress>buli@deloitte.com.cn</emailSenderAddress>
+    <emailSenderName>New Partner Sales</emailSenderName>
+    <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
+    <enableDirectMessages>true</enableDirectMessages>
+    <enableGuestChatter>false</enableGuestChatter>
+    <enableGuestFileAccess>false</enableGuestFileAccess>
+    <enableGuestMemberVisibility>false</enableGuestMemberVisibility>
+    <enableInvitation>false</enableInvitation>
+    <enableKnowledgeable>false</enableKnowledgeable>
+    <enableMemberVisibility>false</enableMemberVisibility>
+    <enableNicknameDisplay>true</enableNicknameDisplay>
+    <enablePrivateMessages>false</enablePrivateMessages>
+    <enableReputation>false</enableReputation>
+    <enableShowAllNetworkSettings>false</enableShowAllNetworkSettings>
+    <enableSiteAsContainer>true</enableSiteAsContainer>
+    <enableTalkingAboutStats>true</enableTalkingAboutStats>
+    <enableTopicAssignmentRules>true</enableTopicAssignmentRules>
+    <enableTopicSuggestions>false</enableTopicSuggestions>
+    <enableUpDownVote>false</enableUpDownVote>
+    <forgotPasswordTemplate
+  >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+    <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
+    <networkMemberGroups>
+        <profile>admin</profile>
+    </networkMemberGroups>
+    <networkPageOverrides>
+        <changePasswordPageOverrideSetting
+    >Standard</changePasswordPageOverrideSetting>
+        <forgotPasswordPageOverrideSetting
+    >Designer</forgotPasswordPageOverrideSetting>
+        <homePageOverrideSetting>Designer</homePageOverrideSetting>
+        <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
+        <selfRegProfilePageOverrideSetting
+    >Designer</selfRegProfilePageOverrideSetting>
+    </networkPageOverrides>
+    <picassoSite>Partner21</picassoSite>
+    <selfRegistration>false</selfRegistration>
+    <sendWelcomeEmail>true</sendWelcomeEmail>
+    <site>Partner2</site>
+    <status>UnderConstruction</status>
+    <tabs>
+        <defaultTab>home</defaultTab>
+        <standardTab>Chatter</standardTab>
+    </tabs>
+    <urlPathPrefix>partner2</urlPathPrefix>
+    <welcomeTemplate
+  >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+</Network>
diff --git "a/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml"
new file mode 100644
index 0000000..6dd1b5e
--- /dev/null
+++ "b/force-app/main/default/networks/\346\266\210\350\200\227\345\223\201\347\256\241\347\220\206\347\263\273\347\273\237.network-meta.xml"
@@ -0,0 +1,72 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Network xmlns="http://soap.sforce.com/2006/04/metadata">
+    <allowInternalUserLogin>false</allowInternalUserLogin>
+    <allowMembersToFlag>false</allowMembersToFlag>
+    <changePasswordTemplate
+  >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+    <communityRoles />
+    <disableReputationRecordConversations
+  >false</disableReputationRecordConversations>
+    <emailSenderAddress>OCM_Te2amPJ@olympus.com.cn</emailSenderAddress>
+    <emailSenderName>濂ユ灄宸存柉娑堣�楀搧绯荤粺</emailSenderName>
+    <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
+    <enableDirectMessages>false</enableDirectMessages>
+    <enableGuestChatter>false</enableGuestChatter>
+    <enableGuestFileAccess>false</enableGuestFileAccess>
+    <enableGuestMemberVisibility>false</enableGuestMemberVisibility>
+    <enableInvitation>false</enableInvitation>
+    <enableKnowledgeable>false</enableKnowledgeable>
+    <enableMemberVisibility>true</enableMemberVisibility>
+    <enableNicknameDisplay>false</enableNicknameDisplay>
+    <enablePrivateMessages>false</enablePrivateMessages>
+    <enableReputation>false</enableReputation>
+    <enableShowAllNetworkSettings>false</enableShowAllNetworkSettings>
+    <enableSiteAsContainer>false</enableSiteAsContainer>
+    <enableTalkingAboutStats>true</enableTalkingAboutStats>
+    <enableTopicAssignmentRules>false</enableTopicAssignmentRules>
+    <enableTopicSuggestions>true</enableTopicSuggestions>
+    <enableUpDownVote>false</enableUpDownVote>
+    <forgotPasswordTemplate
+  >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+    <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
+    <networkMemberGroups>
+        <profile>admin</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄�</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et email)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(et)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖哄彧鐪嬫潈闄�</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺email)</profile>
+        <profile>901_缁忛攢鍟嗙ぞ鍖烘櫘閫氭潈闄恄2閲嶉獙璇�(鑳介噺)</profile>
+    </networkMemberGroups>
+    <networkPageOverrides>
+        <changePasswordPageOverrideSetting
+    >Standard</changePasswordPageOverrideSetting>
+        <forgotPasswordPageOverrideSetting
+    >Standard</forgotPasswordPageOverrideSetting>
+        <homePageOverrideSetting>VisualForce</homePageOverrideSetting>
+        <loginPageOverrideSetting>Standard</loginPageOverrideSetting>
+        <selfRegProfilePageOverrideSetting
+    >Standard</selfRegProfilePageOverrideSetting>
+    </networkPageOverrides>
+    <picassoSite>Site1</picassoSite>
+    <selfRegistration>false</selfRegistration>
+    <sendWelcomeEmail>true</sendWelcomeEmail>
+    <site>Site</site>
+    <status>Live</status>
+    <tabs>
+        <customTab>TopPage</customTab>
+        <customTab>ConsumableAccount</customTab>
+        <customTab>ConsumableOrderManage</customTab>
+        <customTab>ArriveGoodsMain</customTab>
+        <customTab>SaleAndDelivery</customTab>
+        <customTab>ConInvoiceList</customTab>
+        <customTab>InventoryView</customTab>
+        <customTab>Consumable_order__c</customTab>
+        <customTab>RetrospectiveWeeklyReport</customTab>
+        <defaultTab>01r10000000Xo4Y</defaultTab>
+        <standardTab>report</standardTab>
+    </tabs>
+    <urlPathPrefix>customer</urlPathPrefix>
+    <welcomeTemplate
+  >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+</Network>
diff --git "a/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml" "b/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml"
new file mode 100644
index 0000000..28c0aac
--- /dev/null
+++ "b/force-app/main/default/networks/\347\224\265\345\255\220\347\255\276\346\224\266\347\263\273\347\273\237.network-meta.xml"
@@ -0,0 +1,57 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<Network xmlns="http://soap.sforce.com/2006/04/metadata">
+    <allowInternalUserLogin>false</allowInternalUserLogin>
+    <allowMembersToFlag>false</allowMembersToFlag>
+    <changePasswordTemplate
+  >unfiled$public/CommunityChangePasswordEmailTemplate</changePasswordTemplate>
+    <communityRoles />
+    <disableReputationRecordConversations
+  >false</disableReputationRecordConversations>
+    <emailSenderAddress>it_sfdc@olympus.com.cn</emailSenderAddress>
+    <emailSenderName>濂ユ灄宸存柉鐢靛瓙绛炬敹绯荤粺</emailSenderName>
+    <enableCustomVFErrorPageOverrides>false</enableCustomVFErrorPageOverrides>
+    <enableDirectMessages>true</enableDirectMessages>
+    <enableGuestChatter>false</enableGuestChatter>
+    <enableGuestFileAccess>false</enableGuestFileAccess>
+    <enableGuestMemberVisibility>false</enableGuestMemberVisibility>
+    <enableInvitation>false</enableInvitation>
+    <enableKnowledgeable>false</enableKnowledgeable>
+    <enableMemberVisibility>false</enableMemberVisibility>
+    <enableNicknameDisplay>true</enableNicknameDisplay>
+    <enablePrivateMessages>false</enablePrivateMessages>
+    <enableReputation>false</enableReputation>
+    <enableShowAllNetworkSettings>false</enableShowAllNetworkSettings>
+    <enableSiteAsContainer>true</enableSiteAsContainer>
+    <enableTalkingAboutStats>true</enableTalkingAboutStats>
+    <enableTopicAssignmentRules>true</enableTopicAssignmentRules>
+    <enableTopicSuggestions>false</enableTopicSuggestions>
+    <enableUpDownVote>false</enableUpDownVote>
+    <forgotPasswordTemplate
+  >unfiled$public/CommunityForgotPasswordEmailTemplate</forgotPasswordTemplate>
+    <gatherCustomerSentimentData>false</gatherCustomerSentimentData>
+    <networkMemberGroups>
+        <profile>admin</profile>
+    </networkMemberGroups>
+    <networkPageOverrides>
+        <changePasswordPageOverrideSetting
+    >Standard</changePasswordPageOverrideSetting>
+        <forgotPasswordPageOverrideSetting
+    >Designer</forgotPasswordPageOverrideSetting>
+        <homePageOverrideSetting>Designer</homePageOverrideSetting>
+        <loginPageOverrideSetting>Designer</loginPageOverrideSetting>
+        <selfRegProfilePageOverrideSetting
+    >Designer</selfRegProfilePageOverrideSetting>
+    </networkPageOverrides>
+    <picassoSite>Site3</picassoSite>
+    <selfRegistration>false</selfRegistration>
+    <sendWelcomeEmail>false</sendWelcomeEmail>
+    <site>Site2</site>
+    <status>Live</status>
+    <tabs>
+        <defaultTab>home</defaultTab>
+        <standardTab>Chatter</standardTab>
+    </tabs>
+    <urlPathPrefix>eSignSystem</urlPathPrefix>
+    <welcomeTemplate
+  >unfiled$public/CommunityWelcomeEmailTemplate</welcomeTemplate>
+</Network>
diff --git a/force-app/main/default/sites/Consumable.site-meta.xml b/force-app/main/default/sites/Consumable.site-meta.xml
index 9eb8396..c202c1c 100644
--- a/force-app/main/default/sites/Consumable.site-meta.xml
+++ b/force-app/main/default/sites/Consumable.site-meta.xml
@@ -24,10 +24,10 @@
   >true</referrerPolicyOriginWhenCrossOrigin>
     <requireHttps>true</requireHttps>
     <selfRegPage>CommunitiesSelfReg</selfRegPage>
-    <serverIsDown>SNA_Consumable1_sf_default_cdn_Cpit8</serverIsDown>
-    <siteAdmin>buli@deloitte.com.cn</siteAdmin>
+    <serverIsDown>SNA_Demo1_sf_default_cdn_PqhAN</serverIsDown>
+    <siteAdmin>linktan@deloitte.com.olympus</siteAdmin>
     <siteGuestRecordDefaultOwner
-  >buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
+  >linktan@deloitte.com.olympus</siteGuestRecordDefaultOwner>
     <siteType>ChatterNetwork</siteType>
     <subdomain>ocm</subdomain>
     <urlPathPrefix>consumable</urlPathPrefix>
diff --git a/force-app/main/default/sites/Partner2.site-meta.xml b/force-app/main/default/sites/Partner2.site-meta.xml
new file mode 100644
index 0000000..4dcb994
--- /dev/null
+++ b/force-app/main/default/sites/Partner2.site-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
+    <active>true</active>
+    <allowGuestPaymentsApi>false</allowGuestPaymentsApi>
+    <allowHomePage>false</allowHomePage>
+    <allowStandardAnswersPages>false</allowStandardAnswersPages>
+    <allowStandardIdeasPages>false</allowStandardIdeasPages>
+    <allowStandardLookups>false</allowStandardLookups>
+    <allowStandardPortalPages>true</allowStandardPortalPages>
+    <allowStandardSearch>false</allowStandardSearch>
+    <authorizationRequiredPage>CommunitiesLogin</authorizationRequiredPage>
+    <bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
+    <browserXssProtection>true</browserXssProtection>
+    <clickjackProtectionLevel>SameOriginOnly</clickjackProtectionLevel>
+    <contentSniffingProtection>true</contentSniffingProtection>
+    <cspUpgradeInsecureRequests>true</cspUpgradeInsecureRequests>
+    <enableAuraRequests>true</enableAuraRequests>
+    <fileNotFoundPage>FileNotFound</fileNotFoundPage>
+    <genericErrorPage>Exception</genericErrorPage>
+    <inMaintenancePage>InMaintenance</inMaintenancePage>
+    <indexPage>CommunitiesLanding</indexPage>
+    <masterLabel>Partner2</masterLabel>
+    <referrerPolicyOriginWhenCrossOrigin
+  >true</referrerPolicyOriginWhenCrossOrigin>
+    <requireHttps>true</requireHttps>
+    <selfRegPage>CommunitiesSelfReg</selfRegPage>
+    <serverIsDown>SNA_New_Partner_Sales1_sf_default_cdn_VxHsN</serverIsDown>
+    <siteAdmin>buli@deloitte.com.cn</siteAdmin>
+    <siteGuestRecordDefaultOwner
+  >buli@deloitte.com.cn</siteGuestRecordDefaultOwner>
+    <siteType>ChatterNetwork</siteType>
+    <subdomain>ocm</subdomain>
+    <urlPathPrefix>partner2</urlPathPrefix>
+</CustomSite>
diff --git a/force-app/main/default/sites/Partner_Sales.site-meta.xml b/force-app/main/default/sites/Partner_Sales.site-meta.xml
new file mode 100644
index 0000000..c8e3ae4
--- /dev/null
+++ b/force-app/main/default/sites/Partner_Sales.site-meta.xml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
+    <active>true</active>
+    <allowGuestPaymentsApi>false</allowGuestPaymentsApi>
+    <allowHomePage>false</allowHomePage>
+    <allowStandardAnswersPages>false</allowStandardAnswersPages>
+    <allowStandardIdeasPages>false</allowStandardIdeasPages>
+    <allowStandardLookups>false</allowStandardLookups>
+    <allowStandardPortalPages>true</allowStandardPortalPages>
+    <allowStandardSearch>false</allowStandardSearch>
+    <authorizationRequiredPage>CommunitiesLogin</authorizationRequiredPage>
+    <bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
+    <browserXssProtection>false</browserXssProtection>
+    <clickjackProtectionLevel>SameOriginOnly</clickjackProtectionLevel>
+    <contentSniffingProtection>false</contentSniffingProtection>
+    <cspUpgradeInsecureRequests>true</cspUpgradeInsecureRequests>
+    <enableAuraRequests>true</enableAuraRequests>
+    <fileNotFoundPage>FileNotFound</fileNotFoundPage>
+    <genericErrorPage>Exception</genericErrorPage>
+    <inMaintenancePage>CommunitiesLogin</inMaintenancePage>
+    <inactiveIndexPage>CommunitiesLogin</inactiveIndexPage>
+    <indexPage>CommunitiesLanding</indexPage>
+    <masterLabel>Partner Sales</masterLabel>
+    <referrerPolicyOriginWhenCrossOrigin
+  >false</referrerPolicyOriginWhenCrossOrigin>
+    <requireHttps>true</requireHttps>
+    <selfRegPage>CommunitiesSelfReg</selfRegPage>
+    <serverIsDown>SNA_Partner_Sales1_sf_default_cdn_JaBaQ</serverIsDown>
+    <siteAdmin>sb04@sb.com</siteAdmin>
+    <siteGuestRecordDefaultOwner>sb04@sb.com</siteGuestRecordDefaultOwner>
+    <siteType>ChatterNetwork</siteType>
+    <subdomain>ocm</subdomain>
+    <urlPathPrefix>partner</urlPathPrefix>
+</CustomSite>
diff --git a/force-app/main/default/sites/Site.site-meta.xml b/force-app/main/default/sites/Site.site-meta.xml
new file mode 100644
index 0000000..df7bbe4
--- /dev/null
+++ b/force-app/main/default/sites/Site.site-meta.xml
@@ -0,0 +1,33 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
+    <active>true</active>
+    <allowGuestPaymentsApi>false</allowGuestPaymentsApi>
+    <allowHomePage>false</allowHomePage>
+    <allowStandardAnswersPages>false</allowStandardAnswersPages>
+    <allowStandardIdeasPages>false</allowStandardIdeasPages>
+    <allowStandardLookups>false</allowStandardLookups>
+    <allowStandardPortalPages>true</allowStandardPortalPages>
+    <allowStandardSearch>false</allowStandardSearch>
+    <authorizationRequiredPage>LEXCommunityRouter</authorizationRequiredPage>
+    <bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
+    <browserXssProtection>false</browserXssProtection>
+    <clickjackProtectionLevel>SameOriginOnly</clickjackProtectionLevel>
+    <contentSniffingProtection>false</contentSniffingProtection>
+    <cspUpgradeInsecureRequests>true</cspUpgradeInsecureRequests>
+    <enableAuraRequests>true</enableAuraRequests>
+    <fileNotFoundPage>FileNotFound</fileNotFoundPage>
+    <genericErrorPage>Exception</genericErrorPage>
+    <inMaintenancePage>CommunitiesLogin</inMaintenancePage>
+    <inactiveIndexPage>CommunitiesLogin</inactiveIndexPage>
+    <indexPage>TopPage</indexPage>
+    <masterLabel>娑堣�楀搧绠$悊绯荤粺</masterLabel>
+    <referrerPolicyOriginWhenCrossOrigin
+  >false</referrerPolicyOriginWhenCrossOrigin>
+    <requireHttps>true</requireHttps>
+    <selfRegPage>CommunitiesSelfReg</selfRegPage>
+    <siteAdmin>sb04@sb.com</siteAdmin>
+    <siteGuestRecordDefaultOwner>sb04@sb.com</siteGuestRecordDefaultOwner>
+    <siteType>ChatterNetwork</siteType>
+    <subdomain>ocm</subdomain>
+    <urlPathPrefix>customer</urlPathPrefix>
+</CustomSite>
diff --git a/force-app/main/default/sites/Site2.site-meta.xml b/force-app/main/default/sites/Site2.site-meta.xml
new file mode 100644
index 0000000..356bb1a
--- /dev/null
+++ b/force-app/main/default/sites/Site2.site-meta.xml
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
+    <active>true</active>
+    <allowGuestPaymentsApi>false</allowGuestPaymentsApi>
+    <allowHomePage>false</allowHomePage>
+    <allowStandardAnswersPages>false</allowStandardAnswersPages>
+    <allowStandardIdeasPages>false</allowStandardIdeasPages>
+    <allowStandardLookups>false</allowStandardLookups>
+    <allowStandardPortalPages>true</allowStandardPortalPages>
+    <allowStandardSearch>false</allowStandardSearch>
+    <authorizationRequiredPage>CommunitiesLogin</authorizationRequiredPage>
+    <bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
+    <browserXssProtection>true</browserXssProtection>
+    <clickjackProtectionLevel>SameOriginOnly</clickjackProtectionLevel>
+    <contentSniffingProtection>true</contentSniffingProtection>
+    <cspUpgradeInsecureRequests>true</cspUpgradeInsecureRequests>
+    <enableAuraRequests>true</enableAuraRequests>
+    <fileNotFoundPage>FileNotFound</fileNotFoundPage>
+    <genericErrorPage>Exception</genericErrorPage>
+    <inMaintenancePage>InMaintenance</inMaintenancePage>
+    <indexPage>CommunitiesLanding</indexPage>
+    <masterLabel>鐢靛瓙绛炬敹绯荤粺</masterLabel>
+    <referrerPolicyOriginWhenCrossOrigin
+  >true</referrerPolicyOriginWhenCrossOrigin>
+    <requireHttps>true</requireHttps>
+    <selfRegPage>CommunitiesSelfReg</selfRegPage>
+    <siteAdmin>it_prectech@olympus.com.cn</siteAdmin>
+    <siteGuestRecordDefaultOwner>olympus@proto.1</siteGuestRecordDefaultOwner>
+    <siteType>ChatterNetwork</siteType>
+    <subdomain>ocm</subdomain>
+    <urlPathPrefix>eSignSystem</urlPathPrefix>
+</CustomSite>
diff --git a/force-app/main/default/sites/extsurvey.site-meta.xml b/force-app/main/default/sites/extsurvey.site-meta.xml
new file mode 100644
index 0000000..50af949
--- /dev/null
+++ b/force-app/main/default/sites/extsurvey.site-meta.xml
@@ -0,0 +1,31 @@
+<?xml version="1.0" encoding="UTF-8" ?>
+<CustomSite xmlns="http://soap.sforce.com/2006/04/metadata">
+    <active>false</active>
+    <allowGuestPaymentsApi>false</allowGuestPaymentsApi>
+    <allowHomePage>false</allowHomePage>
+    <allowStandardAnswersPages>false</allowStandardAnswersPages>
+    <allowStandardIdeasPages>false</allowStandardIdeasPages>
+    <allowStandardLookups>false</allowStandardLookups>
+    <allowStandardPortalPages>true</allowStandardPortalPages>
+    <allowStandardSearch>false</allowStandardSearch>
+    <authorizationRequiredPage>Unauthorized</authorizationRequiredPage>
+    <bandwidthExceededPage>BandwidthExceeded</bandwidthExceededPage>
+    <browserXssProtection>false</browserXssProtection>
+    <clickjackProtectionLevel>AllowAllFraming</clickjackProtectionLevel>
+    <contentSniffingProtection>false</contentSniffingProtection>
+    <cspUpgradeInsecureRequests>true</cspUpgradeInsecureRequests>
+    <enableAuraRequests>true</enableAuraRequests>
+    <fileNotFoundPage>FileNotFound</fileNotFoundPage>
+    <genericErrorPage>Exception</genericErrorPage>
+    <inMaintenancePage>InMaintenance</inMaintenancePage>
+    <indexPage>ISO_DemandOAD_PDF</indexPage>
+    <masterLabel>澶栭儴璋冩煡闂嵎</masterLabel>
+    <referrerPolicyOriginWhenCrossOrigin
+  >false</referrerPolicyOriginWhenCrossOrigin>
+    <requireHttps>true</requireHttps>
+    <siteAdmin>sb21@sunbridge.com</siteAdmin>
+    <siteGuestRecordDefaultOwner>olympus@proto.1</siteGuestRecordDefaultOwner>
+    <siteType>Visualforce</siteType>
+    <subdomain>ocmquestionnaire</subdomain>
+    <urlPathPrefix>extsurvey</urlPathPrefix>
+</CustomSite>
diff --git a/manifest/LEXC02packagelexcommunityupdate.xml b/manifest/LEXC02packagelexcommunityupdate.xml
index a9d7929..521e3c1 100644
--- a/manifest/LEXC02packagelexcommunityupdate.xml
+++ b/manifest/LEXC02packagelexcommunityupdate.xml
@@ -1,24 +1,10 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
-    <fullName>DEVLexCommunityUpdate</fullName>
-    <description>1. Update Class 2. New LWC</description>
     <types>
-        <members>ArriveGoodsController</members>
-        <members>ArriveGoodsControllerTest</members>
-        <members>LexArriveGoodsController</members>
-        <name>ApexClass</name>
-    </types>
-    <types>
-        <members>lexArriveGoods</members>
+        <members>lexCancelRemoveBox</members>
+        <members>lexRemoveBox</members>
+        <members>lexinventoryViewLWC</members>
         <name>LightningComponentBundle</name>
-    </types>
-    <types>
-        <members>RetrospectiveWeeklyReport</members>
-        <name>AuraDefinitionBundle</name>
-    </types>
-    <types>
-        <members>Community_LEX_PS</members>
-        <name>PermissionSet</name>
     </types>
     <version>57.0</version>
 </Package>
diff --git a/manifest/LEXC04packagecommdeploy.xml b/manifest/LEXC04packagecommdeploy.xml
index 39703ba..86eff7f 100644
--- a/manifest/LEXC04packagecommdeploy.xml
+++ b/manifest/LEXC04packagecommdeploy.xml
@@ -1,15 +1,15 @@
 <?xml version="1.0" encoding="UTF-8" ?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
     <types>
-        <members>Consumable</members>
+        <members>*</members>
         <name>CustomSite</name>
     </types>
     <types>
-        <members>Consumable1</members>
+        <members>*</members>
         <name>ExperienceBundle</name>
     </types>
     <types>
-        <members>Consumable绯荤粺</members>
+        <members>*</members>
         <name>Network</name>
     </types>
     <version>50.0</version>
diff --git a/manifest/package.xml b/manifest/package.xml
index c18b30a..c873ffe 100644
--- a/manifest/package.xml
+++ b/manifest/package.xml
@@ -1,9 +1,8 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
+<?xml version="1.0" encoding="UTF-8" standalone="yes" ?>
 <Package xmlns="http://soap.sforce.com/2006/04/metadata">
     <types>
-        <members>NewAndEditLead</members>
-        <members>NewAndEditReport</members>
-        <name>ApexPage</name>
+        <members>LexConInvoicedetailsControllerTest</members>
+        <name>ApexClass</name>
     </types>
     <version>52.0</version>
-</Package>
\ No newline at end of file
+</Package>

--
Gitblit v1.9.1