From 8c8f51f10bb9e158cb8b89cb8d58e4ce7d467583 Mon Sep 17 00:00:00 2001
From: binxie <137736985@qq.com>
Date: 星期一, 26 六月 2023 11:29:01 +0800
Subject: [PATCH] backup0626

---
 force-app/main/default/lwc/lexInventory/lexInventory.html                         |   11 
 force-app/main/default/lwc/lexTopPage/lexTopPage.js                               |    1 
 force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html             |  329 +++-----
 force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html               |    6 
 force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.html                       |    9 
 force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html             |    9 
 force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html           |  266 ++++---
 force-app/main/default/lwc/lexTopPage/lexTopPage.html                             |    9 
 force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.html           |    6 
 force-app/main/default/lwc/lexInventory/lexInventory.js                           |    3 
 force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css            |   30 
 force-app/main/default/lwc/lexCssUtility/lexCssUtility.css                        |    6 
 force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html             |    8 
 force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js               |   10 
 force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html |    9 
 force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html                   |  256 +++---
 force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html                         |  344 +++------
 force-app/main/default/lwc/lexInventory/lexInventory.css                          |   11 
 force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.css                        |    2 
 force-app/main/default/lwc/lexConsumable/lexConsumable.html                       |    9 
 force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html                   |    8 
 force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html             |    9 
 force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js               |  388 +++++-----
 force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js                           |  308 ++++----
 force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html     |    6 
 force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js                     |   23 
 26 files changed, 1,006 insertions(+), 1,070 deletions(-)

diff --git a/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.css b/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.css
index 8e8eb4c..a9a466d 100644
--- a/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.css
+++ b/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.css
@@ -1,3 +1,5 @@
+@import 'c/lexCssUtility';
+
 lightning-output-field {
     pointer-events: none;
     --lwc-colorTextLabel:#696969;
diff --git a/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.html b/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.html
index f0f4700..1f6f8c2 100644
--- a/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.html
+++ b/force-app/main/default/lwc/lexAgencyInfo/lexAgencyInfo.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
index 5dc2f11..724c9c6 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
index 3284c42..163a81f 100644
--- a/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
+++ b/force-app/main/default/lwc/lexArriveGoodsMain/lexArriveGoodsMain.js
@@ -64,7 +64,7 @@
                 type: 'TotalNum',
                 recordId: { fieldName: "Id" }
             },
-            hideDefaultActions: true, initialWidth: 100},
+            hideDefaultActions: true, initialWidth: 100,cellAttributes: { alignment: "right" }},
         {label:'宸插埌璐ф暟閲�',
             type: "customOutputGood",
             typeAttributes: {
@@ -72,7 +72,7 @@
                 type: 'ArrDet',
                 recordId: { fieldName: "Id" }
             },
-            hideDefaultActions: true, initialWidth: 110},
+            hideDefaultActions: true, initialWidth: 110,cellAttributes: { alignment: "right" }},
         {label:'寰呯郴缁熸搷浣滃叆搴撴暟閲�',
             type: "customOutputGood",
             typeAttributes: {
@@ -80,7 +80,7 @@
                 type: 'DeliveryDet',
                 recordId: { fieldName: "Id" }
             },
-            hideDefaultActions: true, initialWidth: 180},
+            hideDefaultActions: true, initialWidth: 180,cellAttributes: { alignment: "right" }},
         {label:'杩樻病鍙戣揣鏁伴噺',
             type: "customOutputGood",
             typeAttributes: {
@@ -88,7 +88,7 @@
                 type: 'NotArrDet',
                 recordId: { fieldName: "Id" }
             },
-            hideDefaultActions: true, initialWidth: 120},
+            hideDefaultActions: true, initialWidth: 120,cellAttributes: { alignment: "right" }},
         {label:'鍙戣揣涓冨ぉ杩樻湭鍒拌揣鏁�',
             type: "customOutputGood",
             typeAttributes: {
@@ -96,7 +96,7 @@
                 type: 'MoreThan7',
                 recordId: { fieldName: "Id" }
             },
-            hideDefaultActions: true, initialWidth: 180},
+            hideDefaultActions: true, initialWidth: 180,cellAttributes: { alignment: "right" }},
         {label:'鏈�鏂板彂璐ф棩鏈�',fieldName:'Shipment_date__c',hideDefaultActions: true, initialWidth: 140},
         {label:'棣栨鍙戣揣鏃ユ湡',fieldName:'First_Delivery__c',hideDefaultActions: true, initialWidth: 140}
     ];
diff --git a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
index cd856c2..e83098a 100644
--- a/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
+++ b/force-app/main/default/lwc/lexArriveGsDetails/lexArriveGsDetails.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
index 095debc..60898fb 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.html
@@ -1,211 +1,138 @@
 <template>
   <template if:true={showSpinner}>
-    <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+      <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+      <div class="slds-spinner_container">
+          <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+              <span class="slds-assistive-text">Loading</span>
+              <div class="slds-spinner__dot-a"></div>
+              <div class="slds-spinner__dot-b"></div>
+          </div>
+      </div>
   </template>
   <c-common-toast></c-common-toast>
-  <div style="border: 1px solid #d4d4d4; border-radius: 5px">
-    <div
-      style="
-        border-top: 3px solid #51606e;
-        border-bottom: 1px solid #d4d4d4;
-        padding: 3px;
-      "
-    >
-      <div>
-        <!-- <p style="font-size: 18px;"><strong>鍙栨秷鎷嗙洅</strong></p> -->
-        <lightning-layout>
-          <lightning-layout-item padding="around-small">
-            <p style="font-size: 18px">
-              <strong>鍙栨秷鎷嗙洅</strong>
-            </p>
-          </lightning-layout-item>
-        </lightning-layout>
-      </div>
-    </div>
-    <div style="padding: 10px">
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鍙栨秷鎷嗙洅纭" title="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}></lightning-button></td> -->
-          <button
-            class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-            style="margin-left: 10px; margin-top: 12px; margin-bottom: 12px"
-            label="鍙栨秷鎷嗙洅纭"
-            onclick={saveConfirm}
-          >
-            鍙栨秷鎷嗙洅纭
-          </button>
-        </div>
-      </div>
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-          margin-top: 5px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <lightning-layout>
-            <lightning-layout-item padding="around-small">
-              <p style="font-size: 16px">
-                <strong>BarCode褰曞叆</strong>
-              </p>
-            </lightning-layout-item>
-          </lightning-layout>
-        </div>
+  <div style="border: 1px solid #D4D4D4;border-radius:5px;"> 
 
-        <!-- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;"> -->
-        <table>
-          <colgroup>
-            <col width="160px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="70px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="90px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="85px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="70px" />
-            <col width="100px" />
-          </colgroup>
-          <tbody>
-            <tr>
-              <td></td>
-              <td align="right" class="searchName">BarCode</td>
-              <td style="width: 600px">
-                <lightning-textarea
-                  class="inputFont"
-                  name="BarCode"
-                  label=""
-                  onchange={handleChange}
-                ></lightning-textarea>
-              </td>
-              <td align="right"></td>
-              <td></td>
-              <td style="width: 200px">
-                <button
-                  style="margin-top: 14px"
-                  class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-                  label="鑾峰彇鏄庣粏"
-                  onclick={getDetails}
-                >
-                  鑾峰彇鏄庣粏
-                </button>
-                <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
-                                       ></lightning-button> -->
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <!-- </div> -->
-      </div>
-
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <lightning-layout>
-            <lightning-layout-item padding="around-small">
-              <p style="font-size: 18px">
-                <strong>鍙栨秷鎷嗙洅鏄庣粏</strong>
-              </p>
-            </lightning-layout-item>
-          </lightning-layout>
-        </div>
-        <div style="padding: 10px">
-          <!-- <div style="height: 300px;"> -->
-          <!-- <template if:true={showTable}> -->
-          <c-lex-custom-lightning-datatable
-            key-field="prodid"
-            data={data}
-            columns={columns}
-            onrowselection={getSelectedRows}
-            hide-checkbox-column="true"
-            selected-rows={selectedRows}
-            class="wrapped-header-datatable"
-            style="word-wrap: break-word; word-break: break-all"
-          >
-          </c-lex-custom-lightning-datatable>
-          <!-- </template> -->
-          <!-- </div> -->
-        </div>
-      </div>
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-          margin-top: 10px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <table>
-            <tr>
-              <td>
-                <lightning-layout>
+      <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+          <div>
+              <!-- <p style="font-size: 18px;"><strong>鍙栨秷鎷嗙洅</strong></p> -->
+              <lightning-layout>
                   <lightning-layout-item padding="around-small">
-                    <p style="font-size: 18px">
-                      <strong>閿欒鏄庣粏</strong>
-                    </p>
+                      <p style="font-size: 18px">
+                          <strong>鍙栨秷鎷嗙洅</strong>
+                      </p>
                   </lightning-layout-item>
-                </lightning-layout>
-              </td>
-            </tr>
-          </table>
-        </div>
-
-        <div style="padding: 10px">
-          <lightning-datatable
-            key-field="id"
-            data={errorDetail}
-            columns={column}
-            onrowselection={getSelectedRows}
-            hide-checkbox-column="true"
-            selected-rows={selectedRows}
-            class="wrapped-header-datatable"
-            style="word-wrap: break-word; word-break: break-all"
-          >
-          </lightning-datatable>
-        </div>
+              </lightning-layout>
+          </div>
       </div>
-    </div>
+      <div style="padding:10px;">
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+          <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+              <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鍙栨秷鎷嗙洅纭" title="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}></lightning-button></td> -->
+              <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-left:10px;margin-top:12px;margin-bottom:12px;" label="鍙栨秷鎷嗙洅纭" onclick={saveConfirm}>鍙栨秷鎷嗙洅纭</button>
+          </div>
+          </div>
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:5px;">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <lightning-layout>
+                      <lightning-layout-item padding="around-small">
+                          <p style="font-size: 16px">
+                              <strong>BarCode褰曞叆</strong>
+                          </p>
+                      </lightning-layout-item>
+                  </lightning-layout>
+              </div>
+             
+              <!-- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;"> -->
+                  <table>
+                      <colgroup>
+                          <col width="160px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="70px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="90px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="85px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="70px" />
+                          <col width="100px" />
+                      </colgroup>
+                      <tbody>
+                          <tr>
+                              <td></td>
+                              <td align="right" class="searchName">BarCode</td>
+                              <td style="width:600px"><lightning-textarea class="inputFont" name="BarCode" label=""
+                                      onchange={handleChange}></lightning-textarea></td>
+                              <td align="right"></td>
+                              <td></td>
+                              <td  style="width: 200px;">
+                                  <button style="margin-top:14px;"  class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={getDetails}>鑾峰彇鏄庣粏</button>
+                                  <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
+                                     ></lightning-button> -->
+                              </td>
+                          </tr>
+                      </tbody>
+                  </table>
+              <!-- </div> -->
+          </div>
+
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <lightning-layout>
+                      <lightning-layout-item padding="around-small">
+                          <p style="font-size: 18px">
+                              <strong>鍙栨秷鎷嗙洅鏄庣粏</strong>
+                          </p>
+                      </lightning-layout-item>
+                  </lightning-layout>
+              </div>
+              <div style="padding:10px;">
+
+                  <!-- <div style="height: 300px;"> -->
+                      <!-- <template if:true={showTable}> -->
+                          <c-lex-custom-lightning-datatable key-field="prodid" data={data} columns={columns}
+                          onrowselection={getSelectedRows} hide-checkbox-column="true"
+                          selected-rows={selectedRows} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
+                              </c-lex-custom-lightning-datatable>
+                      <!-- </template> -->
+                  <!-- </div> -->
+
+              </div>
+          </div>
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:10px">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <table>
+                      <tr>
+                          <td>
+                              <lightning-layout>
+                                  <lightning-layout-item padding="around-small">
+                                      <p style="font-size: 18px">
+                                          <strong>閿欒鏄庣粏</strong>
+                                      </p>
+                                  </lightning-layout-item>
+                              </lightning-layout>
+                          </td>
+                      </tr>
+                  </table>
+              </div>
+
+          <div style="padding:10px;">
+              <lightning-datatable
+              key-field="id" data={errorDetail} columns={column}
+              onrowselection={getSelectedRows}   hide-checkbox-column="true"
+             selected-rows={selectedRows}  class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
+      </lightning-datatable>
+
+
+          </div>
+      </div>
+      </div>
+
+    
+    
   </div>
+  
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
index 6d9e08d..41e3760 100644
--- a/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
+++ b/force-app/main/default/lwc/lexCancelRemoveBox/lexCancelRemoveBox.js
@@ -1,133 +1,142 @@
-import { LightningElement, wire, api, track } from "lwc";
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
+import { LightningElement, wire, api, track } from 'lwc';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 import oninit from "@salesforce/apex/LexCancelRemoveBoxController.init";
-import searchDeatail from "@salesforce/apex/LexCancelRemoveBoxController.searchConsumableorderdetails";
-import saveConfirm from "@salesforce/apex/LexCancelRemoveBoxController.cancelRemoveBoxConfirm";
+import searchDeatail from "@salesforce/apex/LexCancelRemoveBoxController.searchConsumableorderdetails" 
+import saveConfirm from '@salesforce/apex/LexCancelRemoveBoxController.cancelRemoveBoxConfirm';
 
-//table css
+//table css 
 import { loadStyle } from "lightning/platformResourceLoader";
 import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";
 const columns = [
-  {
-    label: "娑堣�楀搧鍚嶇О",
-    fieldName: "Name__c",
-    hideDefaultActions: true,
-    wrapText: true
-    // initialWidth: 350,
-  },
-  {
-    label: "瑙勬牸",
-    fieldName: "ProductPacking_list_manual__c",
-    hideDefaultActions: true,
-    cellAttributes: { alignment: "right" },
-    initialWidth: 50
-  },
-  {
-    label: "CFDA鐘舵��",
-    fieldName: "CFDA_Status__c",
-    hideDefaultActions: true,
-    initialWidth: 100,
-    wrapText: true
-  },
-  {
-    label: "娉ㄥ唽璇佺紪鐮佸彿",
-    fieldName: "Report_Product_Approbation__c",
-    hideDefaultActions: true,
-    initialWidth: 200,
-    wrapText: true
-  },
-  {
-    label: "娉ㄥ唽璇佹晥鏈�",
-    fieldName: "Report_Product_Expiration__c",
-    hideDefaultActions: true,
-    initialWidth: 110,
-    wrapText: true
-  },
-  {
-    label: "BarCode",
-    fieldName: "Bar_Code__c",
-    hideDefaultActions: true,
-    wrapText: true
-  }
-];
+    {
+      label: '娑堣�楀搧鍚嶇О',
+      fieldName: 'Name__c',
+      hideDefaultActions: true,
+      wrapText:true
+      // initialWidth: 350,
+  
+    },
+    {
+      label: '瑙勬牸',
+      fieldName: 'ProductPacking_list_manual__c',
+      hideDefaultActions: true,
+      cellAttributes: { alignment: "right" },
+      initialWidth: 50,
+  
+    },
+    {
+      label: 'CFDA鐘舵��',
+      fieldName: 'CFDA_Status__c',
+      hideDefaultActions: true,
+      initialWidth: 100,
+      wrapText:true
+  
+    },
+    {
+      label: '娉ㄥ唽璇佺紪鐮佸彿',
+      fieldName: 'Report_Product_Approbation__c',
+      hideDefaultActions: true,
+      initialWidth: 200,
+      wrapText:true
+    },
+    {
+      label: '娉ㄥ唽璇佹晥鏈�',
+      fieldName: 'Report_Product_Expiration__c',
+      hideDefaultActions: true,
+      initialWidth: 110,
+      wrapText:true
+    },
+    {
+      label: 'BarCode',
+      fieldName: 'Bar_Code__c',
+      hideDefaultActions: true,
+      wrapText:true
+    }
+  ];
+  
+  const column = [
+    {
+      label: '娑堣�楀搧鍚嶇О',
+      fieldName: 'Name__c',
+      hideDefaultActions: true,
+      wrapText:true
+  
+    },
+    {
+      label: 'BarCode',
+      fieldName: 'Bar_Code__c',
+      wrapText:true,
+      hideDefaultActions: true,
+      // initialWidth:600
 
-const column = [
-  {
-    label: "娑堣�楀搧鍚嶇О",
-    fieldName: "Name__c",
-    hideDefaultActions: true,
-    wrapText: true
-  },
-  {
-    label: "BarCode",
-    fieldName: "Bar_Code__c",
-    wrapText: true,
-    hideDefaultActions: true
-    // initialWidth:600
-  },
-  {
-    label: "閿欒鍘熷洜",
-    fieldName: "ErrorReason",
-    hideDefaultActions: true
-  }
-];
+     
+    }
+    ,
+    {
+      label: '閿欒鍘熷洜',
+      fieldName: 'ErrorReason',
+      hideDefaultActions: true,
+    }
+  ];
+  
 
 export default class LexCancelRemoveBox extends LightningElement {
-  columns = columns;
-  column = column;
-  @track selectedRows = [];
-  @track data = [];
-  @track errorDetail = [];
+    columns = columns;
+    column = column;
+    @track selectedRows = [];
+    @track data = [];
+    @track errorDetail = [];
+  
+    // 鏄剧ず
+    @track showTable = false
+    @track showSpinner = false;
 
-  // 鏄剧ず
-  @track showTable = false;
-  @track showSpinner = false;
+    //鏁版嵁鏋勬垚
+    @track accountName
+    @track userWorkLocation
+    @track agencyProType
+    @track barcode = ''
+    @track saveFLGbln = false
+    @track dataSize = 0;
 
-  //鏁版嵁鏋勬垚
-  @track accountName;
-  @track userWorkLocation;
-  @track agencyProType;
-  @track barcode = "";
-  @track saveFLGbln = false;
-  @track dataSize = 0;
-
-  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");
-        });
-    }
+    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() {
-    console.log("鍒濆鍖�");
-    // this.showTable = false;
-    oninit()
-      .then((result) => {
+
+
+    connectedCallback() {
+      console.log('鍒濆鍖�');
+      // this.showTable = false;
+      oninit().then((result) => {
         result = JSON.parse(JSON.stringify(result));
-        console.log("result =" + JSON.stringify(result));
-        if ((result.status = "Success")) {
-          console.log("result");
+        console.log('result =' + JSON.stringify(result));
+        if (result.status = 'Success') {
+          console.log('result');
           this.agencyProType = result.entity.agencyProType;
           this.userWorkLocation = result.entity.userWorkLocation;
           this.accountName = result.entity.accountName;
           // this.data = JSON.parse(result.entity.codPageRecords);
           // this.showTable = true;
         } else {
-          this.showMyToast("鍒濆鍖栧け璐�", result.msg, "error");
+          this.showMyToast('鍒濆鍖栧け璐�',result.msg,'error');
         }
-      })
-      .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
+      }).catch((error) => {
+        console.log('error = ' + JSON.stringify(error));
       });
-  }
+    }
 
-  //褰曞叆
+    //褰曞叆
   getDetails() {
     this.showSpinner = true;
     searchDeatail({
@@ -135,111 +144,106 @@
       userWorkLocation: this.userWorkLocation,
       agencyProType: this.agencyProType,
       barcode: this.barcode
-    })
-      .then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log("result =" + JSON.stringify(result));
-        if (result.status == "Success") {
-          console.log("鎴愬姛");
-          this.data = JSON.parse(
-            result.entity.ConsumableorderdetailsRecordsdummy
-          );
-          this.errorDetail = JSON.parse(
-            result.entity.ConsumableorderdetailsRecordserror
-          );
-          this.dataSize = result.entity.dataSize;
-          for (let i in this.data) {
-            this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
-            this.data[i]["ProductPacking_list_manual__c"] =
-              this.data[i].esd.ProductPacking_list_manual__c;
-            this.data[i]["CFDA_Status__c"] = this.data[i].esd.CFDA_Status__c;
-            this.data[i]["Report_Product_Approbation__c"] =
-              this.data[i].esd.Report_Product_Approbation__c;
-            this.data[i]["Report_Product_Expiration__c"] =
-              this.data[i].esd.Report_Product_Expiration__c;
-            this.data[i]["Bar_Code__c"] = this.data[i].esd.Bar_Code__c;
-          }
-          // this.showTable = true;
-          for (let i in this.errorDetail) {
-            this.errorDetail[i]["Name__c"] = this.errorDetail[i].Prod.Name__c;
-            this.errorDetail[i]["Bar_Code__c"] =
-              this.errorDetail[i].esd.Bar_Code__c;
-            this.errorDetail[i]["ErrorReason"] =
-              this.errorDetail[i].ErrorReason;
-          }
-          // this.showTables = true;
-          this.showSpinner = false;
-        } else {
-          this.showMyToast("鑾峰彇澶辫触", result.msg, "error");
-          this.showSpinner = false;
+    }).then((result) => {
+      result = JSON.parse(JSON.stringify(result));
+      console.log('result =' + JSON.stringify(result));
+      if (result.status == 'Success') {
+        console.log('鎴愬姛');
+        this.data = JSON.parse(result.entity.ConsumableorderdetailsRecordsdummy);
+        this.errorDetail = JSON.parse(result.entity.ConsumableorderdetailsRecordserror);
+        this.dataSize = result.entity.dataSize;
+        for (let i in this.data) {
+          this.data[i]['Name__c'] = this.data[i].Prod.Name__c;
+          this.data[i]['ProductPacking_list_manual__c'] = this.data[i].esd.ProductPacking_list_manual__c;
+          this.data[i]['CFDA_Status__c'] = this.data[i].esd.CFDA_Status__c;
+          this.data[i]['Report_Product_Approbation__c'] = this.data[i].esd.Report_Product_Approbation__c;
+          this.data[i]['Report_Product_Expiration__c'] = this.data[i].esd.Report_Product_Expiration__c;
+          this.data[i]['Bar_Code__c'] = this.data[i].esd.Bar_Code__c;
         }
-      })
-      .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
-      });
+        // this.showTable = true;
+        for (let i in this.errorDetail) {
+          this.errorDetail[i]['Name__c'] = this.errorDetail[i].Prod.Name__c;
+          this.errorDetail[i]['Bar_Code__c'] = this.errorDetail[i].esd.Bar_Code__c;
+          this.errorDetail[i]['ErrorReason'] = this.errorDetail[i].ErrorReason;
+        }
+        // this.showTables = true;
+        this.showSpinner = false;
+      } else{
+        this.showMyToast('鑾峰彇澶辫触',result.msg,'error');
+        this.showSpinner = false;
+      }
+    }).catch((error) => {
+      console.log('error = ' + JSON.stringify(error));
+    });
+
   }
-  //鑾峰彇褰撳墠杈撳叆鍊�
-  handleChange(event) {
+   //鑾峰彇褰撳墠杈撳叆鍊�
+   handleChange(event) {
     let value = event.detail.value;
-    console.log("value" + value);
+    console.log('value' + value);
     this.barcode = value;
-    console.log("this.barcode" + this.barcode);
+    console.log('this.barcode' + this.barcode);
   }
+
 
   saveConfirm() {
     let msg = "纭鍙栨秷鎷嗙洅鍚�";
-    if (this.dataSize > 0) {
-      if (confirm(msg) == true) {
-        this.CancelRemoveBox();
-      }
+    if (this.dataSize>0) {
+        if (confirm(msg) == true) {
+            this.CancelRemoveBox();
+        }
     } else {
-      this.CancelRemoveBox();
+        this.CancelRemoveBox();
     }
   }
-  CancelRemoveBox() {
-    this.showSpinner = true;
+    CancelRemoveBox(){
+      this.showSpinner = true;
     saveConfirm({
       saveConsumableorderdetailsRecordsdummy: JSON.stringify(this.data),
       accountName: this.accountName,
       userWorkLocation: this.userWorkLocation,
       agencyProType: this.agencyProType
-    })
-      .then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log("result淇濆瓨 = " + JSON.stringify(result));
-        if (result.status == "Success") {
-          this.saveFLGbln = result.entity.saveFLGbln;
-          //  this.showSpinner = false;
-          if (this.saveFLGbln) {
-            this.showMyToast(result.msg, "", "success");
-            this.showSpinner = false;
-          }
-        } else {
-          this.showMyToast("鍙栨秷鎷嗙洅澶辫触", result.msg, "error");
+    }).then((result) => {
+      result = JSON.parse(JSON.stringify(result));
+      console.log('result淇濆瓨 = ' + JSON.stringify(result));
+      if (result.status == 'Success') {
+         this.saveFLGbln = result.entity.saveFLGbln;
+        //  this.showSpinner = false;
+         if(this.saveFLGbln){
+          this.showMyToast(result.msg,'','success');
           this.showSpinner = false;
-        }
-      })
+
+
+         }
+      } else {
+        this.showMyToast('鍙栨秷鎷嗙洅澶辫触',result.msg,'error');
+        this.showSpinner = false;
+      }
+    })
       .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
+        console.log('error = ' + JSON.stringify(error));
       });
+
   }
   showMyToast(title, message, variant) {
-    console.log("show custom message");
-    var iconName = "";
-    var content = "";
-    if (variant == "success") {
-      iconName = "utility:check";
-    } else {
-      iconName = "utility:error";
+    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>";
+    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);
-  }
+    this.template.querySelector('c-common-toast').showToast(variant,content,iconName,10000);
+	}
+
+
+
+
+
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
index b4d54fe..4406470 100644
--- a/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
+++ b/force-app/main/default/lwc/lexConInvoiceView/lexConInvoiceView.html
@@ -3,7 +3,11 @@
 <template>
     <c-common-toast></c-common-toast>
     <template if:true={isShowSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-a"></div>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-b"></div>
+聽 聽 聽 聽 </div>
     </template>
 
 
diff --git a/force-app/main/default/lwc/lexConsumable/lexConsumable.html b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
index 18170aa..33ba4d1 100644
--- a/force-app/main/default/lwc/lexConsumable/lexConsumable.html
+++ b/force-app/main/default/lwc/lexConsumable/lexConsumable.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
index 7e0cb72..03feeaa 100644
--- a/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
+++ b/force-app/main/default/lwc/lexConsumableOrderManage/lexConsumableOrderManage.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexCssUtility/lexCssUtility.css b/force-app/main/default/lwc/lexCssUtility/lexCssUtility.css
index b9825ca..bf67af1 100644
--- a/force-app/main/default/lwc/lexCssUtility/lexCssUtility.css
+++ b/force-app/main/default/lwc/lexCssUtility/lexCssUtility.css
@@ -113,4 +113,10 @@
 .inputFont {
     font-size: 14px;
     --lwc-fontSize2:14px;
+}
+
+/* spinner_container By Link */
+.slds-spinner_container{
+    position:fixed;
+    top: 123px;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.css b/force-app/main/default/lwc/lexInventory/lexInventory.css
index 9a393b0..64cc184 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.css
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.css
@@ -15,4 +15,13 @@
 :host {
     --lwc-inputStaticFontSize: 16px;
     --lwc-formLabelFontSize: 16px;
-}
\ No newline at end of file
+}
+/* .spinner-container{
+  position: fixed; */
+  /* width:100%;
+  height:90%; */
+  /* top: 90%; */
+  /* left: 100%;
+  transform: translate(-50%, -50%); */ 
+  /* z-index: 9999;
+} */
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.html b/force-app/main/default/lwc/lexInventory/lexInventory.html
index 356372e..18b0886 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.html
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner class="spinner-container" size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showcount}>
@@ -108,7 +115,7 @@
                     <!-- <template if:true={showTable}> -->
                     <div style="padding:10px;">
                         <lightning-datatable key-field="id" data={pageCodeRecords} columns={column}
-                            hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable"  style="word-wrap:break-word; word-break:break-all; ">
+                            hide-checkbox-column={hidecheckbox} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
                         </lightning-datatable>
                         <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
                             onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
diff --git a/force-app/main/default/lwc/lexInventory/lexInventory.js b/force-app/main/default/lwc/lexInventory/lexInventory.js
index e53eb3a..9a35fb2 100644
--- a/force-app/main/default/lwc/lexInventory/lexInventory.js
+++ b/force-app/main/default/lwc/lexInventory/lexInventory.js
@@ -564,7 +564,8 @@
 		});
 		doc += '</table>';
 		console.log('doc' + doc);
-		var element = 'data:application/vnd.ms-excel,' + encodeURIComponent(doc);
+		var bom = "\uFEFF";
+		var element = 'data:application/vnd.ms-excel,' + encodeURIComponent(bom + doc);
 		let downloadElement = document.createElement('a');
 		downloadElement.href = element;
 		downloadElement.target = '_self';
diff --git a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
index 3a9786f..76b9b05 100644
--- a/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
+++ b/force-app/main/default/lwc/lexOutboundorderImport/lexOutboundorderImport.html
@@ -3,7 +3,11 @@
 <template>
     <c-common-toast></c-common-toast>
     <template if:true={isShowSpinner}>
-        <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+        <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-a"></div>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-b"></div>
+聽 聽 聽 聽 </div>
     </template>
     <div class="outerBorderCss">
         <div style="padding: 5px">
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
index 719cc89..75c65de 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.html
@@ -1,135 +1,131 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
-    </template>
-    <c-common-toast></c-common-toast>
-    <div style="border: 1px solid #D4D4D4;border-radius:5px;"> 
-        <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
-            <div style="margin: 12px;">
-                <p style="font-size: 18px;float:left"><strong>杩囨湡搴撳瓨閿�瀛�</strong></p>
-            </div>
-            <div style="margin-left:400px;margin-bottom:12px;">
-                <!-- <lightning-button variant="brand" class = 'lexstyle'  label="閿�瀛樼‘璁�" title="閿�瀛樼‘璁�" onclick={saveConfirm}></lightning-button> -->
-                <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="閿�瀛樼‘璁�" onclick={saveConfirm}>閿�瀛樼‘璁�</button>
-            </div>
-        </div>
-
-        <div style="padding:10px;">
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                    <table>
-                        <colgroup>
-                            <col width="160px" />
-                            <col width="100px" />
-                            <col width="10px" />
-                            <col width="70px" />
-                            <col width="100px" />
-                            <col width="10px" />
-                            <col width="90px" />
-                            <col width="100px" />
-                            <col width="10px" />
-                            <col width="85px" />
-                            <col width="100px" />
-                            <col width="10px" />
-                            <col width="70px" />
-                            <col width="100px" />
-                        </colgroup>
-                        <tbody>
-                            <tr>
-                                <td></td>
-                                <td align="right" class="searchName">BarCode</td>
-                                <td style="width:600px"><lightning-textarea class="inputFont"  name="BarCode" label=""
-                                        onchange={handleChange}></lightning-textarea></td>
-                                <td align="right"></td>
-                                <td></td>
-                                <td style="width:200px">
-                                    <button style="margin-top:14px;" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={barcodeEntrys}>鑾峰彇鏄庣粏</button>
-                                    <!-- <lightning-button class='lexstyle'  label="BarCode褰曞叆" title="BarCode褰曞叆" onclick={barcodeEntrys}
-                                        style="width: 150px;"></lightning-button> -->
-                                </td>
-                            </tr>
-                        </tbody>
-                    </table>
-                </div>
-            </div>
-
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:5px;">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                    <!-- <p style="font-size: 16px;"><strong>杩囨湡搴撳瓨涓�瑙�</strong></p> -->
-                    <table>
-                        <tr>
-                            <td>
-                                <!-- <p style="font-size: 16px;"><strong>閿�瀛樻槑缁�</strong></p> -->
-                                <lightning-layout>
-                                    <lightning-layout-item padding="around-small">
-                                        <p style="font-size: 18px">
-                                            <strong>杩囨湡搴撳瓨涓�瑙�</strong>
-                                        </p>
-                                    </lightning-layout-item>
-                                </lightning-layout>
-                            </td>
-                        </tr>
-                    </table>
-                </div>
-                <div style="padding:10px;">
-
-                    <!-- <div style="height: 300px;"> -->
-                        <template if:true={showTable}>
-                            <c-lex-custom-lightning-datatable key-field="key" data={data} columns={columns}
-                            onrowselection={getSelectedRows}
-                            selected-rows={selectedRows} class="wrapped-header-datatable">
-                                </c-lex-custom-lightning-datatable>
-                        </template>
-                        <!-- 鍔犺浇妗� -->
-
-                           <!-- <div if:true={casesSpinner} class="slds-spinner_inline spinner-padding"
-                            style="margin-top:10px;">
-                            <lightning-spinner variant="brand" alternative-text="Loading Cases" size="medium">
-                            </lightning-spinner>
-                        </div> -->
-
-                    <!-- </div> -->
-
-                </div>
-            </div>
-            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:5px;">
-                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                        <table>
-                            <tr>
-                                <td>
-                                    <!-- <p style="font-size: 16px;"><strong>閿�瀛樻槑缁�</strong></p> -->
-                                    <lightning-layout>
-                                        <lightning-layout-item padding="around-small">
-                                            <p style="font-size: 18px">
-                                                <strong>閿�瀛樻槑缁�</strong>
-                                            </p>
-                                        </lightning-layout-item>
-                                    </lightning-layout>
-                                </td>
-                            </tr>
-                        </table>
-                    </div>
-     
-                <div style="padding:10px;">
-                    <lightning-datatable
-                    key-field="id" data={overduePageRecords} columns={column}
-                    onrowselection={getSelectedRows}   hide-checkbox-column="true"
-                   selected-rows={selectedRows} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
-            </lightning-datatable>
-        </div>
-
-      
-     
-                <!-- <template if:true={showTables}>
-                    <c-lex-custom-lightning-datatable key-field="prodid" data={overduePageRecords} columns={column}
-                    onrowselection={getSelectedRows}   hide-checkbox-column="true"
-                   selected-rows={selectedRows}>
-               </c-lex-custom-lightning-datatable>
-                </template> -->
-
-
-            </div>
+    <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+    <div class="slds-spinner_container">
+        <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+            <span class="slds-assistive-text">Loading</span>
+            <div class="slds-spinner__dot-a"></div>
+            <div class="slds-spinner__dot-b"></div>
         </div>
     </div>
-    
+</template>
+<c-common-toast></c-common-toast>
+<div style="border: 1px solid #D4D4D4;border-radius:5px;"> 
+<div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+    <div style="margin: 12px;">
+        <p style="font-size: 18px;float:left"><strong>杩囨湡搴撳瓨閿�瀛�</strong></p>
+    </div>
+    <div style="margin-left:400px;margin-bottom:12px;">
+        <!-- <lightning-button variant="brand" class = 'lexstyle'  label="閿�瀛樼‘璁�" title="閿�瀛樼‘璁�" onclick={saveConfirm}></lightning-button> -->
+        <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="閿�瀛樼‘璁�" onclick={saveConfirm}>閿�瀛樼‘璁�</button>
+    </div>
+</div>
+
+<div style="padding:10px;">
+    <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+        <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+            <table>
+                <colgroup>
+                    <col width="160px" />
+                    <col width="100px" />
+                    <col width="10px" />
+                    <col width="70px" />
+                    <col width="100px" />
+                    <col width="10px" />
+                    <col width="90px" />
+                    <col width="100px" />
+                    <col width="10px" />
+                    <col width="85px" />
+                    <col width="100px" />
+                    <col width="10px" />
+                    <col width="70px" />
+                    <col width="100px" />
+                </colgroup>
+                <tbody>
+                    <tr>
+                        <td></td>
+                        <td align="right" class="searchName">BarCode</td>
+                        <td style="width:600px"><lightning-textarea class="inputFont"  name="BarCode" label=""
+                                onchange={handleChange}></lightning-textarea></td>
+                        <td align="right"></td>
+                        <td></td>
+                        <td style="width:200px">
+                            <button style="margin-top:14px;" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={barcodeEntrys}>鑾峰彇鏄庣粏</button>
+                            <!-- <lightning-button class='lexstyle'  label="BarCode褰曞叆" title="BarCode褰曞叆" onclick={barcodeEntrys}
+                                style="width: 150px;"></lightning-button> -->
+                        </td>
+                    </tr>
+                </tbody>
+            </table>
+        </div>
+    </div>
+
+    <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:5px;">
+        <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+            <!-- <p style="font-size: 16px;"><strong>杩囨湡搴撳瓨涓�瑙�</strong></p> -->
+            <table>
+                <tr>
+                    <td>
+                        <!-- <p style="font-size: 16px;"><strong>閿�瀛樻槑缁�</strong></p> -->
+                        <lightning-layout>
+                            <lightning-layout-item padding="around-small">
+                                <p style="font-size: 18px">
+                                    <strong>杩囨湡搴撳瓨涓�瑙�</strong>
+                                </p>
+                            </lightning-layout-item>
+                        </lightning-layout>
+                    </td>
+                </tr>
+            </table>
+        </div>
+        <div style="padding:10px;">
+
+            <!-- <div style="height: 300px;"> -->
+                <template if:true={showTable}>
+                    <c-lex-custom-lightning-datatable key-field="key" data={data} columns={columns}
+                    onrowselection={getSelectedRows}
+                    selected-rows={selectedRows} class="wrapped-header-datatable">
+                        </c-lex-custom-lightning-datatable>
+                </template>
+                <!-- 鍔犺浇妗� -->
+
+                   <!-- <div if:true={casesSpinner} class="slds-spinner_inline spinner-padding"
+                    style="margin-top:10px;">
+                    <lightning-spinner variant="brand" alternative-text="Loading Cases" size="medium">
+                    </lightning-spinner>
+                </div> -->
+
+            <!-- </div> -->
+
+        </div>
+    </div>
+
+    <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:5px;">
+        <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                <table>
+                    <tr>
+                        <td>
+                            <!-- <p style="font-size: 16px;"><strong>閿�瀛樻槑缁�</strong></p> -->
+                            <lightning-layout>
+                                <lightning-layout-item padding="around-small">
+                                    <p style="font-size: 18px">
+                                        <strong>閿�瀛樻槑缁�</strong>
+                                    </p>
+                                </lightning-layout-item>
+                            </lightning-layout>
+                        </td>
+                    </tr>
+                </table>
+            </div>
+
+        <div style="padding:10px;">
+            <lightning-datatable
+            key-field="id" data={overduePageRecords} columns={column}
+            onrowselection={getSelectedRows}   hide-checkbox-column="true"
+           selected-rows={selectedRows} class="wrapped-header-datatable " style="word-wrap:break-word; word-break:break-all; ">
+    </lightning-datatable>
+</div>
+    </div>
+</div>
+</div>
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
index d25d299..88325a0 100644
--- a/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
+++ b/force-app/main/default/lwc/lexOverdueStock/lexOverdueStock.js
@@ -164,6 +164,7 @@
       }
     }).catch((error) => {
       console.log('error = ' + JSON.stringify(error));
+      this.showSpinner = false;
     });
   }
   //barcode褰曞叆
@@ -183,18 +184,8 @@
         if (this.data[i].prodid + this.data[i]["boxPiece"] == selectedRows[j].prodid + selectedRows[j]["boxPiece"]) {
           this.data[i]["check"] = true;
         }
-        // console.log('this.data[i].ProdId+this.data[i]["boxPiece"]'+this.data[i].ProdId+this.data[i]["boxPiece"]);
-        console.log('selectedRows[j].prodid+this.data[i]["boxPiece"]' + selectedRows[j].prodid + selectedRows[j]["boxPiece"]);
-
       }
-      console.log('data===>'+  JSON.stringify(this.data));
     }
-    // this.selectedRows = [];
-
-    // if(this.barcode == ''||this.barcode==null){
-    //   this.showMyToast('鑾峰彇澶辫触','璇疯緭鍏arCode鍙�','error');
-    //   this.showSpinner = false;
-    // }
     barcodeEntry({
       accountNameLWC: this.accountName,
       agencyProTypeLWC: this.agencyProType,
@@ -230,7 +221,6 @@
           }
         }
         this.showSpinner = false;
-        // this.showTables = true;
         this.showTable = true;
       } else {
         if (result.status == 'Success1') {
@@ -267,6 +257,7 @@
           this.showMyToast(result.msg,'','error');
           this.showSpinner = false;
           this.showTable = true;
+          
         }
 
         // this.showMyToast('鑾峰彇澶辫触', result.msg, 'error');
@@ -274,6 +265,7 @@
       }
 
     }).catch((error) => {
+      this.showSpinner = false;
       console.log('error = ' + JSON.stringify(error));
     });
 
@@ -309,16 +301,8 @@
 				if (this.data[i].prodid+this.data[i]["boxPiece"] == selectedRows[j].prodid+ selectedRows[j]["boxPiece"]) {
 					this.data[i]["check"] = true;
 				}
-				// console.log('this.data[i].ProdId+this.data[i]["boxPiece"]'+this.data[i].ProdId+this.data[i]["boxPiece"]);
-				console.log('selectedRows[j].prodid+this.data[i]["boxPiece"]'+selectedRows[j].prodid+selectedRows[j]["boxPiece"]);
-
 			}
 		}
-    // var el = this.template.querySelector('c-lex-custom-lightning-datatable');
-    // var selected = el.getSelectedRows();
-    // this.selectedData = selected;
-    // console.log('閫変腑鏁版嵁' + JSON.stringify(this.selectedData));
-    // console.log('this.overdueList' + this.overdueList);
     save({
       iSinventory: this.iSinventory,
       saveCodPageRecords: JSON.stringify(this.data),
@@ -340,6 +324,7 @@
       } else {
         this.showMyToast('閿�瀛樺け璐�', result.msg, 'error');
         this.showSpinner = false;
+        
       }
     })
       .catch((error) => {
diff --git a/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.html b/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.html
index 3dc4676..b6a3c31 100644
--- a/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.html
+++ b/force-app/main/default/lwc/lexProductLimitEdit/lexProductLimitEdit.html
@@ -40,17 +40,17 @@
                     <template for:each = {invRecords} for:item = "inv" for:index="indexVar">
                         <tr key={inv.key} class="slds-hint-parent">
                             <td>
-                                <div title="Prospecting">
+                                <div>
                                     <lightning-input key={inv.key} data-id={inv.key} data-index={indexVar} name="productNumber" label="productNumber" value={inv.productNumber} variant="label-hidden" onchange={handleProductChange}></lightning-input>
                                 </div>
                             </td>
                             <td>
-                                <div  title="Prospecting">
+                                <div>
                                     <lightning-input key={inv.key} data-id={inv.key} data-index={indexVar} name="inventory1" label="inventory1" value={inv.inventory1} variant="label-hidden" onchange={handleProductChange}></lightning-input>
                                 </div>
                             </td>
                             <td>
-                                <div  title="Prospecting">
+                                <div>
                                     <lightning-input key={inv.key} data-id={inv.key} data-index={indexVar} name="inventory2" label="inventory2" value={inv.inventory2} variant="label-hidden" onchange={handleProductChange}></lightning-input>
                                 </div>
                             </td>
diff --git a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
index ce3bcf7..b8546a2 100644
--- a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
+++ b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.html
@@ -1,223 +1,141 @@
 <template>
   <template if:true={showSpinner}>
-    <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+      <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+      <div class="slds-spinner_container">
+          <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+              <span class="slds-assistive-text">Loading</span>
+              <div class="slds-spinner__dot-a"></div>
+              <div class="slds-spinner__dot-b"></div>
+          </div>
+      </div>
   </template>
   <c-common-toast></c-common-toast>
-  <div style="border: 1px solid #d4d4d4; border-radius: 5px">
-    <div
-      style="
-        border-top: 3px solid #51606e;
-        border-bottom: 1px solid #d4d4d4;
-        padding: 3px;
-      "
-    >
-      <div>
-        <!-- <p style="font-size: 18px;"><strong>鎷嗙洅</strong></p> -->
-        <lightning-layout>
-          <lightning-layout-item padding="around-small">
-            <p style="font-size: 18px">
-              <strong>鎷嗙洅</strong>
-            </p>
-          </lightning-layout-item>
-        </lightning-layout>
-      </div>
-    </div>
-    <div style="padding: 10px">
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鎷嗙洅纭" title="鎷嗙洅纭" onclick={saveConfirm}></lightning-button>-->
-          <button
-            class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-            style="margin-left: 10px; margin-top: 12px; margin-bottom: 12px"
-            label="鎷嗙洅纭"
-            onclick={saveConfirm}
-          >
-            鎷嗙洅纭
-          </button>
-        </div>
-      </div>
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-          margin-top: 5px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <lightning-layout>
-            <lightning-layout-item padding="around-small">
-              <p style="font-size: 16px">
-                <strong>BarCode褰曞叆</strong>
-              </p>
-            </lightning-layout-item>
-          </lightning-layout>
-        </div>
+  <div style="border: 1px solid #D4D4D4;border-radius:5px;"> 
 
-        <!-- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;"> -->
-        <table>
-          <colgroup>
-            <col width="160px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="70px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="90px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="85px" />
-            <col width="100px" />
-            <col width="10px" />
-            <col width="70px" />
-            <col width="100px" />
-          </colgroup>
-          <tbody>
-            <tr>
-              <td></td>
-              <td align="right" class="searchName">BarCode</td>
-              <td style="width: 600px">
-                <lightning-textarea
-                  class="inputFont"
-                  name="BarCode"
-                  label=""
-                  onchange={handleChange}
-                ></lightning-textarea>
-              </td>
-              <td align="right"></td>
-              <td></td>
-              <td style="width: 200px">
-                <button
-                  style="margin-top: 14px"
-                  class="slds-button slds-button_neutral slds-button_stretch lexBorder"
-                  label="鑾峰彇鏄庣粏"
-                  onclick={getDetails}
-                >
-                  鑾峰彇鏄庣粏
-                </button>
-                <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
-                                       ></lightning-button> -->
-              </td>
-            </tr>
-          </tbody>
-        </table>
-        <!-- </div> -->
-      </div>
-
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-          margin-top: 10px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <lightning-layout>
-            <lightning-layout-item padding="around-small">
-              <p style="font-size: 18px">
-                <strong>鎷嗙洅鏄庣粏</strong>
-              </p>
-            </lightning-layout-item>
-          </lightning-layout>
-        </div>
-        <div style="padding: 10px">
-          <!-- <div style="height: 300px;"> -->
-          <!-- <template if:true={showTable}> -->
-          <!-- <c-lex-custom-lightning-datatable key-field="prodid" data={data} columns={columns}
-                            onrowselection={getSelectedRows} hide-checkbox-column="true"
-                            selected-rows={selectedRows}>
-                                </c-lex-custom-lightning-datatable> -->
-          <lightning-datatable
-            key-field="prodid"
-            data={data}
-            columns={columns}
-            onrowselection={getSelectedRows}
-            hide-checkbox-column="true"
-            selected-rows={selectedRows}
-            class="wrapped-header-datatable"
-            style="word-wrap: break-word; word-break: break-all"
-          >
-          </lightning-datatable>
-          <!-- </template> -->
-          <!-- </div> -->
-        </div>
-      </div>
-      <div
-        style="
-          border: 1px solid #d4d4d4;
-          border-radius: 5px;
-          margin-bottom: 7px;
-          margin-top: 10px;
-        "
-      >
-        <div
-          style="
-            border-top: 3px solid #51606e;
-            border-bottom: 1px solid #d4d4d4;
-            padding: 3px;
-          "
-        >
-          <table>
-            <tr>
-              <td>
-                <lightning-layout>
+      <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+          <div>
+              <!-- <p style="font-size: 18px;"><strong>鎷嗙洅</strong></p> -->
+              <lightning-layout>
                   <lightning-layout-item padding="around-small">
-                    <p style="font-size: 18px">
-                      <strong>閿欒鏄庣粏</strong>
-                    </p>
+                      <p style="font-size: 18px">
+                          <strong>鎷嗙洅</strong>
+                      </p>
                   </lightning-layout-item>
-                </lightning-layout>
-              </td>
-            </tr>
-          </table>
-        </div>
-
-        <div style="padding: 10px">
-          <!-- <template if:true={showTables}> -->
-
-          <!-- <c-lex-custom-lightning-datatable key-field="id" data={errorDetail} columns={column}
-                    onrowselection={getSelectedRows}   hide-checkbox-column="true"
-                   selected-rows={selectedRows}>
-               </c-lex-custom-lightning-datatable> -->
-          <lightning-datatable
-            key-field="id"
-            data={errorDetail}
-            columns={column}
-            onrowselection={getSelectedRows}
-            hide-checkbox-column="true"
-            selected-rows={selectedRows}
-            class="wrapped-header-datatable"
-            style="word-wrap: break-word; word-break: break-all"
-          >
-          </lightning-datatable>
-          <!-- </template> -->
-        </div>
+              </lightning-layout>
+          </div>
       </div>
-    </div>
+      <div style="padding:10px;">
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+          <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+              <!-- <lightning-button variant="brand" class='lexstyle' style="margin-left:10px;" label="鎷嗙洅纭" title="鎷嗙洅纭" onclick={saveConfirm}></lightning-button>-->
+              <button class="slds-button slds-button_neutral slds-button_stretch lexBorder" style="margin-left:10px;margin-top:12px;margin-bottom:12px;"  label="鎷嗙洅纭" onclick={saveConfirm}>鎷嗙洅纭</button>
+          </div>
+          </div>
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:5px;">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <lightning-layout>
+                      <lightning-layout-item padding="around-small">
+                          <p style="font-size: 16px">
+                              <strong>BarCode褰曞叆</strong>
+                          </p>
+                      </lightning-layout-item>
+                  </lightning-layout>
+              </div>
+             
+              <!-- <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;"> -->
+                  <table>
+                      <colgroup>
+                          <col width="160px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="70px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="90px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="85px" />
+                          <col width="100px" />
+                          <col width="10px" />
+                          <col width="70px" />
+                          <col width="100px" />
+                      </colgroup>
+                      <tbody>
+                          <tr>
+                              <td></td>
+                              <td align="right" class="searchName">BarCode</td>
+                              <td style="width:600px"><lightning-textarea class="inputFont"  name="BarCode" label=""
+                                      onchange={handleChange}></lightning-textarea></td>
+                              <td align="right"></td>
+                              <td></td>
+                              <td  style="width: 200px;">
+                                  <button style="margin-top:14px;" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="鑾峰彇鏄庣粏" onclick={getDetails}>鑾峰彇鏄庣粏</button>
+                                  <!-- <lightning-button variant="brand" class='lexstyle' label="鑾峰彇鏄庣粏" title="鑾峰彇鏄庣粏" onclick={getDetails}
+                                     ></lightning-button> -->
+                              </td>
+                          </tr>
+                      </tbody>
+                  </table>
+              <!-- </div> -->
+          </div>
+
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:10px">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <lightning-layout>
+                      <lightning-layout-item padding="around-small">
+                          <p style="font-size: 18px">
+                              <strong>鎷嗙洅鏄庣粏</strong>
+                          </p>
+                      </lightning-layout-item>
+                  </lightning-layout>
+              </div>
+              <div style="padding:10px;">
+
+                              <lightning-datatable
+                              key-field="prodid" data={data} columns={columns}
+                              onrowselection={getSelectedRows} hide-checkbox-column="true"
+                              selected-rows={selectedRows} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
+                      </lightning-datatable>
+              </div>
+          </div>
+          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:10px">
+              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                  <table>
+                      <tr>
+                          <td>
+                              <lightning-layout>
+                                  <lightning-layout-item padding="around-small">
+                                      <p style="font-size: 18px">
+                                          <strong>閿欒鏄庣粏</strong>
+                                      </p>
+                                  </lightning-layout-item>
+                              </lightning-layout>
+                          </td>
+                      </tr>
+                  </table>
+              </div>
+
+          <div style="padding:10px;">
+              <!-- <template if:true={showTables}> -->
+               
+                  <!-- <c-lex-custom-lightning-datatable key-field="id" data={errorDetail} columns={column}
+                  onrowselection={getSelectedRows}   hide-checkbox-column="true"
+                 selected-rows={selectedRows}>
+             </c-lex-custom-lightning-datatable> -->
+             <lightning-datatable
+             key-field="id" data={errorDetail} columns={column}
+             onrowselection={getSelectedRows}   hide-checkbox-column="true"
+            selected-rows={selectedRows} class="wrapped-header-datatable" style="word-wrap:break-word; word-break:break-all; ">
+     </lightning-datatable>
+              <!-- </template> -->
+
+
+          </div>
+      </div>
+      </div>
+
+    
+    
   </div>
+  
 </template>
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
index 3db9fa1..440d3e2 100644
--- a/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
+++ b/force-app/main/default/lwc/lexRemoveBox/lexRemoveBox.js
@@ -1,79 +1,90 @@
-import { LightningElement, wire, api, track } from "lwc";
-import init from "@salesforce/apex/LexRemoveBoxController.init";
-import searchDeatail from "@salesforce/apex/LexRemoveBoxController.searchConsumableorderdetails";
-import saveconfirm from "@salesforce/apex/LexRemoveBoxController.removeBoxConfirm";
-import { ShowToastEvent } from "lightning/platformShowToastEvent";
+import { LightningElement, wire, api, track } from 'lwc';
+import init from '@salesforce/apex/LexRemoveBoxController.init';
+import searchDeatail from '@salesforce/apex/LexRemoveBoxController.searchConsumableorderdetails';
+import saveconfirm from '@salesforce/apex/LexRemoveBoxController.removeBoxConfirm';
+import { ShowToastEvent } from 'lightning/platformShowToastEvent';
 // import { NavigationMixin } from 'lightning/navigation';
-//table css
+//table css 
 import { loadStyle } from "lightning/platformResourceLoader";
 import WrappedHeaderTable from "@salesforce/resourceUrl/lexdatatable";
 
 const columns = [
   {
-    label: "娑堣�楀搧鍚嶇О",
-    fieldName: "Name__c",
-    wrapText: true,
-    hideDefaultActions: true
+    label: '娑堣�楀搧鍚嶇О',
+    fieldName: 'Name__c',
+    wrapText:true,
+    hideDefaultActions: true,
     // initialWidth: 400,
+
   },
   {
-    label: "瑙勬牸",
-    fieldName: "ProductPacking_list_manual__c",
+    label: '瑙勬牸',
+    fieldName: 'ProductPacking_list_manual__c',
     hideDefaultActions: true,
     initialWidth: 50,
-    cellAttributes: { alignment: "right" }
+    cellAttributes: { alignment: "right" },
+
+
   },
   {
-    label: "CFDA鐘舵��",
-    fieldName: "CFDA_Status__c",
+    label: 'CFDA鐘舵��',
+    fieldName: 'CFDA_Status__c',
     hideDefaultActions: true,
     initialWidth: 100,
-    wrapText: true
+    wrapText:true,
+
   },
   {
-    label: "娉ㄥ唽璇佺紪鐮佸彿",
-    fieldName: "Report_Product_Approbation__c",
+    label: '娉ㄥ唽璇佺紪鐮佸彿',
+    fieldName: 'Report_Product_Approbation__c',
     hideDefaultActions: true,
     initialWidth: 200,
-    wrapText: true
+    wrapText:true,
   },
   {
-    label: "娉ㄥ唽璇佹晥鏈�",
-    fieldName: "Report_Product_Expiration__c",
+    label: '娉ㄥ唽璇佹晥鏈�',
+    fieldName: 'Report_Product_Expiration__c',
     hideDefaultActions: true,
     initialWidth: 110,
-    wrapText: true
+    wrapText:true,
   },
   {
-    label: "BarCode",
-    fieldName: "Bar_Code__c",
+    label: 'BarCode',
+    fieldName: 'Bar_Code__c',
     hideDefaultActions: true,
-    wrapText: true
+    wrapText:true,
     // initialWidth:600,
   }
 ];
 
 const column = [
   {
-    label: "娑堣�楀搧鍚嶇О",
-    fieldName: "Name__c",
+    label: '娑堣�楀搧鍚嶇О',
+    fieldName: 'Name__c',
     hideDefaultActions: true,
-    wrapText: true
+    wrapText:true,
+
   },
   {
-    label: "BarCode",
-    fieldName: "Bar_Code__c",
+    label: 'BarCode',
+    fieldName: 'Bar_Code__c',
     hideDefaultActions: true,
-    wrapText: true
+    wrapText:true,
     // initialWidth:600,
-  },
+
+   
+  }
+  ,
   {
-    label: "閿欒鍘熷洜",
-    fieldName: "ErrorReason",
+    label: '閿欒鍘熷洜',
+    fieldName: 'ErrorReason',
     hideDefaultActions: true,
-    wrapText: true
+    wrapText:true,
   }
 ];
+
+
+
 
 export default class LexRemoveBox extends LightningElement {
   columns = columns;
@@ -83,53 +94,51 @@
   @track errorDetail = [];
 
   // 鏄剧ず
-  @track showTable = false;
-  @track accountName;
-  @track userWorkLocation;
-  @track agencyProType;
-  @track barcode = "";
-  @track saveFLGbln = false;
+  @track showTable = false
+  @track accountName
+  @track userWorkLocation
+  @track agencyProType
+  @track barcode = ''
+  @track saveFLGbln = false
   @track dataSize = 0;
 
   //鍔犺浇妗�
-  @track showSpinner = false;
+  @track showSpinner = false
 
   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");
-        });
+        Promise.all([loadStyle(this, WrappedHeaderTable)])
+            .then(() => {
+                console.log("Custom styles loaded");
+                this.stylesLoaded = true;
+            })
+            .catch((error) => {
+                console.error("Error loading custom styles");
+            });
     }
-  }
+}
 
   //鍒濆鍖�
   connectedCallback() {
-    console.log("鍒濆鍖�");
+    console.log('鍒濆鍖�');
     this.showTable = false;
 
-    init()
-      .then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log("result =" + JSON.stringify(result));
-        if ((result.status = "Success")) {
-          console.log("result");
-          this.agencyProType = result.entity.agencyProType;
-          this.userWorkLocation = result.entity.userWorkLocation;
-          this.accountName = result.entity.accountName;
-          // this.data = JSON.parse(result.entity.codPageRecords);
-          // this.showTable = true;
-        } else {
-          this.showMyToast("鍒濆鍖栧け璐�", result.msg, "error");
-        }
-      })
-      .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
-      });
+    init().then((result) => {
+      result = JSON.parse(JSON.stringify(result));
+      console.log('result =' + JSON.stringify(result));
+      if (result.status = 'Success') {
+        console.log('result');
+        this.agencyProType = result.entity.agencyProType;
+        this.userWorkLocation = result.entity.userWorkLocation;
+        this.accountName = result.entity.accountName;
+        // this.data = JSON.parse(result.entity.codPageRecords);
+        // this.showTable = true;
+      } else {
+        this.showMyToast('鍒濆鍖栧け璐�',result.msg,'error');
+      }
+    }).catch((error) => {
+      console.log('error = ' + JSON.stringify(error));
+    });
   }
   //褰曞叆
   getDetails() {
@@ -138,112 +147,105 @@
       userWorkLocation: this.userWorkLocation,
       agencyProType: this.agencyProType,
       barcode: this.barcode
-    })
-      .then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log("result =" + JSON.stringify(result));
-        if (result.status == "Success") {
-          console.log("鎴愬姛");
-          this.data = JSON.parse(
-            result.entity.ConsumableorderdetailsRecordsdummy
-          );
-          this.errorDetail = JSON.parse(
-            result.entity.ConsumableorderdetailsRecordserror
-          );
-          this.dataSize = result.entity.dataSize;
-          console.log("this.dataSize" + this.dataSize);
-          for (let i in this.data) {
-            this.data[i]["Name__c"] = this.data[i].Prod.Name__c;
-            this.data[i]["ProductPacking_list_manual__c"] =
-              this.data[i].esd.ProductPacking_list_manual__c;
-            this.data[i]["CFDA_Status__c"] = this.data[i].esd.CFDA_Status__c;
-            this.data[i]["Report_Product_Approbation__c"] =
-              this.data[i].esd.Report_Product_Approbation__c;
-            this.data[i]["Report_Product_Expiration__c"] =
-              this.data[i].esd.Report_Product_Expiration__c;
-            this.data[i]["Bar_Code__c"] = this.data[i].esd.Bar_Code__c;
-          }
-          for (let i in this.errorDetail) {
-            this.errorDetail[i]["Name__c"] = this.errorDetail[i].Prod.Name__c;
-            this.errorDetail[i]["Bar_Code__c"] =
-              this.errorDetail[i].esd.Bar_Code__c;
-            this.errorDetail[i]["ErrorReason"] =
-              this.errorDetail[i].ErrorReason;
-          }
-          this.showTables = true;
-          this.showTable = true;
-        } else {
-          console.log("result.msg = " + result.msg);
-          this.showMyToast("鑾峰彇澶辫触", result.msg, "error");
+    }).then((result) => {
+      result = JSON.parse(JSON.stringify(result));
+      console.log('result =' + JSON.stringify(result));
+      if (result.status == 'Success') {
+        console.log('鎴愬姛');
+        this.data = JSON.parse(result.entity.ConsumableorderdetailsRecordsdummy);
+        this.errorDetail = JSON.parse(result.entity.ConsumableorderdetailsRecordserror);
+        this.dataSize = result.entity.dataSize;
+        console.log('this.dataSize'+this.dataSize);
+        for (let i in this.data) {
+          this.data[i]['Name__c'] = this.data[i].Prod.Name__c;
+          this.data[i]['ProductPacking_list_manual__c'] = this.data[i].esd.ProductPacking_list_manual__c;
+          this.data[i]['CFDA_Status__c'] = this.data[i].esd.CFDA_Status__c;
+          this.data[i]['Report_Product_Approbation__c'] = this.data[i].esd.Report_Product_Approbation__c;
+          this.data[i]['Report_Product_Expiration__c'] = this.data[i].esd.Report_Product_Expiration__c;
+          this.data[i]['Bar_Code__c'] = this.data[i].esd.Bar_Code__c;
         }
-      })
-      .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
-      });
+        for (let i in this.errorDetail) {
+          this.errorDetail[i]['Name__c'] = this.errorDetail[i].Prod.Name__c;
+          this.errorDetail[i]['Bar_Code__c'] = this.errorDetail[i].esd.Bar_Code__c;
+          this.errorDetail[i]['ErrorReason'] = this.errorDetail[i].ErrorReason;
+        }
+        this.showTables = true;
+        this.showTable = true;
+      } else{
+        console.log('result.msg = ' + result.msg);
+        this.showMyToast('鑾峰彇澶辫触',result.msg,'error');
+      }
+    }).catch((error) => {
+      console.log('error = ' + JSON.stringify(error));
+    });
+
   }
   //鑾峰彇褰撳墠杈撳叆鍊�
   handleChange(event) {
     let value = event.detail.value;
-    console.log("value" + value);
+    console.log('value' + value);
     this.barcode = value;
-    console.log("this.barcode" + this.barcode);
+    console.log('this.barcode' + this.barcode);
   }
   saveConfirm() {
-    console.log("杩涘叆纭");
+    console.log('杩涘叆纭');
     let msg = "纭鎷嗙洅鍚�";
-    if (this.dataSize > 0) {
-      if (confirm(msg) == true) {
-        this.removeBox();
-      }
+    if (this.dataSize>0) {
+        if (confirm(msg) == true) {
+            this.removeBox();
+        }
     } else {
-      this.removeBox();
+        this.removeBox();
     }
+
   }
-  removeBox() {
+  removeBox(){
     this.showSpinner = true;
     saveconfirm({
       saveConsumableorderdetailsRecordsdummy: JSON.stringify(this.data),
       accountName: this.accountName,
       userWorkLocation: this.userWorkLocation,
       agencyProType: this.agencyProType
-    })
-      .then((result) => {
-        result = JSON.parse(JSON.stringify(result));
-        console.log("result淇濆瓨 = " + JSON.stringify(result));
-        if (result.status == "Success") {
-          this.saveFLGbln = result.entity.saveFLGbln;
-          //  this.showSpinner = false;
-          if (this.saveFLGbln) {
-            this.showMyToast(result.msg, "", "success");
-            this.showSpinner = false;
-          }
-        } else {
-          console.log("result.msg = " + result.msg);
-          this.showMyToast("鎷嗙洅澶辫触", result.msg, "error");
+    }).then((result) => {
+      result = JSON.parse(JSON.stringify(result));
+      console.log('result淇濆瓨 = ' + JSON.stringify(result));
+      if (result.status == 'Success') {
+         this.saveFLGbln = result.entity.saveFLGbln;
+        //  this.showSpinner = false;
+         if(this.saveFLGbln){
+          this.showMyToast(result.msg,'','success');
           this.showSpinner = false;
-        }
-      })
+         }
+      } else {
+        console.log('result.msg = ' + result.msg);
+        this.showMyToast('鎷嗙洅澶辫触',result.msg,'error');
+        this.showSpinner = false;
+      }
+    })
       .catch((error) => {
-        console.log("error = " + JSON.stringify(error));
+        console.log('error = ' + JSON.stringify(error));
       });
+
+
   }
   showMyToast(title, message, variant) {
-    console.log("show custom message");
-    var iconName = "";
-    var content = "";
-    if (variant == "success") {
-      iconName = "utility:check";
-    } else {
-      iconName = "utility:error";
+    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>";
+    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);
-  }
+    this.template.querySelector('c-common-toast').showToast(variant,content,iconName,10000);
+	}
+
+
+
+
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
index 670097d..d2c33e0 100644
--- a/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
+++ b/force-app/main/default/lwc/lexSaleAndDelivery/lexSaleAndDelivery.html
@@ -167,7 +167,13 @@
 
             <div class="borderCss">
                 <template if:true={isShowSpinner}>
-                    <lightning-spinner alternative-text="Loading" size="large"></lightning-spinner>
+                    <div class="slds-spinner_container">
+            聽 聽 聽 聽 聽 聽 <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+            聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span>
+            聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-a"></div>
+            聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-b"></div>
+                聽 聽 聽 聽 </div>
+            聽 聽 聽 聽 </div>
                 </template>
                 <div class="headerDorderCss">
                     <lightning-layout>
diff --git a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
index 01126e3..29ad382 100644
--- a/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
+++ b/force-app/main/default/lwc/lexSummonsCreat/lexSummonsCreat.html
@@ -3,7 +3,13 @@
 <template>
     <c-common-toast></c-common-toast>
     <template if:true={isShowSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <div class="slds-spinner_container">
+聽 聽 聽 聽 聽 聽 <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+聽 聽 聽 聽 聽 聽 聽 聽 <span class="slds-assistive-text">Loading</span>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-a"></div>
+聽 聽 聽 聽 聽 聽 聽 聽 <div class="slds-spinner__dot-b"></div>
+    聽 聽 聽 聽 </div>
+聽 聽 聽 聽 </div>
     </template>
     <!-- 鎼滅储瀹㈡埛鍚� -->
     <template if:true={isModalOpen}>
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.html b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
index 8886b5c..e7b4de8 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.html
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.html
@@ -1,6 +1,13 @@
 <template>
     <template if:true={showSpinner}>
-        <lightning-spinner size="medium" variant="brand"></lightning-spinner>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
     </template>
     <c-common-toast></c-common-toast>
     <template if:true={showPage}>
diff --git a/force-app/main/default/lwc/lexTopPage/lexTopPage.js b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
index c2d88d1..777d6e7 100644
--- a/force-app/main/default/lwc/lexTopPage/lexTopPage.js
+++ b/force-app/main/default/lwc/lexTopPage/lexTopPage.js
@@ -329,7 +329,6 @@
                     this.hasHos = result.hasHos;
                     this.product_Limit = result.product_Limit;
                     console.log('result==>' + JSON.stringify(result));
-                    
                     for (var i in this.pageRecords) {
                         this.pageRecords[i]["Name__c"] = this.pageRecords[i].Prod.Name__c;
                         this.pageRecords[i]["Category3__c"] = this.pageRecords[i].Prod.Category3__c;
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
index c1f9846..285f443 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.css
@@ -1,16 +1,16 @@
-@import "c/lexCssUtility";
-.lexButtoun {
-  font-size: 18px;
-  font-family: "sans-serif";
-  font-weight: 500;
-  color: #0a81df;
-  /* border:2px solid rgb(8,16,132); */
-  /* border-color:rgb(8,16,132); */
-  width: 160px;
-  height: 36px;
-  border-radius: 4px;
-  opacity: 1;
-  background: #ffffff;
-  box-sizing: border-box;
-  border: 1px solid #0a81df;
+@import 'c/lexCssUtility';
+.lexButtoun{
+    font-size: 18px;
+    font-family: 'sans-serif';
+    font-weight:500;
+    color:#0A81DF;
+    /* border:2px solid rgb(8,16,132); */
+    /* border-color:rgb(8,16,132); */
+    width: 160px;
+    height: 36px;
+    border-radius: 4px;
+    opacity: 1;
+    background: #FFFFFF;
+    box-sizing: border-box;
+    border:1px solid #0A81DF;
 }
\ No newline at end of file
diff --git a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
index b8da408..6c29ff9 100644
--- a/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
+++ b/force-app/main/default/lwc/lexinventoryViewLWC/lexinventoryViewLWC.html
@@ -1,129 +1,147 @@
 <template>
-  <template if:true={showSpinner}>
-      <lightning-spinner size="medium" variant="brand"></lightning-spinner>
-  </template>
-  <c-common-toast></c-common-toast>
-  <div style="border: 1px solid #D4D4D4;border-radius:5px;">
-      <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
-          <!-- <p style="font-size: 18px;"><strong>搴撳瓨绠$悊</strong></p> -->
-          <lightning-layout>
-              <lightning-layout-item padding="around-small">
-                  <p style="font-size: 18px">
-                      <strong>搴撳瓨绠$悊</strong>
-                  </p>
-              </lightning-layout-item>
-          </lightning-layout>
-      </div>
-      <div style="padding:10px;">
-          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
-              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:10px;">
-                  <!-- <lightning-button variant="brand" class = 'lexstyle' style="margin:12px;" label="搴撳瓨鐩樼偣" title="搴撳瓨鐩樼偣"
-                      onclick={inventoryCount}></lightning-button>
-                  <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="杩囨湡搴撳瓨閿�瀛�" title="杩囨湡搴撳瓨閿�瀛�"
-                      onclick={handleExpired}></lightning-button>
-                  <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鎷嗙洅" title="鎷嗙洅" onclick={removeBox}></lightning-button>
-                  <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鍙栨秷鎷嗙洅" title="鍙栨秷鎷嗙洅"
-                      onclick={cancelremoveBox}></lightning-button> -->
-                      <button style ="margin-left:5px" class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="搴撳瓨鐩樼偣" onclick={inventoryCount}>搴撳瓨鐩樼偣</button>
-                      <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="杩囨湡搴撳瓨閿�瀛�" style = "margin-left:60px;" onclick={handleExpired}>杩囨湡搴撳瓨閿�瀛�</button>
-                      <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鎷嗙洅" style = "margin-left:60px;" onclick={removeBox}>鎷嗙洅</button>
-                  <button  class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鍙栨秷鎷嗙洅" style = "margin-left:60px;" onclick={cancelremoveBox}>鍙栨秷鎷嗙洅</button>
-              </div>
-          </div>
+    <template if:true={showSpinner}>
+        <!-- <lightning-spinner size="medium" variant="brand"></lightning-spinner> -->
+        <div class="slds-spinner_container">
+            <div role="status" class="slds-spinner slds-spinner_medium slds-spinner_brand">
+                <span class="slds-assistive-text">Loading</span>
+                <div class="slds-spinner__dot-a"></div>
+                <div class="slds-spinner__dot-b"></div>
+            </div>
+        </div>
+    </template>
+    <c-common-toast></c-common-toast>
+    <div style="border: 1px solid #D4D4D4;border-radius:5px;">
+        <div style="border-top: 3px solid #51606E;;border-bottom: 1px solid #D4D4D4;padding:3px;">
+            <!-- <p style="font-size: 18px;"><strong>搴撳瓨绠$悊</strong></p> -->
+            <lightning-layout>
+                <lightning-layout-item padding="around-small">
+                    <p style="font-size: 18px">
+                        <strong>搴撳瓨绠$悊</strong>
+                    </p>
+                </lightning-layout-item>
+            </lightning-layout>
+        </div>
+        <div style="padding:10px;">
+            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:10px;">
+                    <!-- <lightning-button variant="brand" class = 'lexstyle' style="margin:12px;" label="搴撳瓨鐩樼偣" title="搴撳瓨鐩樼偣"
+                        onclick={inventoryCount}></lightning-button>
+                    <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="杩囨湡搴撳瓨閿�瀛�" title="杩囨湡搴撳瓨閿�瀛�"
+                        onclick={handleExpired}></lightning-button>
+                    <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鎷嗙洅" title="鎷嗙洅" onclick={removeBox}></lightning-button>
+                    <lightning-button variant="brand" class = 'lexstyle' style="margin: 12px;" label="鍙栨秷鎷嗙洅" title="鍙栨秷鎷嗙洅"
+                        onclick={cancelremoveBox}></lightning-button> -->
+                    <button style="margin-left:5px"
+                        class="slds-button slds-button_neutral slds-button_stretch lexBorder" label="搴撳瓨鐩樼偣"
+                        onclick={inventoryCount}>搴撳瓨鐩樼偣</button>
+                    <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="杩囨湡搴撳瓨閿�瀛�"
+                        style="margin-left:60px;" onclick={handleExpired}>杩囨湡搴撳瓨閿�瀛�</button>
+                    <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鎷嗙洅"
+                        style="margin-left:60px;" onclick={removeBox}>鎷嗙洅</button>
+                    <button class="slds-button slds-button_neutral slds-button_stretch lexButtoun" label="鍙栨秷鎷嗙洅"
+                        style="margin-left:60px;" onclick={cancelremoveBox}>鍙栨秷鎷嗙洅</button>
+                </div>
+            </div>
 
-          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:30px;">
-              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;height:115px">
-                  <table style="margin-top:10px;">
-                      <colgroup>
-                          <col width="160px" />
-                          <col width="100px" />
-                          <col width="10px" />
-                          <col width="70px" />
-                          <col width="100px" />
-                          <col width="10px" />
-                          <col width="70px" />
-                          <col width="100px" />
-                          <col width="10px" />
-                          <col width="90px" />
-                          <col width="100px" />
-                          <col width="85px" />
-                          <col width="100px" />
-                          <col width="10px" />
-                          <col width="70px" />
-                          <col width="100px" />
-                      </colgroup>
-                      <tbody>
-                          <tr> 
-                              <td style="width:10px;"></td>
-                              <td style="width:250px">
-                                  <div style="width:90px;margin-left:12px;" class="searchName">娑堣�楀搧鍚嶇О</div>
-                              </td>
-                              <td style="width: 21%;">
-                                  <lightning-input class="searchName" type="text" name="Name" label="娑堣�楀搧鍚嶇О" value={Name}
-                                  variant="label-hidden" onchange={dataChange}
-                                      data-field="Name"></lightning-input>
-                              </td>
-                              <td style="width:150px">
-                                  <div style="width:90px;text-align:center;" class="searchName">绗�3鍒嗙被</div>
-                              </td>
-                              <td style="width: 21%;">
-                                  <lightning-combobox class="inputFont" style="margin-left:5px;" name="CategoryThree" label="绗�3鍒嗙被" value={value}
-                                      placeholder="璇烽�夋嫨..." options={category3Options}   variant="label-hidden"
-                                      data-field="CategoryThree" onchange={dataChange}></lightning-combobox>
-                              </td>
-                              <td style="width:150px">
-                                  <div style="width:90px;text-align:center;" class="searchName">绗�4鍒嗙被</div>
-                              </td>
-                              <td style="width: 21%;">
-                                  <lightning-combobox class="inputFont"  name="CategoryFour" label="绗�4鍒嗙被" value={value}
-                                      placeholder="璇烽�夋嫨..." options={category4Options}  variant="label-hidden"
-                                      data-field="CategoryFour" onchange={dataChange}></lightning-combobox>
-                              </td>
-                              <td style="width:150px">
-                                  <div style="width:90px;text-align:center;" class="searchName">绗�5鍒嗙被</div>
-                              </td>
-                              <td style="width: 21%;">
-                                  <lightning-combobox class="inputFont" name="CategoryFive" label="绗�5鍒嗙被" value={value}
-                                      placeholder="璇烽�夋嫨..." options={category5Options}  variant="label-hidden"
-                                      data-field="CategoryFive" onchange={dataChange}></lightning-combobox>
-                              </td>
-                              <td style="width: 1%;"></td>
-                          </tr>
-                      </tbody>
-                  </table>
-                  <br/>
-                  <div style="float:right;margin-right:10px;">   <button class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" label="娑堣�楀搧鎼滅储" onclick={searchOrderDetail}>娑堣�楀搧鎼滅储</button>
-                      <button style="margin-left:10px;" class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="娓呯┖" onclick={clearAll}>娓呯┖</button></div>
-                 
-              </div>
-          </div>
-          <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
-              <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
-                  <!-- <p style="font-size: 16px;"><strong>搴撳瓨璇︽儏</strong></p> -->
-                  <lightning-layout>
-                      <lightning-layout-item padding="around-small">
-                          <p style="font-size: 18px">
-                              <strong>搴撳瓨璇︽儏</strong>
-                          </p>
-                      </lightning-layout-item>
-                  </lightning-layout>
-              </div>
-              <div style="padding:10px;">
-                  <template if:true={showTable}>
-                      <c-lex-custom-lightning-datatable key-field="id" data={data} columns={columns}
-                          default-sort-direction={defaultSortDirection} sorted-direction={sortDirection}
-                          sorted-by={sortedBy} onsort={onHandleSort} hide-checkbox-column={hidecheckboxcolumn}
-                          class="wrapped-header-datatable">
-                      </c-lex-custom-lightning-datatable>
-                  </template>
-                  <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
-                      onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
-                      previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
-                      record-start={recordStart} record-end={recordEnd} total-records={totalRecords}></c-paginator>
-              </div>
-          </div>
-      </div>
+            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;margin-top:30px;">
+                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;height:115px">
+                    <table style="margin-top:10px;">
+                        <colgroup>
+                            <col width="160px" />
+                            <col width="100px" />
+                            <col width="10px" />
+                            <col width="70px" />
+                            <col width="100px" />
+                            <col width="10px" />
+                            <col width="70px" />
+                            <col width="100px" />
+                            <col width="10px" />
+                            <col width="90px" />
+                            <col width="100px" />
+                            <col width="85px" />
+                            <col width="100px" />
+                            <col width="10px" />
+                            <col width="70px" />
+                            <col width="100px" />
+                        </colgroup>
+                        <tbody>
+                            <tr>
+                                <td style="width:10px;"></td>
+                                <td style="width:250px">
+                                    <div style="width:90px;margin-left:12px;" class="searchName">娑堣�楀搧鍚嶇О</div>
+                                </td>
+                                <td style="width: 21%;">
+                                    <lightning-input class="searchName" type="text" name="Name" label="娑堣�楀搧鍚嶇О"
+                                        value={Name} variant="label-hidden" onchange={dataChange}
+                                        data-field="Name"></lightning-input>
+                                </td>
+                                <td style="width:150px">
+                                    <div style="width:90px;text-align:center;" class="searchName">绗�3鍒嗙被</div>
+                                </td>
+                                <td style="width: 21%;">
+                                    <lightning-combobox class="inputFont" style="margin-left:5px;" name="CategoryThree"
+                                        label="绗�3鍒嗙被" value={value} placeholder="璇烽�夋嫨..." options={category3Options}
+                                        variant="label-hidden" data-field="CategoryThree"
+                                        onchange={dataChange}></lightning-combobox>
+                                </td>
+                                <td style="width:150px">
+                                    <div style="width:90px;text-align:center;" class="searchName">绗�4鍒嗙被</div>
+                                </td>
+                                <td style="width: 21%;">
+                                    <lightning-combobox class="inputFont" name="CategoryFour" label="绗�4鍒嗙被" value={value}
+                                        placeholder="璇烽�夋嫨..." options={category4Options} variant="label-hidden"
+                                        data-field="CategoryFour" onchange={dataChange}></lightning-combobox>
+                                </td>
+                                <td style="width:150px">
+                                    <div style="width:90px;text-align:center;" class="searchName">绗�5鍒嗙被</div>
+                                </td>
+                                <td style="width: 21%;">
+                                    <lightning-combobox class="inputFont" name="CategoryFive" label="绗�5鍒嗙被" value={value}
+                                        placeholder="璇烽�夋嫨..." options={category5Options} variant="label-hidden"
+                                        data-field="CategoryFive" onchange={dataChange}></lightning-combobox>
+                                </td>
+                                <td style="width: 1%;"></td>
+                            </tr>
+                        </tbody>
+                    </table>
+                    <br />
+                    <div style="float:right;margin-right:10px;"> <button
+                            class="slds-button slds-button_neutral slds-button_stretch lexsearchStyle" label="娑堣�楀搧鎼滅储"
+                            onclick={searchOrderDetail}>娑堣�楀搧鎼滅储</button>
+                        <button style="margin-left:10px;"
+                            class="slds-button slds-button_neutral slds-button_stretch lexclearStyle" label="娓呯┖"
+                            onclick={clearAll}>娓呯┖</button>
+                    </div>
+
+                </div>
+            </div>
+            <div style="border: 1px solid #D4D4D4;border-radius:5px;margin-bottom:7px;">
+                <div style="border-top: 3px solid #51606E;border-bottom: 1px solid #D4D4D4;padding:3px;">
+                    <!-- <p style="font-size: 16px;"><strong>搴撳瓨璇︽儏</strong></p> -->
+                    <lightning-layout>
+                        <lightning-layout-item padding="around-small">
+                            <p style="font-size: 18px">
+                                <strong>搴撳瓨璇︽儏</strong>
+                            </p>
+                        </lightning-layout-item>
+                    </lightning-layout>
+                </div>
+                <div style="padding:10px;">
+                    <template if:true={showTable}>
+                        <c-lex-custom-lightning-datatable key-field="id" data={data} columns={columns}
+                            default-sort-direction={defaultSortDirection} sorted-direction={sortDirection}
+                            sorted-by={sortedBy} onsort={onHandleSort} hide-checkbox-column={hidecheckboxcolumn}
+                            class="wrapped-header-datatable">
+                        </c-lex-custom-lightning-datatable>
+                    </template>
+                    <c-paginator onprevious={handlePrevious} onnext={handleNext} onpageschange={handlePageschange}
+                        onfirst={handleFirst} onlast={handleLast} page-size-options={pageSizeOptions}
+                        previous-button-disabled={previousButtonDisabled} next-button-disabled={nextButtonDisabled}
+                        record-start={recordStart} record-end={recordEnd} total-records={totalRecords}></c-paginator>
+                </div>
+            </div>
+        </div>
 
 
-  </div>
+    </div>
 </template>
\ No newline at end of file

--
Gitblit v1.9.1