ts-glitter 20.6.8 → 20.6.9

package/lowcode/cms-plugin/module/order-setting.ts

@@ -6,6 +6,8 @@ import { ShareDialog } from '../../glitterBundle/dialog/ShareDialog.js';
 import { Tool } from '../../modules/tool.js';
 import { CartData, LineItem, OrderData, OrderDetail } from './data.js';
 import { EditorElem } from '../../glitterBundle/plugins/editor-elem.js';
+import { ShipmentConfig } from '../../glitter-base/global/shipment-config.js';
+import { PaymentConfig } from '../../glitter-base/global/payment-config.js';
 
 const html = String.raw;
 
@@ -34,18 +36,16 @@ type DashboardData = {
 
 export class OrderSetting {
   // 付款名稱
-  static getPaymentMethodText(orderData: OrderData) {
+  static getPaymentMethodText(orderData: OrderData, paymentMethod: any) {
     const paymentMethods: Record<string, string> = {
       POS: '門市POS付款',
       off_line: '線下付款',
-      newWebPay: '藍新金流',
-      ecPay: '綠界金流',
-      line_pay: 'Line Pay',
-      atm: '銀行轉帳',
-      line: 'Line 轉帳',
-      cash_on_delivery: '貨到付款',
     };
 
+    paymentMethod.map((item: any) => {
+      paymentMethods[item.key] = item.name;
+    });
+
     return orderData.orderSource === 'POS'
       ? paymentMethods['POS']
       : paymentMethods[orderData.customer_info.payment_select] || '線下付款';
@@ -53,39 +53,26 @@ export class OrderSetting {
 
   // 配送名稱
   static getShippingMethodText(orderData: OrderData) {
-    switch (orderData.user_info.shipment) {
-      case 'UNIMARTC2C':
-        return '7-11店到店';
-      case 'FAMIC2C':
-        return '全家店到店';
-      case 'OKMARTC2C':
-        return 'OK店到店';
-      case 'HILIFEC2C':
-        return '萊爾富店到店';
-      case 'normal':
-        return '中華郵政';
-      case 'black_cat':
-        return '黑貓到府';
-      case 'shop':
-        return '實體門市取貨';
-      case 'global_express':
-        return '國際快遞';
-      case 'now':
-        return '立即取貨';
-      default:
-        return '宅配';
+    if (!orderData.user_info.shipment) {
+      return '立即取貨';
     }
+
+    const shippingData = ShipmentConfig.list.find(item => item.value === orderData.user_info.shipment);
+    return shippingData ? shippingData.title : '立即取貨';
   }
 
   // 配送地址
   static getShippingAddress(orderData: OrderData) {
     const shipment = orderData.user_info.shipment;
-    if (['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C'].includes(shipment)) {
+    if (['UNIMARTC2C', 'UNIMARTFREEZE', 'FAMIC2C', 'FAMIC2CFREEZE', 'OKMARTC2C', 'HILIFEC2C'].includes(shipment)) {
       return `${orderData.user_info.CVSStoreName} (${orderData.user_info.CVSAddress})`;
     }
     if (shipment === 'shop') {
       return '實體門市';
     }
+    if (shipment === 'now') {
+      return '立即取貨';
+    }
     return orderData.user_info.address;
   }
 
@@ -108,6 +95,7 @@ export class OrderSetting {
   static getShippmentOpt() {
     return [
       { title: '未出貨', value: 'wait' },
+      { title: '待預購', value: 'pre_order' },
       { title: '備貨中', value: 'in_stock' },
       { title: '已出貨', value: 'shipping' },
       { title: '已到貨', value: 'arrived' },
@@ -777,6 +765,7 @@ export class OrderSetting {
                 selectOrderID: data.targetID,
                 dotClass: BgWidget.getWhiteDotClass(gvc),
               };
+
               return BgWidget.dialog({
                 gvc: ogvc,
                 title: '確認資訊',
@@ -790,6 +779,13 @@ export class OrderSetting {
                     { width: 10, align: 'center' },
                     { width: 30, align: 'center' },
                   ];
+
+                  const ovm = {
+                    list_id: gvc.glitter.getUUID(),
+                    list_loading: true,
+                    payment_method: [] as any,
+                  };
+
                   return html`
                     <div class="${gClass('check-info-box')}">
                       ${BgWidget.grayNote(
@@ -814,59 +810,78 @@ export class OrderSetting {
                             })
                             .join('')}
                         </div>
-                        <div class="d-flex flex-column gap-0 mt-3">
-                          ${orders
-                            .map(order => {
-                              const orderData = order.orderData;
-                              const vt = this.getAllStatusBadge(order);
-                              const row = [
-                                {
-                                  title: html`
-                                    <div class="d-flex gap-2">
-                                      ${gvc.bindView({
-                                        bind: `r-${order.cart_token}`,
-                                        view: () => {
-                                          return html`<input
-                                            class="form-check-input ${dialogVM.dotClass} cursor_pointer"
-                                            style="margin-top: 0.25rem;"
-                                            type="radio"
-                                            id="r-${order.cart_token}"
-                                            name="check-info-radios"
-                                            onchange="${gvc.event(() => {
-                                              dialogVM.selectOrderID = order.cart_token;
-                                              gvc.notifyDataChange(orders.map(d => `r-${d.cart_token}`));
-                                            })}"
-                                            ${dialogVM.selectOrderID === order.cart_token ? 'checked' : ''}
-                                          />`;
-                                        },
-                                      })}
-                                      <span style="color: #4d86db;">${order.cart_token}</span>
-                                      <div class="d-flex justify-content-end gap-2">
-                                        ${vt.archivedBadge()}
-                                        ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
-                                      </div>
-                                    </div>
-                                  `,
-                                },
-                                { title: order.created_time.split('T')[0] },
-                                { title: this.getPaymentMethodText(orderData) },
-                                { title: this.getShippingMethodText(orderData) },
-                                { title: this.getShippingAddress(orderData) },
-                              ]
-                                .map((item, i) => {
-                                  return html` <div
-                                    class="tx_normal"
-                                    style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
-                                  >
-                                    <span style="white-space: break-spaces;">${(item.title ?? '').trim()}</span>
-                                  </div>`;
+                        ${gvc.bindView({
+                          bind: ovm.list_id,
+                          view: () => {
+                            if (ovm.list_loading) {
+                              return '';
+                            } else {
+                              return orders
+                                .map(order => {
+                                  const orderData = order.orderData;
+                                  const vt = this.getAllStatusBadge(order);
+                                  const row = [
+                                    {
+                                      title: html`
+                                        <div class="d-flex gap-2">
+                                          ${gvc.bindView({
+                                            bind: `r-${order.cart_token}`,
+                                            view: () => {
+                                              return html`<input
+                                                class="form-check-input ${dialogVM.dotClass} cursor_pointer"
+                                                style="margin-top: 0.25rem;"
+                                                type="radio"
+                                                id="r-${order.cart_token}"
+                                                name="check-info-radios"
+                                                onchange="${gvc.event(() => {
+                                                  dialogVM.selectOrderID = order.cart_token;
+                                                  gvc.notifyDataChange(orders.map(d => `r-${d.cart_token}`));
+                                                })}"
+                                                ${dialogVM.selectOrderID === order.cart_token ? 'checked' : ''}
+                                              />`;
+                                            },
+                                          })}
+                                          <span style="color: #4d86db;">${order.cart_token}</span>
+                                          <div class="d-flex justify-content-end gap-2">
+                                            ${vt.archivedBadge()}
+                                            ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
+                                          </div>
+                                        </div>
+                                      `,
+                                    },
+                                    { title: order.created_time.split('T')[0] },
+                                    { title: this.getPaymentMethodText(orderData, ovm.payment_method) },
+                                    { title: this.getShippingMethodText(orderData) },
+                                    { title: this.getShippingAddress(orderData) },
+                                  ]
+                                    .map((item, i) => {
+                                      return html` <div
+                                        class="tx_normal"
+                                        style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
+                                      >
+                                        <span style="white-space: break-spaces;">${(item.title ?? '').trim()}</span>
+                                      </div>`;
+                                    })
+                                    .join('');
+
+                                  return html` <div class="${gClass('order-row')}">${row}</div>`;
                                 })
                                 .join('');
-
-                              return html` <div class="${gClass('order-row')}">${row}</div>`;
-                            })
-                            .join('')}
-                        </div>
+                            }
+                          },
+                          divCreate: {
+                            class: 'd-flex flex-column gap-0 mt-3',
+                          },
+                          onCreate: () => {
+                            if (ovm.list_loading) {
+                              PaymentConfig.getSupportPayment(true).then(response => {
+                                ovm.payment_method = response;
+                                ovm.list_loading = false;
+                                gvc.notifyDataChange(ovm.list_id);
+                              });
+                            }
+                          },
+                        })}
                       </div>
                     </div>
                   `;
@@ -965,6 +980,12 @@ export class OrderSetting {
             { width: 5, align: 'center' },
           ];
 
+          const ovm = {
+            list_id: gvc.glitter.getUUID(),
+            list_loading: true,
+            payment_method: [] as any,
+          };
+
           return html` <div class="${gClass('box')} mt-2" style="${isDesktop ? '' : 'width: 1200px'}">
             <div class="d-flex">
               ${[
@@ -984,60 +1005,79 @@ export class OrderSetting {
                 })
                 .join('')}
             </div>
-            <div class="d-flex flex-column gap-0 mt-3">
-              ${orders
-                .map((order, index) => {
-                  const orderData = order.orderData;
-                  const vt = this.getAllStatusBadge(order);
-                  const row = [
-                    {
-                      title: html`
-                        <div class="d-flex gap-3">
-                          <span style="color: #4d86db;">${order.cart_token}</span>
-                          <div class="d-flex justify-content-end gap-2">
-                            ${vt.archivedBadge()} ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
-                          </div>
-                        </div>
-                      `,
-                    },
-                    { title: order.created_time.split('T')[0] },
-                    { title: this.getPaymentMethodText(orderData) },
-                    { title: this.getShippingMethodText(orderData) },
-                    { title: this.getShippingAddress(orderData) },
-                    { title: `$ ${orderData.total.toLocaleString()}` },
-                    { title: `${orderData.lineItems.length}件商品` },
-                    {
-                      title:
-                        orders.length > 1
-                          ? html`<i
-                              class="fa-solid fa-xmark"
-                              style="color: #B0B0B0; cursor: pointer"
-                              onclick="${gvc.event(() => {
-                                if (order.cart_token === data.targetID) {
-                                  data.targetID = '';
-                                }
-                                data.orders.splice(index, 1);
-                                vm.dataObject = setDataStatus(dataMap);
-                                gvc.notifyDataChange([editID, ids.header, ids.dashboard]);
-                              })}"
-                            ></i>`
-                          : '',
-                    },
-                  ]
-                    .map((item, i) => {
-                      return html` <div
-                        class="tx_normal"
-                        style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
-                      >
-                        <span style="white-space: break-spaces;">${(item.title ?? '').trim()}</span>
-                      </div>`;
+            ${gvc.bindView({
+              bind: ovm.list_id,
+              view: () => {
+                if (ovm.list_loading) {
+                  return '';
+                } else {
+                  return orders
+                    .map((order, index) => {
+                      const orderData = order.orderData;
+                      const vt = this.getAllStatusBadge(order);
+                      const row = [
+                        {
+                          title: html`
+                            <div class="d-flex gap-3">
+                              <span style="color: #4d86db;">${order.cart_token}</span>
+                              <div class="d-flex justify-content-end gap-2">
+                                ${vt.archivedBadge()} ${vt.paymentBadge()}${vt.outShipBadge()}${vt.orderStatusBadge()}
+                              </div>
+                            </div>
+                          `,
+                        },
+                        { title: order.created_time.split('T')[0] },
+                        { title: this.getPaymentMethodText(orderData, ovm.payment_method) },
+                        { title: this.getShippingMethodText(orderData) },
+                        { title: this.getShippingAddress(orderData) },
+                        { title: `$ ${orderData.total.toLocaleString()}` },
+                        { title: `${orderData.lineItems.length}件商品` },
+                        {
+                          title:
+                            orders.length > 1
+                              ? html`<i
+                                  class="fa-solid fa-xmark"
+                                  style="color: #B0B0B0; cursor: pointer"
+                                  onclick="${gvc.event(() => {
+                                    if (order.cart_token === data.targetID) {
+                                      data.targetID = '';
+                                    }
+                                    data.orders.splice(index, 1);
+                                    vm.dataObject = setDataStatus(dataMap);
+                                    gvc.notifyDataChange([editID, ids.header, ids.dashboard]);
+                                  })}"
+                                ></i>`
+                              : '',
+                        },
+                      ]
+                        .map((item, i) => {
+                          return html` <div
+                            class="tx_normal"
+                            style="width: ${styles[i].width}%; text-align: ${styles[i].align};"
+                          >
+                            <span style="white-space: break-spaces;">${(item.title ?? '').trim()}</span>
+                          </div>`;
+                        })
+                        .join('');
+
+                      return html` <div class="${gClass('order-row')}">${row}</div>`;
                     })
                     .join('');
-
-                  return html` <div class="${gClass('order-row')}">${row}</div>`;
-                })
-                .join('')}
-            </div>
+                }
+              },
+              divCreate: {
+                class: 'd-flex flex-column gap-0 mt-3',
+              },
+              onCreate: () => {
+                if (ovm.list_loading) {
+                  PaymentConfig.getSupportPayment(true).then(response => {
+                    ovm.payment_method = response;
+                    ovm.list_loading = false;
+                    gvc.notifyDataChange(ovm.list_id);
+                  });
+                }
+              },
+            })}
           </div>`;
         };
 
@@ -1131,7 +1171,14 @@ export class OrderSetting {
 
         const isPayStatusSame = status === baseStatus;
         const isShipmentSame = user_info.shipment === baseShipment;
-        const isAddressSame = ['UNIMARTC2C', 'FAMIC2C', 'OKMARTC2C', 'HILIFEC2C'].includes(baseShipment)
+        const isAddressSame = [
+          'UNIMARTC2C',
+          'UNIMARTFREEZE',
+          'FAMIC2C',
+          'FAMIC2CFREEZE',
+          'OKMARTC2C',
+          'HILIFEC2C',
+        ].includes(baseShipment)
           ? user_info.CVSStoreName === baseCVSStoreName
           : user_info.address === baseAddress;
 
@@ -1323,7 +1370,7 @@ export class OrderSetting {
             },
             {
               key: '出貨單號碼',
-              value: html`<div style="width: 200px;">
+              value: html` <div style="width: 200px;">
                 ${BgWidget.grayNote(
                   dd.orderData.user_info.shipment_number
                     ? `#${dd.orderData.user_info.shipment_number}`
@@ -1431,7 +1478,7 @@ export class OrderSetting {
                           : '',
                       ].filter(Boolean);
 
-                      return html`<div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
+                      return html` <div class="d-flex align-items-center gap-2">${htmlArray.join('')}</div>`;
                     },
                     divCreate: {
                       style: 'min-width: 580px;',
@@ -1515,6 +1562,9 @@ export class OrderSetting {
                   callback: (value: any) => {
                     checkArray.forEach((order: any) => {
                       order.orderData.progress = value;
+                      if (['wait', 'returns', undefined].includes(value)) {
+                        order.orderData.user_info.shipment_number = '';
+                      }
                     });
                   },
                 });
@@ -1630,11 +1680,13 @@ export class OrderSetting {
   }
 
   // 拆分訂單
-  static splitOrder(topGVC: GVC, orderData: any, callback: () => void) {
+  static splitOrder(topGVC: GVC, origOrderData: any, callback: () => void) {
     //把原本的預設資訊扔進拆分表單內，並且把商品的數量設定為0
+    const orderData = structuredClone(origOrderData);
+
     function assignOrder(orderCreateUnit: OrderDetail) {
       orderCreateUnit.cart_token = orderData.orderID;
-      orderCreateUnit.customer_info = orderData.user_info;
+      orderCreateUnit.customer_info = orderData.customer_info;
       orderCreateUnit.user_info = orderData.user_info;
       orderCreateUnit.voucher = orderData.voucherList;
       orderCreateUnit.lineItems = structuredClone(orderData.lineItems);
@@ -1642,7 +1694,9 @@ export class OrderSetting {
         lineItem.count = 0;
       });
     }
+
     orderData.orderSource = 'split';
+    let storeList: any = [];
     const dataArray: LineItem[] = orderData.lineItems;
     const parentPageConfig = (window.parent as any)?.glitter?.pageConfig;
     const latestPageConfig = parentPageConfig?.[parentPageConfig.length - 1];
@@ -1654,11 +1708,9 @@ export class OrderSetting {
     const splitOrderArray: OrderDetail[] = [structuredClone(orderCreateUnit)];
     const passData = structuredClone(orderCreateUnit); //修改後的
     const isDesktop = document.body.clientWidth > 768;
-
     const vm = {
-      dataObject: {} as DataMap, // 調用合併訂單資料
-      originDataObject: {} as DataMap, // 原始合併訂單資料
       prefix: 'split-orders',
+      loading: true,
       splitCount: 1,
     };
 
@@ -1667,6 +1719,7 @@ export class OrderSetting {
       page: glitter.getUUID(),
       header: glitter.getUUID(),
       dashboard: glitter.getUUID(),
+      origQTY: glitter.getUUID(),
       itemList: glitter.getUUID(),
       block: glitter.getUUID(),
       summary: glitter.getUUID(),
@@ -1730,31 +1783,7 @@ export class OrderSetting {
           bottom: 0;
           z-index: 10;
         }
-        .${vm.prefix}-dashboard-gray {
-          color: #8d8d8d;
-          font-size: 16px;
-          font-weight: 400;
-        }
-        .${vm.prefix}-update {
-          width: 80px;
-          color: #4d86db;
-          font-weight: 400;
-          gap: 8px;
-          cursor: pointer;
-        }
-        .${vm.prefix}-list {
-          list-style: disc;
-          white-space: break-spaces;
-        }
-        .${vm.prefix}-box {
-          border-radius: 10px;
-          padding: 6px 10px;
-        }
-        .${vm.prefix}-check-info-box {
-          position: absolute;
-          width: 1000px;
-          overflow: auto;
-        }
+     
         .${vm.prefix}-order-row {
           display: flex;
           align-items: center;
@@ -1792,7 +1821,7 @@ export class OrderSetting {
           height:26px;
           color:#4D86DB;
           gap: 6px;
-          padding-left:18px;
+          padding:0 18px;
           display: flex;
           align-items: start;
           cursor:pointer;
@@ -1804,13 +1833,15 @@ export class OrderSetting {
         }
         .${vm.prefix}-itemList-section{
           min-width: 100%;
+          border-bottom: 1px solid #DDD;
           padding-top:24px;
           gap:5px;
-          display: flex;
+          display: inline-flex;
         }
         .${vm.prefix}-summary-section{
-          border-top: 1px solid #DDD;
+          min-width: 100%;
           border-bottom: 1px solid #DDD;
+          width:fit-content;
         }
         .${vm.prefix}-summary-title{
           width:606px;
@@ -1857,19 +1888,21 @@ export class OrderSetting {
         
         .${vm.prefix}-dialog-ul{
           padding:6px ;
-          list-style:disc;
           
         }
         .${vm.prefix}-dialog-ul li{
+          margin-bottom: 3px;
           list-style:disc;
           text-align:left;
-          list-style-position: inside;
+          white-space:break-spaces;
         }
       `);
     };
 
     const closeDialog = () => glitter.closeDiaLog();
 
+
+
     const renderHeader = (gvc: GVC) =>
       gvc.bindView({
         bind: ids.header,
@@ -1906,22 +1939,88 @@ export class OrderSetting {
       dialog.checkYesOrNotWithCustomWidth({
         callback: bool => {
           if (bool) {
+            // 定義 log 物件的型別介面
+            interface StoreLog {
+              [key: string]: number;
+            }
+
+            // 定義函式回傳值的型別介面
+            interface DeductionResult {
+              updatedLog: StoreLog; // 更新後的 log
+              deductions: Record<string, number>; // 扣除紀錄，鍵是店鋪名稱，值是扣除的數量
+            }
+
+            /**
+             * 從商店 log 中扣除指定數量，優先從值較高的商店開始扣除。
+             * @param log - 初始的 log 物件，將商店鍵 (string) 映射到值 (number)。
+             * @param amountToDeduct - 要扣除的總數量。
+             * @returns 一個包含更新後 log 和扣除紀錄的物件。
+             */
+            function deductFromStoresTS(log: StoreLog, amountToDeduct: number): DeductionResult {
+              // 1. 創建一個 log 的可變副本，並確保輸入數量有效
+              const updatedLog: StoreLog = { ...log }; // 確保型別一致
+              const deductions: Record<string, number> = {}; // 扣除紀錄的型別
+              let remainingAmount: number = Math.max(0, amountToDeduct); // 確保數量不為負
+
+              // 2. 將 log 轉換為 [string, number] 陣列，並按值降序排序
+              // Object.entries 會根據 StoreLog 型別推斷出 [string, number][]
+              const sortedEntries: [string, number][] = Object.entries(updatedLog).sort(
+                ([, valueA], [, valueB]) => valueB - valueA
+              );
+
+              // 3. 遍歷排序後的條目並執行扣除
+              for (const [storeKey, storeValue] of sortedEntries) {
+                // 如果剩餘待扣除數量已歸零，則停止迴圈
+                if (remainingAmount <= 0) {
+                  break;
+                }
+
+                // 如果當前商店的值小於或等於零，則跳過
+                if (storeValue <= 0) {
+                  continue;
+                }
+
+                // 確定從這個特定商店扣除的數量
+                const amountDeductedFromThisStore: number = Math.min(remainingAmount, storeValue);
+
+                // 只有當實際扣除數量大於 0 時才執行更新和記錄
+                if (amountDeductedFromThisStore > 0) {
+                  // 更新副本 log 物件中的值
+                  updatedLog[storeKey] -= amountDeductedFromThisStore;
+
+                  // 記錄扣除資訊
+                  deductions[storeKey] = amountDeductedFromThisStore;
+
+                  // 減少剩餘待扣除的數量
+                  remainingAmount -= amountDeductedFromThisStore;
+                }
+              }
+
+              // 4. 返回更新後的 log (副本) 和扣除紀錄
+              return {
+                updatedLog: updatedLog,
+                deductions: deductions,
+              };
+            }
+
+            //處理每件商品在原訂單上的庫存
             orderData.lineItems.forEach((lineItem: any, index: number) => {
               let count = 0;
-              count = splitOrderArray.reduce((total, order) => {
-                return (total += Number(order.lineItems[index].count));
-              }, 0);
-              lineItem.count -= count;
+              splitOrderArray.forEach(order => {
+                lineItem.count -= order.lineItems[index].count;
+                const resultTS: DeductionResult = deductFromStoresTS(
+                  lineItem.deduction_log,
+                  order.lineItems[index].count
+                );
+                order.lineItems[index].deduction_log = resultTS.deductions as any;
+                lineItem.deduction_log = resultTS.updatedLog;
+              });
             });
             const passData = {
               orderData: orderData,
               splitOrderArray: splitOrderArray,
             };
 
-            ApiShop.combineOrder(vm.dataObject).then(r => {
-              if (r.result && r.response) {
-              }
-            });
             dialog.dataLoading({ visible: true });
             ApiShop.splitOrder(passData).then(r => {
               if (r.result && r.response) {
@@ -1943,14 +2042,26 @@ export class OrderSetting {
       gvc.bindView({
         bind: ids.footer,
         view: () => {
-          const allOrdersHaveZeroItems = splitOrderArray.every(order =>
-            order.lineItems.every(item => item.count === 0)
-          );
+          let allOrdersHaveZeroItems = false;
+          let origQtyZero = true;
+          let iSplitQtyCount = 0;
+          splitOrderArray.forEach(splitOrder => {
+            if (splitOrder.lineItems.every(item => item.count === 0)) {
+              allOrdersHaveZeroItems = true;
+            }
+            iSplitQtyCount += splitOrder.lineItems.reduce((count, lineItem) => {
+              return (count += lineItem.count);
+            }, 0);
+          });
+          const iQtyCount = dataArray.reduce((iCount, lineItem) => {
+            return (iCount += lineItem.count);
+          }, 0);
+          origQtyZero = iSplitQtyCount === iQtyCount;
           let checkBTN = ``;
-          if (!allOrdersHaveZeroItems) {
-            checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單');
-          } else {
+          if (allOrdersHaveZeroItems || origQtyZero) {
             checkBTN = BgWidget.disableSave('拆分訂單');
+          } else {
+            checkBTN = BgWidget.save(gvc.event(handleSave), '拆分訂單');
           }
 
           return html` ${BgWidget.cancel(gvc.event(closeDialog))} ${checkBTN} `;
@@ -1971,56 +2082,55 @@ export class OrderSetting {
         normal: '#393939',
       };
 
-      // 合併須知
+      // 拆單須知
       const hits = [
         '原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣',
         '拆單後，運費及附加費用不變，將保留於原訂單內，若需要，請手動編輯訂單新增費用',
+        '請務必進入每一張新的子訂單，為其中的所有商品選擇正確的出貨庫存',
       ];
       return html`
         <div class="row">
-          <div class="col-12 ">
-            ${BgWidget.mainCard(html`
-              <div style="${phoneCardStyle}">
-                <span class="tx_700">拆單需知</span>
-                <div class="w-100 d-flex">
-                  <ul class="mt-2 ms-4">
-                    ${hits
-                      .map(hit => {
-                        return html` <li class="${gClass('list')}">${hit}</li>`;
-                      })
-                      .join('')}
-                  </ul>
-                  <div
-                    class="${gClass('split-rule')} ms-auto d-flex align-items-end"
-                    onclick="${gvc.event(() => {
-                      BgWidget.settingDialog({
-                        gvc: gvc,
-                        title: '拆單需知',
-                        width: 766,
-                        innerHTML: gvc => {
-                          return html` <ul class="${gClass('dialog-ul')}">
-                            <li>
-                              原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣
-                            </li>
-                            <li>拆單後運費及附加費用不變，將保留於原訂單內，如需更改，請手動編輯訂單新增費用</li>
-                            <li>子訂單會預設繼承母訂單的配送與付款方式，如需更改，請手動編輯訂單內容</li>
-                            <li>子訂單若要重新開立發票，請至發票頁面手動建立</li>
-                            <li>若發票已開立，系統不會自動作廢，需至訂單頁面手動作廢並重新開立</li>
-                            <li>代收金額將更新，已建立的出貨單需取消並重新建立</li>
-                          </ul>`;
-                        },
-                        footer_html: (gvc: GVC) => {
-                          return '';
-                        },
-                      });
-                    })}"
-                  >
-                    詳細拆單規則
-                  </div>
+          ${BgWidget.mainCard(html`
+            <div style="${phoneCardStyle}">
+              <span class="tx_700">拆單需知</span>
+              <div class="w-100 d-flex flex-column">
+                <ul class="mt-2 ms-4 ${gClass('dialog-ul')}">
+                  ${hits
+                    .map(hit => {
+                      return html` <li class="">${hit}</li>`;
+                    })
+                    .join('')}
+                </ul>
+                <div
+                  class="${gClass('split-rule')} ms-auto d-flex align-items-end justify-content-end"
+                  onclick="${gvc.event(() => {
+                    BgWidget.settingDialog({
+                      gvc: gvc,
+                      title: '拆單需知',
+                      width: 766,
+                      innerHTML: gvc => {
+                        return html` <ul class="${gClass('dialog-ul')}">
+                          <li>
+                            原訂單將保留剩餘商品，訂單金額與折扣將調整；子訂單將包含選定商品，並按比例分配優惠折扣
+                          </li>
+                          <li>拆單後運費及附加費用不變，將保留於原訂單內，如需更改，請手動編輯訂單新增費用</li>
+                          <li>子訂單會預設繼承母訂單的配送與付款方式，如需更改，請手動編輯訂單內容</li>
+                          <li>子訂單若要重新開立發票，請至發票頁面手動建立</li>
+                          <li>若發票已開立，系統不會自動作廢，需至訂單頁面手動作廢並重新開立</li>
+                          <li>代收金額將更新，已建立的出貨單需取消並重新建立</li>
+                        </ul>`;
+                      },
+                      footer_html: (gvc: GVC) => {
+                        return '';
+                      },
+                    });
+                  })}"
+                >
+                  詳細拆單規則
                 </div>
               </div>
-            `)}
-          </div>
+            </div>
+          `)}
         </div>
       `;
     };
@@ -2030,6 +2140,7 @@ export class OrderSetting {
         splitOrderArray.push(structuredClone(orderCreateUnit));
         gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
       }
+
       function drawSplitOrder() {
         const titleDom = {
           title: '子訂單數量',
@@ -2044,11 +2155,22 @@ export class OrderSetting {
             return html`
               <div class="d-flex flex-column">
                 <div class="${commonClass}" style="width: ${titleDom.width};${titleDom?.style ?? ''}">
-                  <div class="tx_700">${titleDom.title}${index + 1}</div>
+                  <div class="tx_700">
+                    ${titleDom.title}${index + 1}
+                    <i
+                      class="fa-solid fa-xmark cursor_pointer"
+                      onclick="${gvc.event(() => {
+                        if (splitOrderArray.length > 1) {
+                          splitOrderArray.splice(index, 1);
+                          gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
+                        }
+                      })}"
+                    ></i>
+                  </div>
                   <div class="flex-fill"></div>
                 </div>
                 <div
-                  class="d-flex flex-column"
+                  class="d-flex flex-column flex-shrink-0"
                   style="width: ${titleDom.width};gap:16px;padding-top: 24px;${titleDom?.style ?? ''}"
                 >
                   ${splitOrderArray[index].lineItems
@@ -2059,30 +2181,38 @@ export class OrderSetting {
                           style="${commonHeight};"
                           type="number"
                           value="${item.count}"
-                          min="0"
                           onchange="${gvc.event(e => {
+                            if (Number(e.value) < 0) {
+                              e.value = '0';
+                            }
                             const temp = structuredClone(item.count);
                             item.count = Number(e.value);
                             let nowQty = 0;
-                            splitOrderArray.forEach((order, index) => {
-                              nowQty += order.lineItems[itemIndex].count;
+                            splitOrderArray.forEach((splitOrder, index) => {
+                              nowQty += splitOrder.lineItems[itemIndex].count;
                             });
-                            if (order.lineItems[itemIndex].count >= nowQty) {
-                            } else {
+                            //如果說over數量了 要改回來
+                            if (dataArray[itemIndex].count < nowQty) {
                               item.count = temp;
+                              e.value = temp;
                             }
-                            gvc.notifyDataChange([ids.itemList, ids.summary, ids.footer]);
+                            gvc.notifyDataChange([ids.summary, ids.footer, 'oriQty']);
                           })}"
                         />
                       `;
                     })
                     .join('')}
                 </div>
+                <div
+                  class="d-flex flex-column flex-grow-1"
+                  style="width: ${titleDom.width};gap:16px;padding-top: 24px;${titleDom?.style ?? ''}"
+                ></div>
               </div>
             `;
           })
           .join('');
       }
+
       const commonClass = 'd-flex align-items-center';
       const commonHeight = 'height:40px;';
       const addBTN = html`
@@ -2124,126 +2254,245 @@ export class OrderSetting {
               htmlArray: [],
             },
           ];
-          dataArray.forEach((item, lineItemIndex) => {
-            return html`
-              <div class="d-flex w-100">
-                ${dataRaws
-                  .map((dataRaw, dataRowIndex) => {
-                    switch (dataRaw.key) {
-                      case 'name': {
-                        const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
-                        const sku = '';
-                        dataRaw.htmlArray.push(
-                          html` <div class="${commonClass}" style="width: ${dataRaw.width};gap:12px;${commonHeight}">
-                            <img class="${gClass('product-preview-img')}" src="${item.preview_image}" alt="產品圖片" />
-                            <div class="d-flex flex-column flex-grow-1" style="gap:2px;">
-                              <div class="tx_normal_14" style="white-space: normal;line-height: normal;">
-                                ${Tool.truncateString(item.title ?? '', 10)} -${spec}
-                              </div>
-                              <div class="tx_normal_14 ${gClass('font-gray')}">
-                                存貨單位 (SKU): ${item.sku ?? '無SKU'}
-                              </div>
-                            </div>
-                          </div>`
-                        );
-                        break;
-                      }
-                      case 'stock': {
-                        dataRaw.htmlArray.push(html`
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            AA倉庫
-                          </div>
-                        `);
-                        break;
-                      }
-                      case 'price': {
-                        dataRaw.htmlArray.push(html`
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.sale_price}
-                          </div>
-                        `);
-                        break;
-                      }
-                      case 'totalQty': {
-                        dataRaw.htmlArray.push(html`
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.count}
-                          </div>
-                        `);
-                        break;
-                      }
-                      case 'oriQty': {
-                        let splitQty = 0;
-                        splitOrderArray.forEach(order => {
-                          splitQty += Number(order.lineItems[lineItemIndex].count);
-                        });
-                        const minusQtyClass = `${gClass('minusQty')} ${splitQty > 0 ? '' : 'd-none'}`;
-                        dataRaw.htmlArray.push(html`
-                          <div
-                            class="tx_normal ${commonClass} justify-content-start"
-                            style="width: ${dataRaw.width};${commonHeight}"
-                          >
-                            ${item.count} <span class="${minusQtyClass}"> -> ${Number(item.count) - splitQty}</span>
-                          </div>
-                        `);
-                        break;
+
+          function drawLineItems(dataRaw: { title: string; key: string; width: string; style?: string }) {
+            switch (dataRaw.key) {
+              case 'name': {
+                return dataArray
+                  .map((item, lineItemIndex) => {
+                    const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+                    return html` <div class="${commonClass}" style="width: ${dataRaw.width};gap:12px;${commonHeight}">
+                      ${BgWidget.validImageBox({
+                        gvc: gvc,
+                        image: item.preview_image ?? '',
+                        width: 42,
+                      })}
+                      <div class="d-flex flex-column flex-grow-1" style="gap:2px;">
+                        <div class="tx_normal_14" style="white-space: normal;line-height: normal;">
+                          ${Tool.truncateString(item.title ?? '', 10)} -${spec}
+                        </div>
+                        <div class="tx_normal_14 ${gClass('font-gray')}">
+                          存貨單位 (SKU): ${item.sku && item.sku.length > 0 ? item.sku : '無SKU'}
+                        </div>
+                      </div>
+                    </div>`;
+                  })
+                  .join('');
+              }
+              case 'stock': {
+
+                if (storeList.length > 0) {
+                  return  dataArray.map((item)=>{
+                    let maxEntry = {
+                      key:"",
+                      title: "",
+                      value: 0
+                    };
+                    console.log("item.deduction_log -- " , item.deduction_log);
+                    Object.entries(item.deduction_log).forEach((log:any)=>{
+                      if (maxEntry.value < log[1]){
+                        maxEntry = {
+                          key: log[0],
+                          title: log[0],
+                          value: log[1]
+                        }
                       }
-                    }
-                    return html``;
+                    })
+
+                    maxEntry.title =  storeList.find((store:any)=>{
+                      return store.id ==maxEntry.key
+                    }).name;
+                    return html`
+                  <div
+                    class="tx_normal ${commonClass} justify-content-start"
+                    style="width: ${dataRaw.width};${commonHeight}"
+                  >
+                    ${maxEntry.title??"出貨庫存錯誤"}
+                  </div>
+                `;
+                  }).join('')
+                }
+
+                return html`
+                  <div
+                    class="tx_normal ${commonClass} justify-content-start"
+                    style="width: ${dataRaw.width};${commonHeight}"
+                  >
+                    AA倉庫
+                  </div>
+                `;
+              }
+              case 'price': {
+                return dataArray
+                  .map((item, lineItemIndex) => {
+                    const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+                    return html`
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.sale_price}
+                      </div>
+                    `;
                   })
-                  .join('')}
-              </div>
-            `;
-          });
+                  .join('');
+              }
+              case 'totalQty': {
+                return dataArray
+                  .map((item, lineItemIndex) => {
+                    const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+                    return html`
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.count}
+                      </div>
+                    `;
+                  })
+                  .join('');
+              }
+              case 'oriQty': {
+                return dataArray
+                  .map((item, lineItemIndex) => {
+                    let splitQty = 0;
+                    splitOrderArray.forEach(order => {
+                      splitQty += Number(order.lineItems[lineItemIndex].count);
+                    });
+                    const minusQtyClass = `${gClass('minusQty')} ${splitQty > 0 ? '' : 'd-none'}`;
+                    return html`
+                      <div
+                        class="tx_normal ${commonClass} justify-content-start"
+                        style="width: ${dataRaw.width};${commonHeight}"
+                      >
+                        ${item.count}
+                        <span class="${minusQtyClass}">
+                          <i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
+                          >${Number(item.count) - splitQty}</span
+                        >
+                      </div>
+                    `;
+                  })
+                  .join('');
+              }
+              default: {
+                return '';
+              }
+            }
+          }
+
+          //繪製各行lineitem的資料
+          // dataArray.forEach((item, lineItemIndex) => {
+          //   // 由於是line優先 所以跑每一行所需要的資料 推進來
+          //   dataRaws
+          //     .map((dataRaw, dataRowIndex) => {
+          //       switch (dataRaw.key) {
+          //         case 'name': {
+          //           const spec = item.spec.length > 0 ? Tool.truncateString(item.spec.join(''), 5) : '單一規格';
+          //           dataRaw.htmlArray.push(
+          //             html` <div class="${commonClass}" style="width: ${dataRaw.width};gap:12px;${commonHeight}">
+          //               ${BgWidget.validImageBox({
+          //                 gvc: gvc,
+          //                 image: item.preview_image ?? '',
+          //                 width: 42,
+          //               })}
+          //               <div class="d-flex flex-column flex-grow-1" style="gap:2px;">
+          //                 <div class="tx_normal_14" style="white-space: normal;line-height: normal;">
+          //                   ${Tool.truncateString(item.title ?? '', 10)} -${spec}
+          //                 </div>
+          //                 <div class="tx_normal_14 ${gClass('font-gray')}">存貨單位 (SKU): ${item.sku ?? '無SKU'}</div>
+          //               </div>
+          //             </div>`
+          //           );
+          //           break;
+          //         }
+          //
+          //         case 'price': {
+          //           dataRaw.htmlArray.push(html`
+          //             <div
+          //               class="tx_normal ${commonClass} justify-content-start"
+          //               style="width: ${dataRaw.width};${commonHeight}"
+          //             >
+          //               ${item.sale_price}
+          //             </div>
+          //           `);
+          //           break;
+          //         }
+          //         case 'totalQty': {
+          //           dataRaw.htmlArray.push(html`
+          //             <div
+          //               class="tx_normal ${commonClass} justify-content-start"
+          //               style="width: ${dataRaw.width};${commonHeight}"
+          //             >
+          //               ${item.count}
+          //             </div>
+          //           `);
+          //           break;
+          //         }
+          //         case 'oriQty': {
+          //           let splitQty = 0;
+          //           splitOrderArray.forEach(order => {
+          //             splitQty += Number(order.lineItems[lineItemIndex].count);
+          //           });
+          //           const minusQtyClass = `${gClass('minusQty')} ${splitQty > 0 ? '' : 'd-none'}`;
+          //
+          //           dataRaw.htmlArray.push(
+          //             gvc.bindView({
+          //               bind: ids.origQTY + `${lineItemIndex}`,
+          //               view: () => {
+          //                 return `
+          //               ${item.count}
+          //               <span class="${minusQtyClass}">
+          //                 <i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
+          //                 >${Number(item.count) - splitQty}</span
+          //               >
+          //               `;
+          //               },
+          //               divCreate: {
+          //                 class: `tx_normal ${commonClass} justify-content-start`,
+          //                 style: `width: ${dataRaw.width};${commonHeight}`,
+          //               },
+          //             })
+          //           );
+          //           break;
+          //         }
+          //       }
+          //       return html``;
+          //     })
+          //     .join('');
+          // });
           return html`
             ${dataRaws
               .map(item => {
                 return html`
-                  <div class="d-flex flex-column">
+                  <div class="d-flex flex-column flex-shrink-0">
                     <div class="${commonClass}" style="width: ${item.width};${item?.style ?? ''}">
                       <div class="tx_700">${item.title}</div>
                       <div class="flex-fill"></div>
                     </div>
-                    <div
-                      class="d-flex flex-column"
-                      style="width: ${item.width};gap:16px;padding-top: 24px;${item?.style ?? ''}"
-                    >
-                      ${item.htmlArray.join('')}
-                    </div>
+                    ${gvc.bindView({
+                      bind: item.key,
+                      view: () => {
+                        return (
+                          drawLineItems(item) +
+                          html` <div class="${commonClass} mt-3" style="width: ${item.width};"></div>`
+                        );
+                      },
+                      divCreate: {
+                        class: 'd-flex flex-column',
+                        style: `width: ${item.width};gap:16px;padding-top: 24px;${item?.style ?? ''}`,
+                      },
+                    })}
                   </div>
                 `;
               })
               .join('')}
-            ${drawSplitOrder()} ${addBTN}
+            <div class="d-flex flex-shrink-0" style="overflow-x: scroll;gap:5px;">${drawSplitOrder()} ${addBTN}</div>
           `;
         },
         divCreate: { style: '', class: `${gClass('itemList-section')}` },
       });
     };
-
-    const renderBlock = (gvc: GVC) => {
-      const subBlock = splitOrderArray
-        .map((order, index) => {
-          return html`<div class="${gClass('summary-subSummary')}"></div>`;
-        })
-        .join('');
-      return html`
-        <div class="d-flex" style="height:27px;">
-          <div class="${gClass('summary-title')}"></div>
-          <div class="${gClass('summary-oriSummary')}"></div>
-          ${subBlock}
-        </div>
-      `;
-    };
     const renderSummary = (gvc: GVC) => {
       return gvc.bindView({
         bind: ids.summary,
@@ -2257,6 +2506,7 @@ export class OrderSetting {
               })
               .join('');
           }
+
           function drawOriData(index: number) {
             //原先訂單的商品價格
             const sale_price = dataArray.reduce((total, data) => total + data.sale_price * Number(data.count), 0);
@@ -2270,8 +2520,8 @@ export class OrderSetting {
                 ),
               0
             );
-            const rate = 1 - split_price / (sale_price + orderData.shipment_fee);
-            const discount = Math.round(orderData.discount * rate);
+            const split_discount = splitOrderArray.reduce((total, order) => total + order.discount, 0);
+
             switch (index) {
               case 1:
                 //若是有修改價格 需藍字顯示出修改後內容
@@ -2294,7 +2544,7 @@ export class OrderSetting {
                     <div class="d-flex align-items-center">
                       <span class="text-decoration-line-through">-${orderData.discount}</span
                       ><i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
-                      ><span class="${gClass('font-blue')}">-${discount}</span>
+                      ><span class="${gClass('font-blue')}">-${orderData.discount - split_discount}</span>
                     </div>
                   `;
                 }
@@ -2306,7 +2556,10 @@ export class OrderSetting {
                       <span class="text-decoration-line-through">${orderData.total}</span
                       ><i class="fa-solid fa-arrow-right ${gClass('font-blue')} ${gClass('summary-right')}"></i
                       ><span class="${gClass('font-blue')}"
-                        >${sale_price - split_price - discount + orderData.shipment_fee}</span
+                        >${sale_price -
+                        split_price -
+                        (orderData.discount - split_discount) +
+                        orderData.shipment_fee}</span
                       >
                     </div>
                   `;
@@ -2314,6 +2567,7 @@ export class OrderSetting {
                 return orderData.total;
             }
           }
+
           //rawIndex 第幾列 決定要繪製什麼類型的資料
           function drawSplitData(rawIndex: number) {
             function drawUnit(order: OrderDetail, lineIndex: number) {
@@ -2337,6 +2591,7 @@ export class OrderSetting {
                   return order.total;
               }
             }
+
             //lineIndex 決定要把第幾個拆分訂單的資訊放進去
             return splitOrderArray
               .map((order, lineIndex) => {
@@ -2348,6 +2603,7 @@ export class OrderSetting {
               })
               .join('');
           }
+
           const titleRaw = [
             { title: '', style: 'height:58px;' },
             { title: '小計總額' },
@@ -2388,21 +2644,36 @@ export class OrderSetting {
     glitter.innerDialog((gvc: GVC) => {
       const temp: DataMap = {};
       applyClass();
-
       return gvc.bindView({
         bind: ids.page,
-        view: () => html`
-          <div class="d-flex flex-column ${gClass('full-screen')}">
-            ${renderHeader(gvc)}
-            <div
-              class="flex-fill scrollbar-appear"
-              style="${isDesktop ? 'padding: 24px 32px;' : 'padding: 0;'} overflow: hidden auto;"
-            >
-              ${renderHint(gvc)} ${renderItemList(gvc)} ${renderBlock(gvc)} ${renderSummary(gvc)}
+        view: () => {
+
+          if (vm.loading) {
+            glitter.share.loading_dialog.dataLoading({ text: '載入中...', visible: true });
+            ApiUser.getPublicConfig('store_manager', 'manager').then((dd: any) => {
+              if (dd.result && dd.response.value) {
+                storeList = dd.response.value.list;
+                vm.loading = false;
+                gvc.notifyDataChange(ids.page);
+              }
+            });
+          }else {
+            glitter.share.loading_dialog.dataLoading({ text: '載入中...', visible: false });
+          }
+
+          return html`
+            <div class="d-flex flex-column ${gClass('full-screen')}">
+              ${renderHeader(gvc)}
+              <div
+                class="flex-fill scrollbar-appear"
+                style="${isDesktop ? 'padding: 24px 32px;' : 'padding: 0 24px;'} overflow: scroll;"
+              >
+                ${renderHint(gvc)} ${renderItemList(gvc)} ${renderSummary(gvc)}
+              </div>
+              ${renderFooter(gvc)}
             </div>
-            ${renderFooter(gvc)}
-          </div>
-        `,
+          `;
+        },
       });
     }, 'splitOrder');
   }